Fix merge bugs; remove shared/tinyusb/*

dhalbert · dhalbert · commit c0a4abc03c26 · 2023-10-19T16:02:42.000-04:00
diff --git a/extmod/modbinascii.c b/extmod/modbinascii.c
@@ -32,7 +32,7 @@
 #include "py/binary.h"
 #include "py/objstr.h"
 
-#include "lib/uzlib/tinf.h"
+//#include "lib/uzlib/tinf.h"
 
 #if MICROPY_PY_BINASCII
 
@@ -219,7 +219,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b
  */
 
 #if MICROPY_PY_UBINASCII_CRC32
-#include "lib/uzlib/tinf.h"
+//#include "lib/uzlib/uzlib.h"
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
diff --git a/extmod/modzlib.c b/extmod/modzlib.c
@@ -31,10 +31,10 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 
-#if MICROPY_PY_UZLIB
+#if MICROPY_PY_ZLIB
 
 #define UZLIB_CONF_PARANOID_CHECKS (1)
-#include "lib/uzlib/tinf.h"
+#include "lib/uzlib/uzlib.h"
 
 #if 0 // print debugging info
 #define DEBUG_printf DEBUG_printf
@@ -243,4 +243,4 @@ MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_uzlib);
 #include "lib/uzlib/adler32.c"
 #include "lib/uzlib/crc32.c"
 
-#endif // MICROPY_PY_UZLIB
+#endif // MICROPY_PY_ZLIB
diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c
@@ -59,8 +59,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     cyw43_pin_type,
     MP_QSTR_CywPin,
     MP_TYPE_FLAG_NONE,
-    print, shared_bindings_microcontroller_pin_print,
-    unary_op, mp_generic_unary_op
+    print, shared_bindings_microcontroller_pin_print
     );
 
 //| PM_STANDARD: int
diff --git a/py/builtinimport.c b/py/builtinimport.c
@@ -31,6 +31,8 @@
 #include <assert.h>
 
 #include "py/compile.h"
+// CIRCUITPY: for gc_collect() after each import
+#include "py/gc.h"
 #include "py/objmodule.h"
 #include "py/persistentcode.h"
 #include "py/runtime.h"
@@ -136,7 +138,6 @@ STATIC mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {
             return stat;
         }
     }
-    #endif
 
     // sys.path was empty or no matches, do not search the filesystem or
     // frozen code.
diff --git a/py/compile.c b/py/compile.c
@@ -255,7 +255,7 @@ STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) {
     }
 }
 
-STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_error_text_t msg) {
+STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, const compressed_string_t *msg) {
     // only register the error if there has been no other error
     if (comp->compile_error == MP_OBJ_NULL) {
         comp->compile_error = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg);
diff --git a/py/gc.c b/py/gc.c
@@ -260,14 +260,6 @@ void gc_add(void *start, void *end) {
     prev_area->next = area;
 }
 
-// CIRCUITPY
-// TODO FOR MERGE: fix this for multiple areas??
-void gc_deinit(void) {
-    // Run any finalisers before we stop using the heap.
-    gc_sweep_all();
-    MP_STATIC_ASSERT(!MICROPY_GC_SPLIT_HEAP);
-    memset(&MP_STATE_MEM(area), 0, sizeof(MP_STATE_MEM(area)));
-
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 // Try to automatically add a heap area large enough to fulfill 'failed_alloc'.
 STATIC bool gc_try_add_heap(size_t failed_alloc) {
@@ -346,6 +338,15 @@ STATIC bool gc_try_add_heap(size_t failed_alloc) {
 
 #endif
 
+// CIRCUITPY
+// TODO FOR MERGE: fix this for multiple areas??
+void gc_deinit(void) {
+    // Run any finalisers before we stop using the heap.
+    gc_sweep_all();
+    MP_STATIC_ASSERT(!MICROPY_GC_SPLIT_HEAP);
+    memset(&MP_STATE_MEM(area), 0, sizeof(MP_STATE_MEM(area)));
+}
+
 void gc_lock(void) {
     // This does not need to be atomic or have the GC mutex because:
     // - each thread has its own gc_lock_depth so there are no races between threads;
diff --git a/py/mpconfig.h b/py/mpconfig.h
@@ -26,6 +26,11 @@
 #ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
 #define MICROPY_INCLUDED_PY_MPCONFIG_H
 
+// Is this a CircuitPython build?
+#ifndef CIRCUITPY
+#define CIRCUITPY 0
+#endif
+
 // In CircuitPython, version info is in genhdr/mpversion.h.
 #if CIRCUITPY
 #include "genhdr/mpversion.h"
@@ -53,11 +58,6 @@
 // You can override any of the options below using mpconfigport.h file
 // located in a directory of your port.
 
-// Is this a CircuitPython build?
-#ifndef CIRCUITPY
-#define CIRCUITPY 0
-#endif
-
 // mpconfigport.h is a file containing configuration settings for a
 // particular port. mpconfigport.h is actually a default name for
 // such config, and it can be overridden using MP_CONFIGFILE preprocessor
@@ -540,6 +540,15 @@
 #define MICROPY_OPT_COMPUTED_GOTO (0)
 #endif
 
+// CIRCUITPY
+// Whether to save trade flash space for speed in MICROPY_OPT_COMPUTED_GOTO.
+// Costs about 3% speed, saves about 1500 bytes space.  In addition to the assumptions
+// of MICROPY_OPT_COMPUTED_GOTO, also assumes that mp_execute_bytecode is less than
+// 32kB in size.
+#ifndef MICROPY_OPT_COMPUTED_GOTO_SAVE_SPACE
+#define MICROPY_OPT_COMPUTED_GOTO_SAVE_SPACE (0)
+#endif
+
 // Optimise the fast path for loading attributes from instance types. Increases
 // Thumb2 code size by about 48 bytes.
 #ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
@@ -597,6 +606,12 @@
 #define MICROPY_HAS_FILE_READER (MICROPY_READER_POSIX || MICROPY_READER_VFS)
 #endif
 
+// CIRCUITPY
+// Number of VFS mounts to persist across soft-reset.
+#ifndef MICROPY_FATFS_NUM_PERSISTENT
+#define MICROPY_FATFS_NUM_PERSISTENT (0)
+#endif
+
 // Hook for the VM at the start of the opcode loop (can contain variable
 // definitions usable by the other hook functions)
 #ifndef MICROPY_VM_HOOK_INIT
@@ -1595,6 +1610,7 @@ typedef double mp_float_t;
 // TODO? CIRCUITPY_ZLIB instead
 #ifndef MICROPY_PY_ZLIB
 #define MICROPY_PY_ZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
 
 // Whether to provide "deflate" module (decompression-only by default)
 #ifndef MICROPY_PY_DEFLATE
@@ -1977,6 +1993,19 @@ typedef double mp_float_t;
 #define MP_WEAK __attribute__((weak))
 #endif
 
+// CIRCUITPY
+// Modifier for functions which should not be instrumented when tracing with
+// -finstrument-functions
+#ifndef MP_NO_INSTRUMENT
+#define MP_NO_INSTRUMENT __attribute__((no_instrument_function))
+#endif
+
+// CIRCUITPY
+// Modifier for functions which should ideally inlined
+#ifndef MP_INLINE
+#define MP_INLINE inline MP_NO_INSTRUMENT
+#endif
+
 // Modifier for functions which should be never inlined
 #ifndef MP_NOINLINE
 #define MP_NOINLINE __attribute__((noinline))
@@ -1997,6 +2026,13 @@ typedef double mp_float_t;
 #define MP_UNLIKELY(x) __builtin_expect((x), 0)
 #endif
 
+// CIRCUITPY
+// Modifier for functions which aren't often used. Calls will also be considered
+// unlikely. Section names are `.text.unlikely` for use in linker scripts.
+#ifndef MP_COLD
+#define MP_COLD __attribute__((cold))
+#endif
+
 // To annotate that code is unreachable
 #ifndef MP_UNREACHABLE
 #if defined(__GNUC__)
diff --git a/py/obj.h b/py/obj.h
@@ -1057,7 +1057,7 @@ mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items);
 
 const mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in);
 const char *mp_obj_get_type_str(mp_const_obj_t o_in);
-CIRCUITPY
+// CIRCUITPY
 #define mp_obj_get_type_qstr(o_in) (mp_obj_get_type((o_in))->name)
 bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo); // arguments should be type objects
 mp_obj_t mp_obj_cast_to_native_base(mp_obj_t self_in, mp_const_obj_t native_type);
diff --git a/py/objgenerator.c b/py/objgenerator.c
@@ -103,8 +103,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_coroutine,
     MP_TYPE_FLAG_BINDS_SELF,
     GEN_WRAP_TYPE_ATTR
-    call, gen_wrap_call,
-    unary_op, mp_generic_unary_op
+    call, gen_wrap_call
     );
 #endif
 
@@ -191,8 +190,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_coroutine,
     MP_TYPE_FLAG_BINDS_SELF,
     GEN_WRAP_TYPE_ATTR
-    call, native_gen_wrap_call,
-    unary_op, mp_generic_unary_op
+    call, native_gen_wrap_call
     );
 #endif
 
@@ -475,7 +473,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_coroutine,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     print, coro_instance_print,
-    unary_op, mp_generic_unary_op,
     iter, gen_instance_iternext,
     locals_dict, &coro_instance_locals_dict
     );
diff --git a/py/parse.c b/py/parse.c
@@ -653,20 +653,11 @@ STATIC const mp_rom_map_elem_t mp_constants_table[] = {
 STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 #endif
 
-STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
-
-#if MICROPY_COMP_CONST_FOLDING
-// CIRCUITPY: The compilers mentioned below are esp-2020r3. We are using minimum esp-2021r3 (ESP-IDF v4.4).
-// See https://github.com/micropython/micropython/commit/f63b4f85aae1e0ade7a7c9f908debb5905cc144d
-// and https://github.com/espressif/esp-idf/issues/9130
-// So disable this for CircuitPython.
-/*
-#if MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND
+#if defined(MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND) && MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND
 // Some versions of the xtensa-esp32-elf-gcc compiler generate wrong code if this
 // function is static, so provide a hook for them to work around this problem.
 MP_NOINLINE
 #endif
-*/
 STATIC bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *num_args) {
     if (rule_id == RULE_or_test
         || rule_id == RULE_and_test) {
diff --git a/py/runtime.c b/py/runtime.c
@@ -1393,7 +1393,8 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
 
 STATIC mp_fun_1_t type_get_iternext(const mp_obj_type_t *type) {
     if ((type->flags & MP_TYPE_FLAG_ITER_IS_STREAM) == MP_TYPE_FLAG_ITER_IS_STREAM) {
-        mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self);
+        // CIRCUITPY: unneeded declaration
+        // mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self);
         return mp_stream_unbuffered_iter;
     } else if (type->flags & MP_TYPE_FLAG_ITER_IS_ITERNEXT) {
         return (mp_fun_1_t)MP_OBJ_TYPE_GET_SLOT(type, iter);
diff --git a/py/runtime.h b/py/runtime.h
@@ -163,6 +163,9 @@ static inline void mp_globals_set(mp_obj_dict_t *d) {
     MP_STATE_THREAD(dict_globals) = d;
 }
 
+void mp_globals_locals_set_from_nlr_jump_callback(void *ctx_in);
+void mp_call_function_1_from_nlr_jump_callback(void *ctx_in);
+
 mp_obj_t mp_load_name(qstr qst);
 mp_obj_t mp_load_global(qstr qst);
 mp_obj_t mp_load_build_class(void);
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
@@ -248,6 +248,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     bleio_connection_type,
     MP_QSTR_Connection,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &bleio_connection_locals_dict,
-    unary_op, mp_generic_unary_op
+    locals_dict, &bleio_connection_locals_dict
     );
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
@@ -45,7 +45,9 @@
 //|         """Returns a hash for the Pin."""
 //|         ...
 //|
-// Provided by mp_generic_unary_op().
+// Provided inherently.
+// See https://github.com/micropython/micropython/pull/10348.
+
 
 static void get_pin_name(const mcu_pin_obj_t *self, qstr *package, qstr *module, qstr *name) {
     const mp_map_t *board_map = &board_module_globals.map;
@@ -86,8 +88,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mcu_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    print, shared_bindings_microcontroller_pin_print,
-    unary_op, mp_generic_unary_op
+    print, shared_bindings_microcontroller_pin_print
     );
 
 const mcu_pin_obj_t *validate_obj_is_pin(mp_obj_t obj, qstr arg_name) {
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
@@ -51,7 +51,8 @@
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
 //|         ...
-// Provided by mp_generic_unary_op().
+// Provided inherently.
+// See https://github.com/micropython/micropython/pull/10348.
 
 //|     def __enter__(self) -> Socket:
 //|         """No-op used by Context Managers."""
@@ -452,6 +453,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Socket,
     MP_TYPE_FLAG_NONE,
     locals_dict, &socketpool_socket_locals_dict,
-    unary_op, mp_generic_unary_op,
     protocol, &socket_stream_p
     );
diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c
@@ -48,7 +48,8 @@
 //|     def __hash__(self) -> int:
 //|         """Returns a hash for the Socket."""
 //|         ...
-// Provided by mp_generic_unary_op().
+// Provided by automatic inclusion of hash()
+// https://github.com/micropython/micropython/pull/10348
 
 //|     def __enter__(self) -> SSLSocket:
 //|         """No-op used by Context Managers."""
@@ -301,7 +302,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ssl_sslsocket_type,
     MP_QSTR_SSLSocket,
     MP_TYPE_FLAG_NONE,
-    locals_dict, &ssl_sslsocket_locals_dict,
-    unary_op, mp_generic_unary_op
-
+    locals_dict, &ssl_sslsocket_locals_dict
     );
diff --git a/shared-bindings/wifi/Packet.c b/shared-bindings/wifi/Packet.c
@@ -63,6 +63,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Packet,
     MP_TYPE_FLAG_NONE,
     print, wifi_packet_print,
-    locals_dict, &wifi_packet_locals_dict,
-    unary_op, mp_generic_unary_op
+    locals_dict, &wifi_packet_locals_dict
     );
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
@@ -29,13 +29,14 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "py/mphal.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/frozenmod.h"
 #include "py/mphal.h"
-#if MICROPY_HW_ENABLE_USB
+#if defined(MICROPY_HW_ENABLE_USB) && MICROPY_HW_ENABLE_USB
 #include "irq.h"
 #include "usb.h"
 #endif
@@ -638,7 +639,7 @@ int pyexec_friendly_repl(void) {
     for (;;) {
     input_restart:
 
-        #if MICROPY_HW_ENABLE_USB
+        #if defined(MICROPY_HW_ENABLE_USB) && MICROPY_HW_ENABLE_USB
         if (usb_vcp_is_enabled()) {
             // If the user gets to here and interrupts are disabled then
             // they'll never see the prompt, traceback etc. The USB REPL needs
diff --git a/shared/tinyusb/mp_cdc_common.c b/shared/tinyusb/mp_cdc_common.c
diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
diff --git a/shared/tinyusb/mp_usbd_internal.h b/shared/tinyusb/mp_usbd_internal.h
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`#include <assert.h>`
`32`	`32`
`33`	`33`	`#include "py/compile.h"`
	`34`	`+// CIRCUITPY: for gc_collect() after each import`
	`35`	`+#include "py/gc.h"`
`34`	`36`	`#include "py/objmodule.h"`
`35`	`37`	`#include "py/persistentcode.h"`
`36`	`38`	`#include "py/runtime.h"`
`@@ -136,7 +138,6 @@ STATIC mp_import_stat_t stat_top_level(qstr mod_name, vstr_t *dest) {`
`136`	`138`	`return stat;`
`137`	`139`	`}`
`138`	`140`	`}`
`139`		`- #endif`
`140`	`141`
`141`	`142`	`// sys.path was empty or no matches, do not search the filesystem or`
`142`	`143`	`// frozen code.`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		`-STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_error_text_t msg) {`
	`258`	`+STATIC void compile_syntax_error(compiler_t comp, mp_parse_node_t pn, const compressed_string_t msg) {`
`259`	`259`	`// only register the error if there has been no other error`
`260`	`260`	`if (comp->compile_error == MP_OBJ_NULL) {`
`261`	`261`	`comp->compile_error = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg);`