second pass over diffs

Author: dhalbert

ports/unix/Makefile

@@ -210,6 +210,7 @@ ifeq ($(MICROPY_PY_JNI),1)
 CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
 endif
 
+# CIRCUITPY-CHANGE: CircuitPython-specific files.
 # source files
 SRC_C += \
 	main.c \
@@ -219,15 +220,13 @@ SRC_C += \
 	input.c \
 	alloc.c \
 	fatfs_port.c \
-	mpbthciport.c \
-	mpbtstackport_common.c \
-	mpbtstackport_h4.c \
-	mpbtstackport_usb.c \
-	mpnimbleport.c \
-	modtermios.c \
-	modsocket.c \
-	modffi.c \
-	modjni.c \
+	shared-module/os/__init__.c \
+	supervisor/shared/settings.c \
+	supervisor/stub/filesystem.c \
+	supervisor/stub/safe_mode.c \
+	supervisor/stub/stack.c \
+	supervisor/shared/translate/translate.c \
+	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
 # CIRCUITPY-CHANGE

py/binary.c

@@ -287,11 +287,8 @@ mp_obj_t mp_binary_get_val_array(char typecode, void *p, size_t index) {
         #if MICROPY_PY_BUILTINS_FLOAT
         case 'f':
             return mp_obj_new_float_from_f(((float *)p)[index]);
-        // CIRCUITPY-CHANGE:
-        #if MICROPY_PY_DOUBLE_TYPECODE
         case 'd':
             return mp_obj_new_float_from_d(((double *)p)[index]);
-        #endif
         #endif
             // Extension to CPython: array of objects
         #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
@@ -364,16 +361,13 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
             float f;
         } fpu = {val};
         return mp_obj_new_float_from_f(fpu.f);
-    // CIRCUITPY-CHANGE
-    #if MICROPY_PY_DOUBLE_TYPECODE
     } else if (val_type == 'd') {
         union {
             uint64_t i;
             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);
@@ -503,12 +497,10 @@ void mp_binary_set_val_array(char typecode, void *p, size_t index, mp_obj_t val_
         case 'f':
             ((float *)p)[index] = mp_obj_get_float_to_f(val_in);
             break;
-        #if MICROPY_PY_DOUBLE_TYPECODE
         case 'd':
             ((double *)p)[index] = mp_obj_get_float_to_d(val_in);
             break;
         #endif
-        #endif
         #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES
         // Extension to CPython: array of objects
         case 'O':
@@ -577,12 +569,9 @@ void mp_binary_set_val_array_from_int(char typecode, void *p, size_t index, mp_i
         case 'f':
             ((float *)p)[index] = (float)val;
             break;
-        // CIRCUITPY-CHANGE
-        #if MICROPY_PY_DOUBLE_TYPECODE
         case 'd':
             ((double *)p)[index] = (double)val;
             break;
-        #endif
         #endif
             // Extension to CPython: array of pointers
         #if MICROPY_PY_STRUCT_UNSAFE_TYPECODES

py/dynruntime.h

@@ -289,7 +289,7 @@ static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type
 
 #define nlr_raise(o)                            (mp_raise_dyn(o))
 #define mp_raise_type_arg(type, arg)            (mp_raise_dyn(mp_obj_new_exception_arg1_dyn((type), (arg))))
-// CIRCUITPY-CHANGE: use str
+// CIRCUITPY-CHANGE: use mp_raise_msg_str
 #define mp_raise_msg(type, msg)                 (mp_fun_table.raise_msg_str((type), (msg)))
 #define mp_raise_OSError(er)                    (mp_raise_OSError_dyn(er))
 #define mp_raise_NotImplementedError(msg)       (mp_raise_msg(&mp_type_NotImplementedError, (msg)))

py/makeqstrdefs.py

@@ -137,6 +137,7 @@ def qstr_unescape(qstr):
     return qstr
 
 
+# CIRCUITPY-CHANGE: output_filename as an arg
 def process_file(f, output_filename=None):
     # match gcc-like output (# n "file") and msvc-like output (#line n "file")
     re_line = re.compile(r"^#(?:line)?\s+\d+\s\"([^\"]+)\"")
@@ -290,6 +291,7 @@ class Args:
     args.input_filename = sys.argv[3]  # Unused for command=cat
     args.output_dir = sys.argv[4]
     args.output_file = None if len(sys.argv) == 5 else sys.argv[5]  # Unused for command=split
+    # CIRCUITPY-CHANGE
     if args.output_file == "_":
         args.output_file = None
 
@@ -304,6 +306,7 @@ class Args:
 
     if args.command == "split":
         with io.open(args.input_filename, encoding="utf-8") as infile:
+            # CIRCUITPY-CHANGE: pass output_file
             process_file(infile, args.output_file)
 
     if args.command == "cat":

py/malloc.c

@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

py/misc.h

@@ -35,10 +35,24 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#if __cplusplus // Required on at least one compiler to get ULLONG_MAX
+#include <climits>
+#else
+#include <limits.h>
+#endif
 
 typedef unsigned char byte;
 typedef unsigned int uint;
 
+#ifndef __has_builtin
+#define __has_builtin(x) (0)
+#endif
+#ifndef __has_feature
+// This macro is supported by Clang and gcc>=14
+#define __has_feature(x) (0)
+#endif
+
+
 /** generic ops *************************************************/
 
 #ifndef MIN

py/mpconfig.h

@@ -2387,7 +2387,7 @@ typedef time_t mp_timestamp_t;
 #endif // INT_FMT
 
 #if !MICROPY_PREVIEW_VERSION_2
-#define MP_NORETURN MP_NORETURN
+#define NORETURN MP_NORETURN
 #endif
 
 // Modifier for weak functions

py/objtype.c

@@ -1086,7 +1086,7 @@ static mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
 
     if (!MP_OBJ_TYPE_HAS_SLOT(self, make_new)) {
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
-        mp_raise_TypeError(MP_ERROR_TEXT("cannot create instance"));
+        mp_raise_TypeError(MP_ERROR_TEXT("can't create instance"));
         #else
         // CIRCUITPY-CHANGE: more specific mp_raise
         mp_raise_TypeError_varg(MP_ERROR_TEXT("can't create '%q' instances"), self->name);

py/py.mk

@@ -191,6 +191,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	objnamedtuple.o \
 	objrange.o \
 	objreversed.o \
+	objringio.o \
 	objset.o \
 	objsingleton.o \
 	objslice.o \

py/sequence.c

@@ -34,15 +34,10 @@
 #define SWAP(type, var1, var2) { type t = var2; var2 = var1; var1 = t; }
 
 // CIRCUITPY-CHANGE: detect sequence overflow
-#if __GNUC__ < 5
-// n.b. does not actually detect overflow!
-#define __builtin_mul_overflow(a, b, x) (*(x) = (a) * (b), false)
-#endif
-
 // Detect when a multiply causes an overflow.
 size_t mp_seq_multiply_len(size_t item_sz, size_t len) {
     size_t new_len;
-    if (__builtin_mul_overflow(item_sz, len, &new_len)) {
+    if (mp_mul_mp_int_t_overflow(item_sz, len, &new_len)) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("small int overflow"));
     }
     return new_len;