Allow boards to enable the micropython.native decorator

theacodes · theacodes · commit c7195c4bc5a4 · 2019-11-05T14:27:53.000-08:00
Adds the `CIRCUITPY_ENABLE_MPY_NATIVE` for `mpconfigboard.mk` that enables
the `micropython.native` decorator.
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -25,3 +25,6 @@ CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_PS2IO = 0
+
+# Enable micropython.native
+CIRCUITPY_ENABLE_MPY_NATIVE = 1
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -56,8 +56,8 @@
 #define MICROPY_COMP_MODULE_CONST        (1)
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_DEBUG_PRINTERS           (0)
-#define MICROPY_EMIT_INLINE_THUMB        (0)
-#define MICROPY_EMIT_THUMB               (0)
+#define MICROPY_EMIT_INLINE_THUMB        (CIRCUITPY_ENABLE_MPY_NATIVE)
+#define MICROPY_EMIT_THUMB               (CIRCUITPY_ENABLE_MPY_NATIVE)
 #define MICROPY_EMIT_X64                 (0)
 #define MICROPY_ENABLE_DOC_STRING        (0)
 #define MICROPY_ENABLE_FINALISER         (1)
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -294,3 +294,10 @@ ifndef CIRCUITPY_BITBANG_APA102
 CIRCUITPY_BITBANG_APA102 = 0
 endif
 CFLAGS += -DCIRCUITPY_BITBANG_APA102=$(CIRCUITPY_BITBANG_APA102)
+
+
+# Enabled micropython.native decorator (experimental)
+ifndef CIRCUITPY_ENABLE_MPY_NATIVE
+CIRCUITPY_ENABLE_MPY_NATIVE = 0
+endif
+CFLAGS += -DCIRCUITPY_ENABLE_MPY_NATIVE=$(CIRCUITPY_ENABLE_MPY_NATIVE)
diff --git a/py/compile.c b/py/compile.c
@@ -3207,7 +3207,7 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
             }
             if (pass > MP_PASS_SCOPE) {
                 mp_int_t bytesize = MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[0]);
-                for (uint j = 1; j < n_args; j++) {
+                for (int j = 1; j < n_args; j++) {
                     if (!MP_PARSE_NODE_IS_SMALL_INT(pn_arg[j])) {
                         compile_syntax_error(comp, nodes[i], translate("'data' requires integer arguments"));
                         return;
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -58,6 +58,22 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
+#ifndef N_X64
+    #define N_X64 (0)
+#endif
+#ifndef N_X86
+    #define N_X86 (0)
+#endif
+#ifndef N_THUMB
+    #define N_THUMB (0)
+#endif
+#ifndef N_ARM
+    #define N_ARM (0)
+#endif
+#ifndef N_XTENSA
+    #define N_XTENSA (0)
+#endif
+
 // wrapper around everything in this file
 #if N_X64 || N_X86 || N_THUMB || N_ARM || N_XTENSA
 
@@ -443,10 +459,12 @@ STATIC void emit_native_end_pass(emit_t *emit) {
             type_sig |= (emit->local_vtype[i] & 0xf) << (i * 4 + 4);
         }
 
+        #pragma GCC diagnostic ignored "-Wcast-align"
         mp_emit_glue_assign_native(emit->scope->raw_code,
             emit->do_viper_types ? MP_CODE_NATIVE_VIPER : MP_CODE_NATIVE_PY,
             f, f_len, (mp_uint_t*)((byte*)f + emit->const_table_offset),
             emit->scope->num_pos_args, emit->scope->scope_flags, type_sig);
+        #pragma GCC diagnostic pop
     }
 }
 
diff --git a/py/objfun.c b/py/objfun.c
@@ -546,7 +546,9 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
 STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_fun_asm_t *self = self_in;
 
+    #pragma GCC diagnostic ignored "-Wint-conversion"
     mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
+    #pragma GCC diagnostic pop
 
     void *fun = MICROPY_MAKE_POINTER_CALLABLE(self->fun_data);
 

Original file line number	Diff line number	Diff line change
`@@ -3207,7 +3207,7 @@ STATIC void compile_scope_inline_asm(compiler_t comp, scope_t scope, pass_kind`
`3207`	`3207`	`}`
`3208`	`3208`	`if (pass > MP_PASS_SCOPE) {`
`3209`	`3209`	`mp_int_t bytesize = MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[0]);`
`3210`		`- for (uint j = 1; j < n_args; j++) {`
	`3210`	`+ for (int j = 1; j < n_args; j++) {`
`3211`	`3211`	`if (!MP_PARSE_NODE_IS_SMALL_INT(pn_arg[j])) {`
`3212`	`3212`	`compile_syntax_error(comp, nodes[i], translate("'data' requires integer arguments"));`
`3213`	`3213`	`return;`