Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-08-12 13:41:59 +02:00
Code Issues Actions 50 Packages Projects Releases Wiki Activity

py/persistentcode: Allow a port a custom commit function and track data.

Browse Source 
Allows both MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA and MP_PLAT_COMMIT_EXEC
to be enabled at the same time.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-04-22 11:48:30 +10:00
parent 3d19a8bc2d
commit 3d7edbd9ab
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py/persistentcode.c
View File

@@ -72,6 +72,8 @@ typedef struct _bytecode_prelude_t {
static int read_byte(mp_reader_t *reader); static int read_byte(mp_reader_t *reader);
static size_t read_uint(mp_reader_t *reader); static size_t read_uint(mp_reader_t *reader);
#if MICROPY_EMIT_MACHINE_CODE
#if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA #if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA
// An mp_obj_list_t that tracks native text/BSS/rodata to prevent the GC from reclaiming them. // An mp_obj_list_t that tracks native text/BSS/rodata to prevent the GC from reclaiming them.
@@ -86,8 +88,6 @@ static void track_root_pointer(void *ptr) {
#endif #endif
#if MICROPY_EMIT_MACHINE_CODE
typedef struct _reloc_info_t { typedef struct _reloc_info_t {
mp_reader_t *reader; mp_reader_t *reader;
mp_module_context_t *context; mp_module_context_t *context;
@@ -415,15 +415,17 @@ static mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
// Relocate and commit code to executable address space // Relocate and commit code to executable address space
reloc_info_t ri = {reader, context, rodata, bss}; reloc_info_t ri = {reader, context, rodata, bss};
#if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
// Track the function data memory so it's not reclaimed by the GC.
track_root_pointer(fun_data);
}
#endif
#if defined(MP_PLAT_COMMIT_EXEC) #if defined(MP_PLAT_COMMIT_EXEC)
void *opt_ri = (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) ? &ri : NULL; void *opt_ri = (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) ? &ri : NULL;
fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri); fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri);
#else #else
if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) { if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
#if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA
// Track the function data memory so it's not reclaimed by the GC.
track_root_pointer(fun_data);
#endif
// Do the relocations. // Do the relocations.
mp_native_relocate(&ri, fun_data, (uintptr_t)fun_data); mp_native_relocate(&ri, fun_data, (uintptr_t)fun_data);
} }

2
py/runtime.c
View File

@@ -123,7 +123,7 @@ void mp_init(void) {
MP_STATE_VM(mp_module_builtins_override_dict) = NULL; MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
#endif #endif
#if MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA #if MICROPY_EMIT_MACHINE_CODE && (MICROPY_PERSISTENT_CODE_TRACK_FUN_DATA || MICROPY_PERSISTENT_CODE_TRACK_BSS_RODATA)
MP_STATE_VM(persistent_code_root_pointers) = MP_OBJ_NULL; MP_STATE_VM(persistent_code_root_pointers) = MP_OBJ_NULL;
#endif #endif