py/persistentcode: Clarify ValueError when native emitter disabled.

pi-anl · pi-anl · commit d521899e18c3 · 2022-08-29T12:38:49.000+10:00
diff --git a/py/persistentcode.c b/py/persistentcode.c
@@ -402,7 +402,13 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
         byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
         if (!MPY_FEATURE_ARCH_TEST(arch)) {
-            mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));
+            if (MPY_FEATURE_ARCH_TEST(MP_NATIVE_ARCH_NONE)) {
+                // On supported ports this can be resolved by enabling feature, eg
+                // mpconfigboard.h: MICROPY_EMIT_THUMB (1)
+                mp_raise_ValueError(MP_ERROR_TEXT("native code in .mpy unsupported"));
+            } else {
+                mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,13 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t reader, mp_module_context_t `
`402`	`402`	`if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {`
`403`	`403`	`byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);`
`404`	`404`	`if (!MPY_FEATURE_ARCH_TEST(arch)) {`
`405`		`- mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));`
	`405`	`+ if (MPY_FEATURE_ARCH_TEST(MP_NATIVE_ARCH_NONE)) {`
	`406`	`+ // On supported ports this can be resolved by enabling feature, eg`
	`407`	`+ // mpconfigboard.h: MICROPY_EMIT_THUMB (1)`
	`408`	`+ mp_raise_ValueError(MP_ERROR_TEXT("native code in .mpy unsupported"));`
	`409`	`+ } else {`
	`410`	`+ mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));`
	`411`	`+ }`
`406`	`412`	`}`
`407`	`413`	`}`
`408`	`414`