Merge branch 'master' of github.com:micropython/micropython

2026-01-07 12:40:15 +01:00 · 2014-06-25 04:10:34 +01:00
parent 780e54cdc3 939c2e7f44
commit e973acde81
100 changed files with 500 additions and 155 deletions
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -28,8 +28,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "asmthumb.h"

 // wrapper around everything in this file
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -29,8 +29,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // wrapper around everything in this file
 #if MICROPY_EMIT_X64
--- a/py/binary.c
+++ b/py/binary.c
@@ -29,8 +29,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "binary.h"
--- a/py/builtin.c
+++ b/py/builtin.c
@@ -113,10 +113,12 @@ mp_obj_t mp_builtin_abs(mp_obj_t o_in) {
        } else {
            return o_in;
        }
+#if MICROPY_PY_BUILTINS_COMPLEX
    } else if (MP_OBJ_IS_TYPE(o_in, &mp_type_complex)) {
        mp_float_t real, imag;
        mp_obj_complex_get(o_in, &real, &imag);
        return mp_obj_new_float(MICROPY_FLOAT_C_FUN(sqrt)(real*real + imag*imag));
+#endif
 #endif
    } else {
        assert(0);
@@ -154,7 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any);

 STATIC mp_obj_t mp_builtin_bin(mp_obj_t o_in) {
    mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR__brace_open__colon__hash_b_brace_close_), o_in };
-    return mp_obj_str_format(ARRAY_SIZE(args), args);
+    return mp_obj_str_format(MP_ARRAY_SIZE(args), args);
 }

 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_bin_obj, mp_builtin_bin);
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -26,8 +26,8 @@

 #include <stdlib.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -44,7 +44,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
    { MP_OBJ_NEW_QSTR(MP_QSTR_bool), (mp_obj_t)&mp_type_bool },
    { MP_OBJ_NEW_QSTR(MP_QSTR_bytes), (mp_obj_t)&mp_type_bytes },
    { MP_OBJ_NEW_QSTR(MP_QSTR_bytearray), (mp_obj_t)&mp_type_bytearray },
-#if MICROPY_PY_BUILTINS_FLOAT
+#if MICROPY_PY_BUILTINS_COMPLEX
    { MP_OBJ_NEW_QSTR(MP_QSTR_complex), (mp_obj_t)&mp_type_complex },
 #endif
    { MP_OBJ_NEW_QSTR(MP_QSTR_dict), (mp_obj_t)&mp_type_dict },
@@ -150,8 +150,8 @@ const mp_obj_dict_t mp_builtin_object_dict_obj = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_builtin_object_table),
-        .alloc = ARRAY_SIZE(mp_builtin_object_table),
+        .used = MP_ARRAY_SIZE(mp_builtin_object_table),
+        .alloc = MP_ARRAY_SIZE(mp_builtin_object_table),
        .table = (mp_map_elem_t*)mp_builtin_object_table,
    },
 };
@@ -195,8 +195,8 @@ const mp_obj_dict_t mp_builtin_module_dict_obj = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_builtin_module_table),
-        .alloc = ARRAY_SIZE(mp_builtin_module_table),
+        .used = MP_ARRAY_SIZE(mp_builtin_module_table),
+        .alloc = MP_ARRAY_SIZE(mp_builtin_module_table),
        .table = (mp_map_elem_t*)mp_builtin_module_table,
    },
 };
--- a/py/compile.c
+++ b/py/compile.c
@@ -31,8 +31,8 @@
 #include <assert.h>
 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
@@ -111,8 +111,8 @@ STATIC const mp_map_elem_t mp_constants_table[] = {
 STATIC const mp_map_t mp_constants_map = {
    .all_keys_are_qstrs = 1,
    .table_is_fixed_array = 1,
-    .used = ARRAY_SIZE(mp_constants_table),
-    .alloc = ARRAY_SIZE(mp_constants_table),
+    .used = MP_ARRAY_SIZE(mp_constants_table),
+    .alloc = MP_ARRAY_SIZE(mp_constants_table),
    .table = (mp_map_elem_t*)mp_constants_table,
 };

--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitcpy.c
+++ b/py/emitcpy.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -30,8 +30,8 @@
 #include <stdarg.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
@@ -167,7 +167,7 @@ STATIC uint get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t
    if (MP_PARSE_NODE_IS_ID(pn)) {
        qstr reg_qstr = MP_PARSE_NODE_LEAF_ARG(pn);
        const char *reg_str = qstr_str(reg_qstr);
-        for (uint i = 0; i < ARRAY_SIZE(reg_name_table); i++) {
+        for (uint i = 0; i < MP_ARRAY_SIZE(reg_name_table); i++) {
            const reg_name_t *r = &reg_name_table[i];
            if (reg_str[0] == r->name[0] && reg_str[1] == r->name[1] && reg_str[2] == r->name[2] && (reg_str[2] == '\0' || reg_str[3] == '\0')) {
                if (r->reg > max_reg) {
@@ -286,7 +286,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, int n_args, m
            asm_thumb_b_n(emit->as, label_num);
        } else if (op_str[0] == 'b' && op_len == 3) {
            uint cc = -1;
-            for (uint i = 0; i < ARRAY_SIZE(cc_name_table); i++) {
+            for (uint i = 0; i < MP_ARRAY_SIZE(cc_name_table); i++) {
                if (op_str[1] == cc_name_table[i].name[0] && op_str[2] == cc_name_table[i].name[1]) {
                    cc = cc_name_table[i].cc;
                }
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -48,8 +48,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/emitpass1.c
+++ b/py/emitpass1.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/gc.c
+++ b/py/gc.c
@@ -33,7 +33,6 @@
 #include "misc.h"
 #include "gc.h"

-#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
@@ -113,7 +112,7 @@ STATIC machine_uint_t gc_lock_depth;
 void gc_init(void *start, void *end) {
    // align end pointer on block boundary
    end = (void*)((machine_uint_t)end & (~(BYTES_PER_BLOCK - 1)));
-    DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, end - start);
+    DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, (byte*)end - (byte*)start);

    // calculate parameters for GC (T=total, A=alloc table, F=finaliser table, P=pool; all in bytes):
    // T = A + F + P
@@ -268,6 +267,7 @@ STATIC void gc_sweep(void) {

            case AT_TAIL:
                if (free_tail) {
+                    DEBUG_printf("gc_sweep(%p)\n",PTR_FROM_BLOCK(block));
                    ATB_ANY_TO_FREE(block);
                }
                break;
@@ -401,6 +401,7 @@ found:

    // get pointer to first block
    void *ret_ptr = (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK);
+    DEBUG_printf("gc_alloc(%p)\n", ret_ptr);

    // zero out the additional bytes of the newly allocated blocks
    // This is needed because the blocks may have previously held pointers
@@ -439,6 +440,7 @@ void gc_free(void *ptr_in) {
    }

    machine_uint_t ptr = (machine_uint_t)ptr_in;
+    DEBUG_printf("gc_free(%p)\n", ptr);

    if (VERIFY_PTR(ptr)) {
        machine_uint_t block = BLOCK_FROM_PTR(ptr);
@@ -590,7 +592,7 @@ void *gc_realloc(void *ptr_in, machine_uint_t n_bytes) {
        return NULL;
    }

-    DEBUG_printf("gc_realloc: allocating new block\n");
+    DEBUG_printf("gc_realloc(%p -> %p)\n", ptr_in, ptr_out);
    memcpy(ptr_out, ptr_in, n_blocks * BYTES_PER_BLOCK);
    gc_free(ptr_in);
    return ptr_out;
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"

@@ -694,10 +694,10 @@ STATIC void mp_lexer_next_token_into(mp_lexer_t *lex, mp_token_t *tok, bool firs
        // need to check for this special token in many places in the compiler.
        // TODO improve speed of these string comparisons
        //for (int i = 0; tok_kw[i] != NULL; i++) {
-        for (int i = 0; i < ARRAY_SIZE(tok_kw); i++) {
+        for (int i = 0; i < MP_ARRAY_SIZE(tok_kw); i++) {
            if (str_strn_equal(tok_kw[i], tok->str, tok->len)) {
-                if (i == ARRAY_SIZE(tok_kw) - 1) {
-                    // tok_kw[ARRAY_SIZE(tok_kw) - 1] == "__debug__"
+                if (i == MP_ARRAY_SIZE(tok_kw) - 1) {
+                    // tok_kw[MP_ARRAY_SIZE(tok_kw) - 1] == "__debug__"
                    tok->kind = (mp_optimise_value == 0 ? MP_TOKEN_KW_TRUE : MP_TOKEN_KW_FALSE);
                } else {
                    tok->kind = MP_TOKEN_KW_FALSE + i;
--- a/py/lexerstr.c
+++ b/py/lexerstr.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"

--- a/py/lexerunix.c
+++ b/py/lexerunix.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 #if MICROPY_HELPER_LEXER_UNIX

--- a/py/malloc.c
+++ b/py/malloc.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 #if 0 // print debugging info
 #define DEBUG_printf DEBUG_printf
--- a/py/map.c
+++ b/py/map.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
--- a/py/misc.h
+++ b/py/misc.h
@@ -82,7 +82,7 @@ int m_get_peak_bytes_allocated(void);
 /** array helpers ***********************************************/

 // get the number of elements in a fixed-size array
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

 /** unichar / UTF-8 *********************************************/

--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -73,9 +73,9 @@ all: $(PROG)

 $(PROG): $(OBJ)
 	$(ECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS)
+	$(Q)$(CC) $(COPT) -o $@ $(OBJ) $(LIB) $(LDFLAGS)
 ifndef DEBUG
-	$(Q)$(STRIP) $(PROG)
+	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
 endif
 	$(Q)$(SIZE) $(PROG)

--- a/py/modarray.c
+++ b/py/modarray.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -40,8 +40,8 @@ STATIC const mp_obj_dict_t mp_module_array_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_array_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_array_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_array_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_array_globals_table),
        .table = (mp_map_elem_t*)mp_module_array_globals_table,
    },
 };
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -26,8 +26,8 @@

 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -142,8 +142,8 @@ STATIC const mp_obj_dict_t mp_module_cmath_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_cmath_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_cmath_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_cmath_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_cmath_globals_table),
        .table = (mp_map_elem_t*)mp_module_cmath_globals_table,
    },
 };
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -42,8 +42,8 @@ STATIC const mp_obj_dict_t mp_module_collections_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_collections_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_collections_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_collections_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_collections_globals_table),
        .table = (mp_map_elem_t*)mp_module_collections_globals_table,
    },
 };
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -73,8 +73,8 @@ STATIC const mp_obj_dict_t mp_module_gc_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_gc_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_gc_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_gc_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_gc_globals_table),
        .table = (mp_map_elem_t*)mp_module_gc_globals_table,
    },
 };
--- a/py/modio.c
+++ b/py/modio.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -57,8 +57,8 @@ STATIC const mp_obj_dict_t mp_module_io_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_io_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_io_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_io_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_io_globals_table),
        .table = (mp_map_elem_t*)mp_module_io_globals_table,
    },
 };
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -26,8 +26,8 @@

 #include <math.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -172,8 +172,8 @@ STATIC const mp_obj_dict_t mp_module_math_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_math_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_math_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_math_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_math_globals_table),
        .table = (mp_map_elem_t*)mp_module_math_globals_table,
    },
 };
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -65,8 +65,8 @@ STATIC const mp_obj_dict_t mp_module_micropython_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_micropython_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_micropython_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_micropython_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_micropython_globals_table),
        .table = (mp_map_elem_t*)mp_module_micropython_globals_table,
    },
 };
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -27,8 +27,8 @@

 #include <assert.h>
 #include <string.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -210,8 +210,8 @@ STATIC const mp_obj_dict_t mp_module_struct_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_struct_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_struct_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_struct_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_struct_globals_table),
        .table = (mp_map_elem_t*)mp_module_struct_globals_table,
    },
 };
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
@@ -87,8 +87,8 @@ STATIC const mp_obj_dict_t mp_module_sys_globals = {
    .map = {
        .all_keys_are_qstrs = 1,
        .table_is_fixed_array = 1,
-        .used = ARRAY_SIZE(mp_module_sys_globals_table),
-        .alloc = ARRAY_SIZE(mp_module_sys_globals_table),
+        .used = MP_ARRAY_SIZE(mp_module_sys_globals_table),
+        .alloc = MP_ARRAY_SIZE(mp_module_sys_globals_table),
        .table = (mp_map_elem_t*)mp_module_sys_globals_table,
    },
 };
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -223,6 +223,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_BUILTINS_FLOAT (0)
 #endif

+#ifndef MICROPY_PY_BUILTINS_COMPLEX
+#define MICROPY_PY_BUILTINS_COMPLEX (MICROPY_PY_BUILTINS_FLOAT)
+#endif
+
 // Enable features which improve CPython compatibility
 // but may lead to more code size/memory usage.
 // TODO: Originally intended as generic category to not
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "mpz.h"

 #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_MPZ
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -29,6 +29,7 @@

 #include <limits.h>
 #include <setjmp.h>
+#include <assert.h>

 typedef struct _nlr_buf_t nlr_buf_t;
 struct _nlr_buf_t {
@@ -44,7 +45,7 @@ struct _nlr_buf_t {
  #else
    void *regs[8];
  #endif
-#elif defined(__thumb2__)
+#elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
    void *regs[10];
 #else
    #define MICROPY_NLR_SETJMP (1)
--- a/py/nlrthumb.S
+++ b/py/nlrthumb.S
@@ -24,19 +24,21 @@
 * THE SOFTWARE.
 */

-#if defined(__thumb2__) && !MICROPY_NLR_SETJMP
-/* thumb callee save: bx, bp, sp, r12, r14, r14, r15 */
+#if !MICROPY_NLR_SETJMP && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
+/* arm callee save: bx, bp, sp, r12, r14, r14, r15 */

    .syntax unified
    /*.cpu cortex-m4*/
-    .thumb
+    /*.thumb*/
    .text
    .align  2

 /* uint nlr_push(r0=nlr_buf_t *nlr) */
    .global nlr_push
+#if defined(__thumb2__)
    .thumb
    .thumb_func
+#endif
    .type   nlr_push, %function
 nlr_push:
    str     lr, [r0, #8]            @ store lr into nlr_buf
@@ -64,8 +66,10 @@ nlr_push:

@ void nlr_pop()
    .global nlr_pop
+#if defined(__thumb2__)
    .thumb
    .thumb_func
+#endif
    .type   nlr_pop, %function
 nlr_pop:
    ldr     r3, .L5                 @ load addr of nlr_top
@@ -80,8 +84,10 @@ nlr_pop:

 /* void nlr_jump(r0=uint val) */
    .global nlr_jump
+#if defined(__thumb2__)
    .thumb
    .thumb_func
+#endif
    .type   nlr_jump, %function
 nlr_jump:
    ldr     r3, .L2                 @ load addr of nlr_top
--- a/py/obj.c
+++ b/py/obj.c
@@ -274,6 +274,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
    }
 }

+#if MICROPY_PY_BUILTINS_COMPLEX
 void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
    if (arg == mp_const_false) {
        *real = 0;
@@ -297,6 +298,7 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
    }
 }
 #endif
+#endif

 void mp_obj_get_array(mp_obj_t o, uint *len, mp_obj_t **items) {
    if (MP_OBJ_IS_TYPE(o, &mp_type_tuple)) {
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -36,7 +36,7 @@
 #include "runtime0.h"
 #include "runtime.h"

-#if MICROPY_PY_BUILTINS_FLOAT
+#if MICROPY_PY_BUILTINS_COMPLEX

 #include <math.h>

--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
@@ -45,7 +45,7 @@ STATIC const mp_arg_t enumerate_make_new_args[] = {
    { MP_QSTR_iterable, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
    { MP_QSTR_start, MP_ARG_INT, {.u_int = 0} },
 };
-#define ENUMERATE_MAKE_NEW_NUM_ARGS ARRAY_SIZE(enumerate_make_new_args)
+#define ENUMERATE_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(enumerate_make_new_args)

 STATIC mp_obj_t enumerate_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
 #if MICROPY_CPYTHON_COMPAT
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -102,9 +102,12 @@ STATIC mp_obj_t float_unary_op(int op, mp_obj_t o_in) {

 STATIC mp_obj_t float_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
    mp_obj_float_t *lhs = lhs_in;
+#if MICROPY_PY_BUILTINS_COMPLEX
    if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_complex)) {
        return mp_obj_complex_binary_op(op, lhs->value, 0, rhs_in);
-    } else {
+    } else
+#endif
+    {
        return mp_obj_float_binary_op(op, lhs->value, rhs_in);
    }
 }
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -121,8 +121,10 @@ mp_obj_t mp_obj_int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
 #if MICROPY_PY_BUILTINS_FLOAT
    } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_float)) {
        return mp_obj_float_binary_op(op, mpz_as_float(zlhs), rhs_in);
+#if MICROPY_PY_BUILTINS_COMPLEX
    } else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_complex)) {
        return mp_obj_complex_binary_op(op, mpz_as_float(zlhs), 0, rhs_in);
+#endif
 #endif
    } else {
        // delegate to generic function to check for extra cases
--- a/py/parse.c
+++ b/py/parse.c
@@ -30,8 +30,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parsenumbase.h"
--- a/py/parsehelper.c
+++ b/py/parsehelper.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <stdio.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -27,14 +27,15 @@
 #include <stdbool.h>
 #include <stdlib.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "nlr.h"
 #include "obj.h"
 #include "parsenumbase.h"
 #include "parsenum.h"
 #include "smallint.h"
+#include "runtime.h"

 #if MICROPY_PY_BUILTINS_FLOAT
 #include <math.h>
@@ -252,10 +253,15 @@ mp_obj_t mp_parse_num_decimal(const char *str, uint len, bool allow_imag, bool f
    }

    // return the object
+#if MICROPY_PY_BUILTINS_COMPLEX
    if (imag) {
        return mp_obj_new_complex(0, dec_val);
    } else if (force_complex) {
        return mp_obj_new_complex(dec_val, 0);
+#else
+    if (imag || force_complex) {
+        mp_not_implemented("complex values not supported");
+#endif
    } else {
        return mp_obj_new_float(dec_val);
    }
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "parsenumbase.h"

 // find real radix base, and strip preceding '0x', '0o' and '0b'
--- a/py/pfenv.c
+++ b/py/pfenv.c
@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "mpz.h"
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -27,8 +27,8 @@
 #include <assert.h>
 #include <string.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"

 // NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings)
--- a/py/repl.c
+++ b/py/repl.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "repl.h"

 #if MICROPY_HELPER_REPL
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -426,6 +426,7 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
            } else {
                return res;
            }
+#if MICROPY_PY_BUILTINS_COMPLEX
        } else if (MP_OBJ_IS_TYPE(rhs, &mp_type_complex)) {
            mp_obj_t res = mp_obj_complex_binary_op(op, lhs_val, 0, rhs);
            if (res == MP_OBJ_NULL) {
@@ -433,6 +434,7 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
            } else {
                return res;
            }
+#endif
 #endif
        }
    }
--- a/py/scope.c
+++ b/py/scope.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <assert.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parse.h"
--- a/py/smallint.c
+++ b/py/smallint.c
@@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "smallint.h"
--- a/py/unicode.c
+++ b/py/unicode.c
@@ -26,8 +26,8 @@

 #include <stdint.h>

-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // attribute flags
 #define FL_PRINT (0x01)
--- a/py/vstr.c
+++ b/py/vstr.c
@@ -29,8 +29,8 @@
 #include <stdarg.h>
 #include <string.h>
 #include <assert.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"

 // returned value is always at least 1 greater than argument
 #define ROUND_ALLOC(a) (((a) & ((~0) - 7)) + 8)