pretty traceback

Author: EcmaXp

src/machine.c

@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/objexcept.h"
@@ -102,7 +104,7 @@ void nlr_jump_fail(void *val) {
 }
 
 void NORETURN __fatal_error(const char *msg) {
-    __syscall2(SYS_CONTROL, SYS_CONTROL_CRASH, (int) msg);
+    __syscall3(SYS_CONTROL, SYS_CONTROL_CRASH, (int) msg, (int) strlen(msg));
     for (;;);
 }
 

src/main.c

@@ -8,6 +8,7 @@
 #include "py/repl.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
+#include "py/frozenmod.h"
 #include "lib/utils/pyexec.h"
 #include "gccollect.h"
 #include "machine.h"
@@ -36,9 +37,18 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     }
 }
 
+void do_frozen(const char *name) {
+    void *frozen_data;
+    int frozen_type = mp_find_frozen_module(name, strlen(name), &frozen_data);
+    if (frozen_type != MP_FROZEN_MPY)
+        __fatal_error("frozen_type != MP_FROZEN_MPY");
+
+    mp_obj_t module_fun = mp_make_function_from_raw_code(frozen_data, MP_OBJ_NULL, MP_OBJ_NULL);
+    mp_call_function_0(module_fun);
+}
+
 int main(int argc, char **argv) {
     nlr_buf_t nlr;
-    int code;
 
     if (nlr_push(&nlr) == 0) {
         mp_stack_set_top((uint8_t * ) & _estack);
@@ -57,28 +67,42 @@ int main(int argc, char **argv) {
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(mp_sys_argv, 0);
 
-        code = pyexec_frozen_module("bios.py");
-        if (code != 1) {
-            // error or SystemExit
-            return 1;
-        } else {
-            // done, give interpreter for now
-            for (;;) {
-                if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
-                    if (pyexec_raw_repl() != 0) {
-                        break;
-                    }
-                } else {
-                    if (pyexec_friendly_repl() != 0) {
-                        break;
-                    }
+        do_frozen("bios.py");
+
+        for (;;) {
+            if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+                if (pyexec_raw_repl() != 0) {
+                    break;
+                }
+            } else {
+                if (pyexec_friendly_repl() != 0) {
+                    break;
                 }
             }
         }
 
         nlr_pop();
     } else {
-        mp_obj_print_exception(&debug_print, (mp_obj_t) nlr.ret_val);
+        nlr_buf_t nlr2;
+        if (nlr_push(&nlr2) == 0) {
+            vstr_t vstr;
+            mp_print_t print;
+            vstr_init_print(&vstr, 256, &print);
+
+            mp_obj_print_exception(&print, (mp_obj_t) nlr.ret_val);
+            char *message = vstr_null_terminated_str(&vstr);
+            __fatal_error(message);
+            nlr_pop();
+        } else {
+            vstr_t vstr;
+            mp_print_t print;
+            vstr_init_print(&vstr, 256, &print);
+
+            mp_obj_print_helper(&print, (mp_obj_t) nlr.ret_val, PRINT_EXC);
+            char *message = vstr_null_terminated_str(&vstr);
+            __fatal_error(message);
+        }
+
         mp_deinit();
     }
 

src/modules/bios.py

@@ -51,8 +51,8 @@ def main():
 
     content = load(address)
     context = {'__name__': '__main__', '__path__': address}
-    func = compile(content, "<init>", "exec")
-    exec(content, context)
+    func = compile(content, init, "exec")
+    exec(func, context)
 
 
 if __name__ == '__main__':
@@ -62,10 +62,8 @@ def main():
     data = invoke(eeprom, 'get')
     context = {'__name__': '__main__', '__path__': eeprom}
 
-    try:
-        exec(data, context)
-    except BaseException as e:
-        print(type(e), e)
+    func = compile(data, "<EEPROM>", "exec")
+    exec(func, context)
 
 
 bios()