fix ports/unix

Author: dhalbert

ports/unix/Makefile

@@ -50,7 +50,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 // CIRCUITPY-CHANGE: add  -Wno-missing-field-initializers
-CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
+CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Wno-missing-field-initializers
 CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
 # Force the use of 64-bits for file sizes in C library functions on 32-bit platforms.

ports/unix/coverage.c

@@ -185,6 +185,8 @@ static void pairheap_test(size_t nops, int *ops) {
     mp_printf(&mp_plat_print, "\n");
 }
 
+// CIRCUITPY-CHANGE: not turned on in CircuitPython
+#if MICROPY_SCHEDULER_STATIC_NODES
 static mp_sched_node_t mp_coverage_sched_node;
 static bool coverage_sched_function_continue;
 
@@ -196,6 +198,7 @@ static void coverage_sched_function(mp_sched_node_t *node) {
         mp_sched_schedule_node(&mp_coverage_sched_node, coverage_sched_function);
     }
 }
+#endif
 
 // function to run extra tests for things that can't be checked by scripts
 static mp_obj_t extra_coverage(void) {
@@ -589,6 +592,22 @@ static mp_obj_t extra_coverage(void) {
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
         }
 
+        // mp_obj_get_uint from a non-int object (should raise exception)
+        if (nlr_push(&nlr) == 0) {
+            mp_obj_get_uint(mp_const_none);
+            nlr_pop();
+        } else {
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+
+        // mp_obj_int_get_ll from a non-int object (should raise exception)
+        if (nlr_push(&nlr) == 0) {
+            mp_obj_get_ll(mp_const_none);
+            nlr_pop();
+        } else {
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+
         // call mp_obj_new_exception_args (it's a part of the public C API and not used in the core)
         mp_obj_print_exception(&mp_plat_print, mp_obj_new_exception_args(&mp_type_ValueError, 0, NULL));
     }
@@ -598,26 +617,6 @@ static mp_obj_t extra_coverage(void) {
         mp_emitter_warning(MP_PASS_CODE_SIZE, "test");
     }
 
-    // format float
-    {
-        mp_printf(&mp_plat_print, "# format float\n");
-
-        // format with inadequate buffer size
-        char buf[5];
-        mp_format_float(1, buf, sizeof(buf), 'g', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf);
-
-        // format with just enough buffer so that precision must be
-        // set from 0 to 1 twice
-        char buf2[8];
-        mp_format_float(1, buf2, sizeof(buf2), 'g', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf2);
-
-        // format where precision is trimmed to avoid buffer overflow
-        mp_format_float(1, buf2, sizeof(buf2), 'e', 0, '+');
-        mp_printf(&mp_plat_print, "%s\n", buf2);
-    }
-
     // binary
     {
         mp_printf(&mp_plat_print, "# binary\n");
@@ -641,14 +640,26 @@ static mp_obj_t extra_coverage(void) {
         fun_bc.context = &context;
         fun_bc.child_table = NULL;
         fun_bc.bytecode = (const byte *)"\x01"; // just needed for n_state
+        #if MICROPY_PY_SYS_SETTRACE
+        struct _mp_raw_code_t rc = {};
+        fun_bc.rc = &rc;
+        #endif
         mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, state, mp_obj_t, 1);
         code_state->fun_bc = &fun_bc;
         code_state->ip = (const byte *)"\x00"; // just needed for an invalid opcode
         code_state->sp = &code_state->state[0];
         code_state->exc_sp_idx = 0;
         code_state->old_globals = NULL;
+        #if MICROPY_STACKLESS
+        code_state->prev = NULL;
+        #endif
+        #if MICROPY_PY_SYS_SETTRACE
+        code_state->prev_state = NULL;
+        code_state->frame = NULL;
+        #endif
+
         mp_vm_return_kind_t ret = mp_execute_bytecode(code_state, MP_OBJ_NULL);
-        mp_printf(&mp_plat_print, "%d %d\n", ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ret, mp_obj_get_type(code_state->state[0]) == &mp_type_NotImplementedError);
     }
 
     // scheduler
@@ -705,9 +716,25 @@ static mp_obj_t extra_coverage(void) {
             mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
         }
         mp_handle_pending(true);
+
+        // CIRCUITPY-CHANGE: not turned on in CircuitPython
+        #if MICROPY_SCHEDULER_STATIC_NODES
+        coverage_sched_function_continue = true;
+        mp_sched_schedule_node(&mp_coverage_sched_node, coverage_sched_function);
+        for (int i = 0; i < 3; ++i) {
+            mp_printf(&mp_plat_print, "loop\n");
+            mp_handle_pending(true);
+        }
+        // Clear this flag to prevent the function scheduling itself again
+        coverage_sched_function_continue = false;
+        // Will only run the first time through this loop, then not scheduled again
+        for (int i = 0; i < 3; ++i) {
+            mp_handle_pending(true);
+        }
+        #endif
     }
 
-    // CIRCUITPY-CHANGE: ringbuf is different
+    // CIRCUITPY-CHANGE: ringbuf is quite different
     // ringbuf
     {
         #define RINGBUF_SIZE 99
@@ -719,7 +746,7 @@ static mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# ringbuf\n");
 
         // Single-byte put/get with empty ringbuf.
-        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_free(&ringbuf), (int)ringbuf_num_filled(&ringbuf));
+        mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_num_empty(&ringbuf), (int)ringbuf_num_filled(&ringbuf));
         ringbuf_put(&ringbuf, 22);
         mp_printf(&mp_plat_print, "%d %d\n", (int)ringbuf_num_empty(&ringbuf), (int)ringbuf_num_filled(&ringbuf));
         mp_printf(&mp_plat_print, "%d\n", ringbuf_get(&ringbuf));

ports/unix/coveragecpp.cpp

@@ -1,6 +1,20 @@
 extern "C" {
-// CIRCUITPY-CHANGE: do not include everything: it causes compilation warnings
-#include "py/obj.h"
+// Include the complete public API to verify everything compiles as C++.
+#include <py/gc.h>
+#include <py/obj.h>
+#include <py/objarray.h>
+#include <py/objexcept.h>
+#include <py/objfun.h>
+#include <py/objgenerator.h>
+#include <py/objint.h>
+#include <py/objlist.h>
+#include <py/objmodule.h>
+#include <py/objnamedtuple.h>
+#include <py/objstr.h>
+#include <py/objstringio.h>
+#include <py/objtuple.h>
+#include <py/objtype.h>
+#include <py/runtime.h>
 }
 
 // Invoke all (except one, see below) public API macros which initialize structs to make sure

ports/unix/main.c

@@ -269,14 +269,18 @@ static inline int convert_pyexec_result(int ret) {
 }
 
 static int do_file(const char *file) {
-    return convert_pyexec_result(pyexec_file(file));
+    // CIRCUITPY-CHANGE: pyexec_file result arg
+    pyexec_result_t pyexec_result;
+    return convert_pyexec_result(pyexec_file(file, &pyexec_result));
 }
 
 static int do_str(const char *str) {
     vstr_t vstr;
     vstr.buf = (char *)str;
     vstr.len = strlen(str);
-    int ret = pyexec_vstr(&vstr, true);
+    // CIRCUITPY-CHANGE: pyexec_vstr result arg
+    pyexec_result_t pyexec_result;
+    int ret = pyexec_vstr(&vstr, true, &pyexec_result);
     return convert_pyexec_result(ret);
 }
 

ports/unix/mphalport.h

@@ -25,7 +25,6 @@
  */
 #include <errno.h>
 #include <unistd.h>
-// CIRCUITPY-CHANGE: extra include
 #include <stdbool.h>
 
 #ifndef CHAR_CTRL_C
@@ -38,6 +37,20 @@
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
+// In lieu of a WFI(), slow down polling from being a tight loop.
+//
+// Note that we don't delay for the full TIMEOUT_MS, as execution
+// can't be woken from the delay.
+#define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
+    do { \
+        MP_THREAD_GIL_EXIT(); \
+        mp_hal_delay_us(500); \
+        MP_THREAD_GIL_ENTER(); \
+    } while (0)
+
+// The port provides `mp_hal_stdio_mode_raw()` and `mp_hal_stdio_mode_orig()`.
+#define MICROPY_HAL_HAS_STDIO_MODE_SWITCH (1)
+
 // CIRCUITPY-CHANGE: mp_hal_set_interrupt_char(int) instead of char
 void mp_hal_set_interrupt_char(int c);
 bool mp_hal_is_interrupted(void);

py/bc.h

@@ -304,7 +304,7 @@ static inline void mp_module_context_alloc_tables(mp_module_context_t *context,
     size_t nq = (n_qstr * sizeof(qstr_short_t) + sizeof(mp_uint_t) - 1) / sizeof(mp_uint_t);
     size_t no = n_obj;
     // CIRCUITPY-CHANGE
-    mp_uint_t *mem = m_malloc_items(nq + no);
+    mp_uint_t *mem = (mp_uint_t *)m_malloc_items(nq + no);
     context->constants.qstr_table = (qstr_short_t *)mem;
     context->constants.obj_table = (mp_obj_t *)(mem + nq);
     #else

py/mpconfig.h

@@ -2434,11 +2434,6 @@ typedef time_t mp_timestamp_t;
 #define MP_COLD __attribute__((cold))
 #endif
 
-// CIRCUITPY-CHANGE: avoid undefined warnings
-#ifndef MICROPY_HAL_HAS_STDIO_MODE_SWITCH
-#define MICROPY_HAL_HAS_STDIO_MODE_SWITCH (0)
-#endif
-
 // To annotate that code is unreachable
 #ifndef MP_UNREACHABLE
 #if defined(__GNUC__)

py/obj.h

@@ -408,7 +408,7 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
     {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, n_args_max, false), .fun = {.var = fun_name}}
 #define MP_DEFINE_CONST_FUN_OBJ_KW(obj_name, n_args_min, fun_name) \
     const mp_obj_fun_builtin_var_t obj_name = \
-    {{&mp_type_fun_builtin_var}, MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, true), .fun.kw = fun_name}
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, true), .fun = {.kw = fun_name}}
 
 // CIRCUITPY-CHANGE
 #define MP_DEFINE_CONST_PROP_GET(obj_name, fun_name) \

shared/runtime/pyexec.c

@@ -570,7 +570,8 @@ MP_REGISTER_ROOT_POINTER(vstr_t * repl_line);
 
 #else // MICROPY_REPL_EVENT_DRIVEN
 
-#if !MICROPY_HAL_HAS_STDIO_MODE_SWITCH
+// CIRCUITPY-CHANGE: avoid warnings
+#if defined(MICROPY_HAL_HAS_STDIO_MODE_SWITCH) && !MICROPY_HAL_HAS_STDIO_MODE_SWITCH
 // If the port doesn't need any stdio mode switching calls then provide trivial ones.
 static inline void mp_hal_stdio_mode_raw(void) {
 }