diff --git a/py/builtinimport.c b/py/builtinimport.c index cd9636ccdc2d4..30dd4c02552db 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -63,12 +63,14 @@ bool mp_obj_is_package(mp_obj_t module) { // uses mp_vfs_import_stat) to also search frozen modules. Given an exact // path to a file or directory (e.g. "foo/bar", foo/bar.py" or "foo/bar.mpy"), // will return whether the path is a file, directory, or doesn't exist. -STATIC mp_import_stat_t stat_path_or_frozen(const char *path) { +STATIC mp_import_stat_t stat_path_or_frozen(const char *path, bool allow_frozen) { #if MICROPY_MODULE_FROZEN - // Only try and load as a frozen module if it starts with .frozen/. - const int frozen_path_prefix_len = strlen(MP_FROZEN_PATH_PREFIX); - if (strncmp(path, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) { - return mp_find_frozen_module(path + frozen_path_prefix_len, NULL, NULL); + if (allow_frozen) { + // Only try and load as a frozen module if it starts with .frozen/. + const int frozen_path_prefix_len = strlen(MP_FROZEN_PATH_PREFIX); + if (strncmp(path, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) { + return mp_find_frozen_module(path + frozen_path_prefix_len, NULL, NULL); + } } #endif return mp_import_stat(path); @@ -76,8 +78,8 @@ STATIC mp_import_stat_t stat_path_or_frozen(const char *path) { // Given a path to a .py file, try and find this path as either a .py or .mpy // in either the filesystem or frozen modules. -STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) { - mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path)); +STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path, bool allow_frozen) { + mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path), allow_frozen); if (stat == MP_IMPORT_STAT_FILE) { return stat; } @@ -85,7 +87,7 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) { #if MICROPY_PERSISTENT_CODE_LOAD // Didn't find .py -- try the .mpy instead by inserting an 'm' into the '.py'. vstr_ins_byte(path, path->len - 2, 'm'); - stat = stat_path_or_frozen(vstr_null_terminated_str(path)); + stat = mp_import_stat(vstr_null_terminated_str(path)); if (stat == MP_IMPORT_STAT_FILE) { return stat; } @@ -97,7 +99,7 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) { // Given an import path (e.g. "foo/bar"), try and find "foo/bar" (a directory) // or "foo/bar.(m)py" in either the filesystem or frozen modules. STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) { - mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path)); + mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path), true); DEBUG_printf("stat %s: %d\n", vstr_str(path), stat); if (stat == MP_IMPORT_STAT_DIR) { return stat; @@ -105,7 +107,7 @@ STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) { // not a directory, add .py and try as a file vstr_add_str(path, ".py"); - return stat_file_py_or_mpy(path); + return stat_file_py_or_mpy(path, true); } // Given a top-level module, try and find it in each of the sys.path entries @@ -207,7 +209,42 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) { int frozen_type; const int frozen_path_prefix_len = strlen(MP_FROZEN_PATH_PREFIX); if (strncmp(file_str, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) { - mp_find_frozen_module(file_str + frozen_path_prefix_len, &frozen_type, &modref); + // Remove ".frozen/" from the start of the path. + vstr_cut_head_bytes(file, frozen_path_prefix_len); + file_str = vstr_null_terminated_str(file); + + #if MICROPY_ENABLE_FROZEN_OVERLAY + // If micropython.frozen_overlay() is set, then attempt to load it from the filesystem + // at that path. + if (MP_STATE_VM(frozen_overlay_path) != MP_OBJ_NULL) { + size_t frozen_overlay_path_len; + const char *frozen_overlay_path = mp_obj_str_get_data(MP_STATE_VM(frozen_overlay_path), &frozen_overlay_path_len); + + // Prepend the overlay path prefix and see if it exists. + if (frozen_overlay_path_len) { + vstr_ins_strn(file, 0, frozen_overlay_path, frozen_overlay_path_len); + vstr_ins_char(file, frozen_overlay_path_len, PATH_SEP_CHAR[0]); + } + mp_import_stat_t stat = stat_file_py_or_mpy(file, false); + if (stat != MP_IMPORT_STAT_NO_EXIST) { + // Found this file (either as .py or .mpy). + file_str = vstr_null_terminated_str(file); + goto use_overlay; + } else { + // Remove the overlay prefix. + if (frozen_overlay_path_len) { + vstr_cut_head_bytes(file, frozen_overlay_path_len + 1); + } + #if MICROPY_PERSISTENT_CODE_LOAD + // stat_file_py_or_mpy will have attempted to match the .mpy, undo that. + vstr_cut_out_bytes(file, file->len - 3, 1); + #endif + file_str = vstr_null_terminated_str(file); + } + } + #endif // MICROPY_ENABLE_FROZEN_OVERLAY + + mp_find_frozen_module(file_str, &frozen_type, &modref); // If we support frozen str modules and the compiler is enabled, and we // found the filename in the list of frozen files, then load and execute it. @@ -224,12 +261,18 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) { if (frozen_type == MP_FROZEN_MPY) { const mp_frozen_module_t *frozen = modref; module_obj->constants = frozen->constants; - do_execute_raw_code(module_obj, frozen->rc, module_obj, file_str + frozen_path_prefix_len); + do_execute_raw_code(module_obj, frozen->rc, module_obj, file_str); return; } #endif + + MP_UNREACHABLE; } + #if MICROPY_ENABLE_FROZEN_OVERLAY +use_overlay: + #endif + #endif // MICROPY_MODULE_FROZEN // If we support loading .mpy files then check if the file extension is of @@ -439,7 +482,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name, mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(path), vstr_len(path))); size_t orig_path_len = path->len; vstr_add_str(path, PATH_SEP_CHAR "__init__.py"); - if (stat_file_py_or_mpy(path) == MP_IMPORT_STAT_FILE) { + if (stat_file_py_or_mpy(path, true) == MP_IMPORT_STAT_FILE) { do_load(MP_OBJ_TO_PTR(module_obj), path); } else { // No-op. Nothing to load. diff --git a/py/misc.h b/py/misc.h index b7b6146abcce6..464e824b01271 100644 --- a/py/misc.h +++ b/py/misc.h @@ -211,6 +211,7 @@ void vstr_add_str(vstr_t *vstr, const char *str); void vstr_add_strn(vstr_t *vstr, const char *str, size_t len); void vstr_ins_byte(vstr_t *vstr, size_t byte_pos, byte b); void vstr_ins_char(vstr_t *vstr, size_t char_pos, unichar chr); +void vstr_ins_strn(vstr_t *vstr, size_t char_pos, const char *str, size_t len); void vstr_cut_head_bytes(vstr_t *vstr, size_t bytes_to_cut); void vstr_cut_tail_bytes(vstr_t *vstr, size_t bytes_to_cut); void vstr_cut_out_bytes(vstr_t *vstr, size_t byte_pos, size_t bytes_to_cut); diff --git a/py/modmicropython.c b/py/modmicropython.c index eafff90c60eba..0e13dd5bd2696 100644 --- a/py/modmicropython.c +++ b/py/modmicropython.c @@ -164,6 +164,14 @@ STATIC mp_obj_t mp_micropython_schedule(mp_obj_t function, mp_obj_t arg) { STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_micropython_schedule_obj, mp_micropython_schedule); #endif +#if MICROPY_ENABLE_FROZEN_OVERLAY +STATIC mp_obj_t mp_micropython_frozen_overlay(mp_obj_t frozen_overlay_path_in) { + MP_STATE_VM(frozen_overlay_path) = frozen_overlay_path_in; + return mp_const_none; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_micropython_frozen_overlay_obj, mp_micropython_frozen_overlay); +#endif + STATIC const mp_rom_map_elem_t mp_module_micropython_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_micropython) }, { MP_ROM_QSTR(MP_QSTR_const), MP_ROM_PTR(&mp_identity_obj) }, @@ -201,6 +209,9 @@ STATIC const mp_rom_map_elem_t mp_module_micropython_globals_table[] = { #if MICROPY_ENABLE_SCHEDULER { MP_ROM_QSTR(MP_QSTR_schedule), MP_ROM_PTR(&mp_micropython_schedule_obj) }, #endif + #if MICROPY_ENABLE_FROZEN_OVERLAY + { MP_ROM_QSTR(MP_QSTR_frozen_overlay), MP_ROM_PTR(&mp_micropython_frozen_overlay_obj) }, + #endif }; STATIC MP_DEFINE_CONST_DICT(mp_module_micropython_globals, mp_module_micropython_globals_table); diff --git a/py/mpconfig.h b/py/mpconfig.h index ee0123be34ea3..beafece2c2781 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -909,6 +909,11 @@ typedef double mp_float_t; #define MICROPY_SCHEDULER_DEPTH (4) #endif +// Whether to allow filesystem overlay of frozen code via micropython.frozen_overlay() +#ifndef MICROPY_ENABLE_FROZEN_OVERLAY +#define MICROPY_ENABLE_FROZEN_OVERLAY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) +#endif + // Support for generic VFS sub-system #ifndef MICROPY_VFS #define MICROPY_VFS (0) diff --git a/py/mpstate.h b/py/mpstate.h index 1b6e623ca9f63..2c39a4f8aaef5 100644 --- a/py/mpstate.h +++ b/py/mpstate.h @@ -158,6 +158,10 @@ typedef struct _mp_state_vm_t { mp_obj_dict_t *mp_module_builtins_override_dict; #endif + #if MICROPY_ENABLE_FROZEN_OVERLAY + mp_obj_t frozen_overlay_path; + #endif + // Include any root pointers registered with MP_REGISTER_ROOT_POINTER(). #ifndef NO_QSTR // Only include root pointer definitions when not doing qstr extraction, because diff --git a/py/vstr.c b/py/vstr.c index 56327b5f7ac7c..2f461131b60f4 100644 --- a/py/vstr.c +++ b/py/vstr.c @@ -210,6 +210,11 @@ void vstr_ins_char(vstr_t *vstr, size_t char_pos, unichar chr) { *s = chr; } +void vstr_ins_strn(vstr_t *vstr, size_t char_pos, const char *str, size_t len) { + char *s = vstr_ins_blank_bytes(vstr, char_pos, 1); + memcpy(s, str, len); +} + void vstr_cut_head_bytes(vstr_t *vstr, size_t bytes_to_cut) { vstr_cut_out_bytes(vstr, 0, bytes_to_cut); } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy