micropython · dpgeorge · Nov 15, 2015 · Nov 16, 2015 · Nov 16, 2015 · Nov 16, 2015
diff --git a/examples/modx/.gitignore b/examples/modx/.gitignore
@@ -0,0 +1 @@
+build-*/
diff --git a/examples/modx/Makefile b/examples/modx/Makefile
@@ -0,0 +1,40 @@
+include ../../py/mkenv.mk
+
+INC = -I. -I../..
+
+CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -fPIC -fno-stack-protector -Os
+
+ARCH = native
+
+ifeq ($(ARCH), m4)
+CROSS_COMPILE = arm-none-eabi-
+CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
+CFLAGS += -nostdlib $(CFLAGS_CORTEX_M4)
+else ifeq ($(ARCH), m0)
+CROSS_COMPILE = arm-none-eabi-
+CFLAGS_CORTEX_M0 = -mthumb --short-enums -mtune=cortex-m0 -mcpu=cortex-m0 -mfloat-abi=soft -fno-builtin
+CFLAGS += -nostdlib $(CFLAGS_CORTEX_M0)
+else ifeq ($(ARCH), native)
+# we're not cross compiling
+ARCH = native
+else
+$(error Unknown architecture)
+endif
+
+BUILD=build-$(ARCH)
+
+all: $(BUILD)/modx.mpy
+
+clean:
+	$(RM) -rf $(BUILD)
+
+$(BUILD)/modx.mpy: $(BUILD)/modx.elf
+	$(OBJCOPY) -O binary -j .all $< $@
+	$(PYTHON) elftompy.py $@
+
+$(BUILD)/modx.elf: $(BUILD)/modx.o
+	$(LD) -T persistnative.ld -o $@ $<
+
+$(BUILD)/modx.o: modx.c
+	$(MKDIR) -p $(BUILD)
+	$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/examples/modx/elftompy.py b/examples/modx/elftompy.py
@@ -0,0 +1,24 @@
+"""
+This tool is ultimately intended to convert a .elf to a .mpy file.
+But for now all it does is patch the text size within a .mpy file.
+
+Usage (after building modx.mpy):
+
+    $ python elftompy.py modx.mpy
+
+This will make modx.mpy ready for importing.
+"""
+
+import sys
+
+def process_file(filename):
+    with open(filename, 'rb') as f:
+        data = bytearray(f.read())
+    size = len(data) - 16
+    data[8] = size & 0xff
+    data[9] = size >> 8
+    with open(filename, 'wb') as f:
+        f.write(data)
+
+if __name__ == '__main__':
+    process_file(sys.argv[1])
diff --git a/examples/modx/genhdr/qstrdefs.generated.h b/examples/modx/genhdr/qstrdefs.generated.h
diff --git a/examples/modx/modx.c b/examples/modx/modx.c
@@ -0,0 +1,53 @@
+#include "py/persistnative.h"
+
+#define QSTR_DEFINES \
+    QDEF(VAL1, "VAL1") \
+    QDEF(VAL2, "VAL2") \
+    QDEF(VAL3, "VAL3") \
+    QDEF(add1, "add1") \
+    QDEF(make_list, "make_list") \
+
+enum {
+    #define QDEF(id, str) MP_LOCAL_QSTR_ ## id,
+    QSTR_DEFINES
+    #undef QDEF
+    MP_LOCAL_QSTR_number_of,
+};
+
+STATIC mp_obj_t modx_add1(CONTEXT mp_obj_t x) {
+    return RT(mp_binary_op)(MP_BINARY_OP_ADD, x, MP_OBJ_NEW_SMALL_INT(1));
+}
+
+STATIC mp_obj_t modx_make_list(CONTEXT mp_obj_t x, mp_obj_t y) {
+    mp_obj_t list[6] = {
+        MP_OBJ_NEW_SMALL_INT(1),
+        MP_OBJ_NEW_SMALL_INT(2),
+        CONST(_ellipsis),
+        MP_OBJ_NEW_QSTR(QSTR(make_list)),
+        x,
+        y,
+    };
+    return RT(mp_obj_new_list)(6, list);
+}
+
+MP_PERSISTENT_NATIVE_HEADER
+
+MP_PERSISTENT_NATIVE_INIT
+void init(CONTEXT_ALONE) {
+    // create qstrs
+    {
+        qstr *q = pnd->qstr_table;
+        #define QDEF(id, str) *q++ = RT(qstr_from_str)(str);
+        QSTR_DEFINES
+        #undef QDEF
+    }
+
+    // constants
+    RT(mp_store_global)(QSTR(VAL1), CONST(_true));
+    RT(mp_store_global)(QSTR(VAL2), MP_OBJ_NEW_SMALL_INT(123));
+    RT(mp_store_global)(QSTR(VAL3), MP_OBJ_NEW_QSTR(QSTR(VAL3)));
+
+    // functions
+    RT(mp_store_global)(QSTR(add1), MAKE_FUN_1(modx_add1));
+    RT(mp_store_global)(QSTR(make_list), MAKE_FUN_2(modx_make_list));
+}
diff --git a/examples/modx/mpconfigport.h b/examples/modx/mpconfigport.h
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+// options to control how Micro Python is built
+
+#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
+#define MICROPY_PERSISTENT_NATIVE   (1)
+#define MICROPY_COMP_MODULE_CONST   (1)
+#define MICROPY_ENABLE_GC           (1)
+#define MICROPY_ENABLE_FINALISER    (1)
+#define MICROPY_STACK_CHECK         (1)
+#define MICROPY_MEM_STATS           (1)
+#define MICROPY_DEBUG_PRINTERS      (1)
+#define MICROPY_HELPER_REPL         (1)
+#define MICROPY_HELPER_LEXER_UNIX   (1)
+#define MICROPY_ENABLE_SOURCE_LINE  (1)
+#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_STREAMS_NON_BLOCK   (1)
+#define MICROPY_OPT_COMPUTED_GOTO   (1)
+#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
+#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
+#define MICROPY_MODULE_EXTERN       (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
+#define MICROPY_PY_BUILTINS_FROZENSET (1)
+#define MICROPY_PY_BUILTINS_COMPILE (1)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
+#define MICROPY_PY_SYS_EXIT         (1)
+#define MICROPY_PY_SYS_PLATFORM     "linux"
+#define MICROPY_PY_SYS_MAXSIZE      (1)
+#define MICROPY_PY_SYS_STDFILES     (1)
+#define MICROPY_PY_CMATH            (1)
+#define MICROPY_PY_IO_FILEIO        (1)
+#define MICROPY_PY_GC_COLLECT_RETVAL (1)
+
+// type definitions for the specific machine
+
+typedef intptr_t mp_int_t;
+typedef uintptr_t mp_uint_t;
+
+// Cannot include <sys/types.h>, as it may lead to symbol name clashes
+#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
+typedef long long mp_off_t;
+#else
+typedef long mp_off_t;
+#endif
diff --git a/examples/modx/persistnative.ld b/examples/modx/persistnative.ld
@@ -0,0 +1,16 @@
+/*
+    GNU linker script for MPY external modules
+*/
+
+SECTIONS
+{
+    .all :
+    {
+        . = ALIGN(4);
+        KEEP(*(.mpyheader))
+        KEEP(*(.mpytext))
+        *(.text*)
+        *(.rodata*)
+        . = ALIGN(4);
+    }
+}
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
@@ -28,6 +28,7 @@
 
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
+#define MICROPY_PERSISTENT_NATIVE   (1)
 #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
     #define MICROPY_EMIT_X64        (1)
 #endif

diff --git a/py/asmarm.c b/py/asmarm.c
@@ -350,7 +350,7 @@ void asm_arm_b_label(asm_arm_t *as, uint label) {
     asm_arm_bcc_label(as, ASM_ARM_CC_AL, label);
 }
 
-void asm_arm_bl_ind(asm_arm_t *as, void *fun_ptr, uint fun_id, uint reg_temp) {
+void asm_arm_bl_ind(asm_arm_t *as, const void *fun_ptr, uint fun_id, uint reg_temp) {
     // If the table offset fits into the ldr instruction
     if (fun_id < (0x1000 / 4)) {
         emit_al(as, asm_arm_op_mov_reg(ASM_ARM_REG_LR, ASM_ARM_REG_PC)); // mov lr, pc

diff --git a/py/asmarm.h b/py/asmarm.h
@@ -120,7 +120,7 @@ void asm_arm_pop(asm_arm_t *as, uint reglist);
 // control flow
 void asm_arm_bcc_label(asm_arm_t *as, int cond, uint label);
 void asm_arm_b_label(asm_arm_t *as, uint label);
-void asm_arm_bl_ind(asm_arm_t *as, void *fun_ptr, uint fun_id, uint reg_temp);
+void asm_arm_bl_ind(asm_arm_t *as, const void *fun_ptr, uint fun_id, uint reg_temp);
 
 #if GENERIC_ASM_API
 

diff --git a/py/asmthumb.c b/py/asmthumb.c
@@ -356,7 +356,7 @@ void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
 #define OP_BLX(reg) (0x4780 | ((reg) << 3))
 #define OP_SVC(arg) (0xdf00 | (arg))
 
-void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp) {
+void asm_thumb_bl_ind(asm_thumb_t *as, const void *fun_ptr, uint fun_id, uint reg_temp) {
     /* TODO make this use less bytes
     uint rlo_base = ASM_THUMB_REG_R3;
     uint rlo_dest = ASM_THUMB_REG_R7;

diff --git a/py/asmthumb.h b/py/asmthumb.h
@@ -235,7 +235,7 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num)
 
 void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience: picks narrow or wide branch
 void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch
-void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp); // convenience
+void asm_thumb_bl_ind(asm_thumb_t *as, const void *fun_ptr, uint fun_id, uint reg_temp); // convenience
 
 #if GENERIC_ASM_API
 

diff --git a/py/asmx64.c b/py/asmx64.c
@@ -612,7 +612,7 @@ void asm_x64_call_i1(asm_x64_t *as, void* func, int i1) {
 }
 */
 
-void asm_x64_call_ind(asm_x64_t *as, void *ptr, int temp_r64) {
+void asm_x64_call_ind(asm_x64_t *as, const void *ptr, int temp_r64) {
     assert(temp_r64 < 8);
 #ifdef __LP64__
     asm_x64_mov_i64_to_r64_optimised(as, (int64_t)ptr, temp_r64);

diff --git a/py/asmx64.h b/py/asmx64.h
@@ -112,7 +112,7 @@ void asm_x64_exit(asm_x64_t* as);
 void asm_x64_mov_local_to_r64(asm_x64_t* as, int src_local_num, int dest_r64);
 void asm_x64_mov_r64_to_local(asm_x64_t* as, int src_r64, int dest_local_num);
 void asm_x64_mov_local_addr_to_r64(asm_x64_t* as, int local_num, int dest_r64);
-void asm_x64_call_ind(asm_x64_t* as, void* ptr, int temp_r32);
+void asm_x64_call_ind(asm_x64_t* as, const void* ptr, int temp_r32);
 
 #if GENERIC_ASM_API
 

diff --git a/py/asmx86.c b/py/asmx86.c
@@ -469,7 +469,7 @@ void asm_x86_push_local_addr(asm_x86_t *as, int local_num, int temp_r32)
 }
 #endif
 
-void asm_x86_call_ind(asm_x86_t *as, void *ptr, mp_uint_t n_args, int temp_r32) {
+void asm_x86_call_ind(asm_x86_t *as, const void *ptr, mp_uint_t n_args, int temp_r32) {
     // TODO align stack on 16-byte boundary before the call
     assert(n_args <= 5);
     if (n_args > 4) {

diff --git a/py/asmx86.h b/py/asmx86.h
@@ -110,7 +110,7 @@ void asm_x86_mov_arg_to_r32(asm_x86_t *as, int src_arg_num, int dest_r32);
 void asm_x86_mov_local_to_r32(asm_x86_t* as, int src_local_num, int dest_r32);
 void asm_x86_mov_r32_to_local(asm_x86_t* as, int src_r32, int dest_local_num);
 void asm_x86_mov_local_addr_to_r32(asm_x86_t* as, int local_num, int dest_r32);
-void asm_x86_call_ind(asm_x86_t* as, void* ptr, mp_uint_t n_args, int temp_r32);
+void asm_x86_call_ind(asm_x86_t* as, const void* ptr, mp_uint_t n_args, int temp_r32);
 
 #if GENERIC_ASM_API
 

diff --git a/py/emitglue.c b/py/emitglue.c
@@ -113,6 +113,17 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
 }
 #endif
 
+#if MICROPY_PERSISTENT_NATIVE
+void mp_emit_glue_assign_persistent_native(mp_raw_code_t *rc, const void *fun_data,
+    mp_persistent_native_data_t *per_nat_data, size_t n_pos_args) {
+    rc->kind = MP_CODE_PERSISTENT_NATIVE;
+    rc->scope_flags = 0;
+    rc->n_pos_args = n_pos_args;
+    rc->data.u_persistent_native.fun_data = fun_data;
+    rc->data.u_persistent_native.per_nat_data = per_nat_data;
+}
+#endif
+
 mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_args, mp_obj_t def_kw_args) {
     DEBUG_OP_printf("make_function_from_raw_code %p\n", rc);
     assert(rc != NULL);
@@ -139,6 +150,12 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
             fun = mp_obj_new_fun_asm(rc->n_pos_args, rc->data.u_native.fun_data, rc->data.u_native.type_sig);
             break;
         #endif
+        #if MICROPY_PERSISTENT_NATIVE
+        case MP_CODE_PERSISTENT_NATIVE:
+            fun = mp_obj_new_fun_persistent_native(false, rc->n_pos_args, rc->n_pos_args,
+                rc->data.u_persistent_native.fun_data, rc->data.u_persistent_native.per_nat_data);
+            break;
+        #endif
         default:
             // rc->kind should always be set and BYTECODE is the only remaining case
             assert(rc->kind == MP_CODE_BYTECODE);

diff --git a/py/emitglue.h b/py/emitglue.h
@@ -37,8 +37,19 @@ typedef enum {
     MP_CODE_NATIVE_PY,
     MP_CODE_NATIVE_VIPER,
     MP_CODE_NATIVE_ASM,
+    MP_CODE_PERSISTENT_NATIVE,
 } mp_raw_code_kind_t;
 
+#if MICROPY_PERSISTENT_NATIVE
+typedef struct _mp_persistent_native_data_t {
+    const void *fun_table;
+    qstr *qstr_table;
+    void *data;
+} mp_persistent_native_data_t;
+
+mp_persistent_native_data_t *mp_new_persistent_native_data(size_t num_qstrs);
+#endif
+
 typedef struct _mp_raw_code_t {
     mp_raw_code_kind_t kind : 3;
     mp_uint_t scope_flags : 7;
@@ -58,6 +69,12 @@ typedef struct _mp_raw_code_t {
             const mp_uint_t *const_table;
             mp_uint_t type_sig; // for viper, compressed as 2-bit types; ret is MSB, then arg0, arg1, etc
         } u_native;
+        #if MICROPY_PERSISTENT_NATIVE
+        struct {
+            const void *fun_data;
+            mp_persistent_native_data_t *per_nat_data;
+        } u_persistent_native;
+        #endif
     } data;
 } mp_raw_code_t;
 
@@ -70,8 +87,38 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code, mp_uint_t
     #endif
     mp_uint_t scope_flags);
 void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void *fun_data, mp_uint_t fun_len, const mp_uint_t *const_table, mp_uint_t n_pos_args, mp_uint_t scope_flags, mp_uint_t type_sig);
+#if MICROPY_PERSISTENT_NATIVE
+void mp_emit_glue_assign_persistent_native(mp_raw_code_t *rc, const void *fun_data, mp_persistent_native_data_t *per_nat_data, size_t n_pos_args);
+#endif
 
 mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_args, mp_obj_t def_kw_args);
 mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, mp_uint_t n_closed_over, const mp_obj_t *args);
 
+#if MICROPY_PERSISTENT_CODE
+
+#define MP_PERSISTENT_ARCH_X86          (1)
+#define MP_PERSISTENT_ARCH_X64          (2)
+#define MP_PERSISTENT_ARCH_M0           (3)
+#define MP_PERSISTENT_ARCH_M4           (4)
+#define MP_PERSISTENT_ARCH_ARM          (5)
+
+// Reference for GCC defines:
+// http://micro-os-plus.github.io/develop/predefined-macros/
+
+#if defined(__i386__)
+#define MP_PERSISTENT_ARCH_CURRENT (MP_PERSISTENT_ARCH_X86)
+#elif defined(__x86_64__)
+#define MP_PERSISTENT_ARCH_CURRENT (MP_PERSISTENT_ARCH_X64)
+#elif defined(__ARM_ARCH_6M__)
+#define MP_PERSISTENT_ARCH_CURRENT (MP_PERSISTENT_ARCH_M0)
+#elif defined(__ARM_ARCH_7EM__)
+#define MP_PERSISTENT_ARCH_CURRENT (MP_PERSISTENT_ARCH_M4)
+#elif defined(__arm__) && !defined(__thumb__)
+#define MP_PERSISTENT_ARCH_CURRENT (MP_PERSISTENT_ARCH_ARM)
+#else
+#error unknown machine architecture
+#endif
+
+#endif // MICROPY_PERSISTENT_CODE
+
 #endif // MICROPY_INCLUDED_PY_EMITGLUE_H