Put call to qstr_init and mp_init_emergency_exc_buf in mp_init.

dpgeorge · dpgeorge · commit 8dbbbbc79355 · 2014-08-04T10:05:16.000+01:00
qstr_init is always called exactly before mp_init, so makes sense to
just have mp_init call it.  Similarly with
mp_init_emergency_exception_buf.  Doing this makes the ports simpler and
less error prone (ie they can no longer forget to call these).
diff --git a/bare-arm/main.c b/bare-arm/main.c
@@ -53,7 +53,6 @@ void do_str(const char *src) {
 }
 
 int main(int argc, char **argv) {
-    qstr_init();
     mp_init();
     do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\n')");
     mp_deinit();
diff --git a/py/runtime.c b/py/runtime.c
@@ -70,8 +70,13 @@ const mp_obj_module_t mp_module___main__ = {
 };
 
 void mp_init(void) {
+    qstr_init();
     mp_stack_ctrl_init();
 
+#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
+    mp_init_emergency_exception_buf();
+#endif
+
     // call port specific initialization if any
 #ifdef MICROPY_PORT_INIT_FUNC
     MICROPY_PORT_INIT_FUNC;
diff --git a/qemu-arm/main.c b/qemu-arm/main.c
@@ -53,7 +53,6 @@ void do_str(const char *src) {
 }
 
 int main(int argc, char **argv) {
-    qstr_init();
     mp_init();
     do_str("print('hello world!')");
     mp_deinit();
diff --git a/qemu-arm/test_main.c b/qemu-arm/test_main.c
@@ -59,7 +59,6 @@ inline void do_str(const char *src) {
 
 int main() {
     const char a[] = {"sim"};
-    qstr_init();
     mp_init();
     int r = tinytest_main(1, (const char **) a, groups);
     mp_deinit();
diff --git a/stmhal/main.c b/stmhal/main.c
@@ -310,9 +310,14 @@ int main(void) {
 
     // GC init
     gc_init(&_heap_start, &_heap_end);
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-    mp_init_emergency_exception_buf();
-#endif
+
+    // Micro Python init
+    mp_init();
+    mp_obj_list_init(mp_sys_path, 0);
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash));
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib));
+    mp_obj_list_init(mp_sys_argv, 0);
 
     // Change #if 0 to #if 1 if you want REPL on UART_6 (or another uart)
     // as well as on USB VCP
@@ -328,17 +333,7 @@ int main(void) {
     pyb_stdio_uart = NULL;
 #endif
 
-    // Micro Python init
-    qstr_init();
-    mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash));
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib));
-    mp_obj_list_init(mp_sys_argv, 0);
-
     readline_init();
-
     pin_init();
     extint_init();
 
diff --git a/teensy/main.c b/teensy/main.c
@@ -267,7 +267,7 @@ int main(void) {
     // GC init
     gc_init(&_heap_start, (void*)HEAP_END);
 
-    qstr_init();
+    // Micro Python init
     mp_init();
 
     readline_init();
diff --git a/unix-cpy/main.c b/unix-cpy/main.c
@@ -87,7 +87,6 @@ void do_file(const char *file) {
 }
 
 int main(int argc, char **argv) {
-    qstr_init();
     mp_init();
 
     if (argc == 2) {
diff --git a/unix/main.c b/unix/main.c
@@ -278,11 +278,7 @@ int main(int argc, char **argv) {
     char *heap = malloc(heap_size);
     gc_init(heap, heap + heap_size);
 #endif
-#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-    mp_init_emergency_exception_buf();
-#endif
 
-    qstr_init();
     mp_init();
 
     char *home = getenv("HOME");

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ void do_str(const char *src) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`int main(int argc, char **argv) {`
`56`		`- qstr_init();`
`57`	`56`	`mp_init();`
`58`	`57`	`do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\n')");`
`59`	`58`	`mp_deinit();`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ void do_file(const char *file) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`int main(int argc, char **argv) {`
`90`		`- qstr_init();`
`91`	`90`	`mp_init();`
`92`	`91`
`93`	`92`	`if (argc == 2) {`