Commit 39a8deb9 authored by Damien George's avatar Damien George
Browse files

py/emitglue: Add feature-flag header to .mpy to detect bytecode compat.

Loading .mpy files will now check to make sure that the target VM can
support the bytecode.
parent 9f10d3fb
...@@ -319,12 +319,16 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) { ...@@ -319,12 +319,16 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
} }
mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader) { mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader) {
byte header[2]; byte header[3];
read_bytes(reader, header, 2); read_bytes(reader, header, 3);
if (strncmp((char*)header, "M\x00", 2) != 0) { if (strncmp((char*)header, "M\x00", 2) != 0) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
"invalid .mpy file")); "invalid .mpy file"));
} }
if (header[2] != MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
"incompatible .mpy file"));
}
return load_raw_code(reader); return load_raw_code(reader);
} }
...@@ -558,7 +562,13 @@ STATIC void save_raw_code(mp_print_t *print, mp_raw_code_t *rc) { ...@@ -558,7 +562,13 @@ STATIC void save_raw_code(mp_print_t *print, mp_raw_code_t *rc) {
} }
void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print) { void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print) {
mp_print_bytes(print, (const byte*)"M\x00", 2); // header contains:
// byte 'M'
// byte version
// byte feature flags (right now just OPT_CACHE_MAP_LOOKUP_IN_BYTECODE)
byte header[3] = {'M', 0, MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE};
mp_print_bytes(print, header, 3);
save_raw_code(print, rc); save_raw_code(print, rc);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment