fix compilation issues; remove more uctypes mentions

Author: dhalbert

ports/unix/mpconfigport.h

@@ -41,6 +41,7 @@
 // CIRCUITPY-CHANGE
 #define CIRCUITPY_MICROPYTHON_ADVANCED (1)
 #define MICROPY_PY_ASYNC_AWAIT (1)
+#define MICROPY_PY_UCTYPES (0)
 
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)

py/binary.c

@@ -79,12 +79,9 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                     size = sizeof(void *);
                     break;
                 #endif
-                    // CIRCUITPY-CHANGE: half-float can be turned off
-                #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_USE_NATIVE_FLT16
                 case 'e':
                     size = 2;
                     break;
-                #endif
                 case 'f':
                     // CIRCUITPY-CHANGE: compiler determines size
                     size = sizeof(float);
@@ -140,13 +137,10 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
                     size = sizeof(void *);
                     break;
                 #endif
-                    // CIRCUITPY-CHANGE: half-float can be turned off
-                #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_USE_NATIVE_FLT16
                 case 'e':
                     align = 2;
                     size = 2;
                     break;
-                #endif
                 case 'f':
                     align = alignof(float);
                     size = sizeof(float);
@@ -189,8 +183,6 @@ static inline uint16_t mp_encode_half_float(float x) {
 
 #elif MICROPY_PY_BUILTINS_FLOAT
 
-// CIRCUITPY-CHANGE: avoid warnings about unused functions
-#if defined(MICROPY_PY_FLOAT_USE_NATIVE_FLT16) && MICROPY_PY_FLOAT_USE_NATIVE_FLT16
 static float mp_decode_half_float(uint16_t hf) {
     union {
         uint32_t i;
@@ -261,7 +253,6 @@ static uint16_t mp_encode_half_float(float x) {
     uint16_t bits = ((fpu.i >> 16) & 0x8000) | (e << 10) | m;
     return bits;
 }
-#endif // defined(MICROPY_PY_FLOAT_USE_NATIVE_FLT16) && MICROPY_PY_FLOAT_USE_NATIVE_FLT16
 
 #endif
 
@@ -367,12 +358,9 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
         const char *s_val = (const char *)(uintptr_t)(mp_uint_t)val;
         return mp_obj_new_str(s_val, strlen(s_val));
     #endif
-        #if MICROPY_PY_BUILTINS_FLOAT
-        // CIRCUITPY-CHANGE: half-float can be turned off
-    #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_USE_NATIVE_FLT16
+    #if MICROPY_PY_BUILTINS_FLOAT
     } else if (val_type == 'e') {
         return mp_obj_new_float_from_f(mp_decode_half_float(val));
-    #endif
     } else if (val_type == 'f') {
         union {
             uint32_t i;
@@ -385,7 +373,7 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
             double f;
         } fpu = {val};
         return mp_obj_new_float_from_d(fpu.f);
-        #endif
+    #endif
     } else if (is_signed(val_type)) {
         if ((long long)MP_SMALL_INT_MIN <= val && val <= (long long)MP_SMALL_INT_MAX) {
             return mp_obj_new_int((mp_int_t)val);
@@ -445,12 +433,9 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             break;
         #endif
         #if MICROPY_PY_BUILTINS_FLOAT
-        // CIRCUITPY-CHANGE: half-float can be turned off
-        #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_USE_NATIVE_FLT16
         case 'e':
             val = mp_encode_half_float(mp_obj_get_float_to_f(val_in));
             break;
-        #endif
         case 'f': {
             union {
                 uint32_t i;

py/circuitpy_mpconfig.h

@@ -143,6 +143,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_PY_SYS                   (CIRCUITPY_SYS)
 #define MICROPY_PY_SYS_MAXSIZE           (1)
 #define MICROPY_PY_SYS_STDFILES          (1)
+#define MICROPY_PY_UCTYPES               (0)
 #define MICROPY_PY___FILE__              (1)
 
 #define MICROPY_QSTR_BYTES_IN_HASH       (1)

py/nativeglue.h

@@ -160,6 +160,11 @@ typedef struct _mp_fun_table_t {
     const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
     // CIRCUITPY-CHANGE
     void (*assert_native_inited)(mp_obj_t native_object);
+    void (*arg_parse_all)(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
+    void (*arg_parse_all_kw_array)(size_t n_pos, size_t n_kw, const mp_obj_t *args, size_t n_allowed, const mp_arg_t *allowed, mp_arg_val_t *out_vals);
+    size_t (*binary_get_size)(char struct_type, char val_type, size_t *palign);
+    mp_obj_t (*binary_get_val_array)(char typecode, void *p, size_t index);
+    void (*binary_set_val_array)(char typecode, void *p, size_t index, mp_obj_t val_in);
     const mp_print_t *plat_print;
     // The following entries start at index 73 and are referenced by tools-mpy_ld.py,
     // see constant MP_FUN_TABLE_MP_TYPE_TYPE_OFFSET.

shared-bindings/socketpool/SocketPool.c

@@ -36,8 +36,8 @@
 static mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
-    socketpool_socketpool_obj_t *s = mp_obj_malloc_with_finaliser(socketpool_socketpool_obj_t, &socketpool_socketpool_type)
-        mp_obj_t radio = args[0];
+    socketpool_socketpool_obj_t *s = mp_obj_malloc_with_finaliser(socketpool_socketpool_obj_t, &socketpool_socketpool_type);
+    mp_obj_t radio = args[0];
 
     common_hal_socketpool_socketpool_construct(s, radio);
 

tests/run-tests.py

@@ -6,6 +6,7 @@
 import platform
 import argparse
 import inspect
+import json
 import re
 from glob import glob
 import multiprocessing