shared/runtime/pyexec: Refactor default exception handler into own function.

Also improve consistency with the matching functionality in the unix port.

Signed-off-by: Andrew Leech <[email protected]>

Author: pi-anl

shared/runtime/pyexec.c

@@ -39,6 +39,7 @@
 #include "irq.h"
 #include "usb.h"
 #endif
+#include "extmod/modplatform.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "genhdr/mpversion.h"
@@ -58,6 +59,25 @@ static bool repl_display_debugging_info = 0;
 #define EXEC_FLAG_SOURCE_IS_READER      (1 << 6)
 #define EXEC_FLAG_NO_INTERRUPT          (1 << 7)
 
+// If exc is SystemExit, return value where FORCED_EXIT bit set,
+// and lower 8 bits are SystemExit value. For all other exceptions,
+// return 1.
+int pyexec_handle_uncaught_exception(mp_obj_base_t *exc) {
+    // check for SystemExit
+    if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
+
+        mp_obj_t exit_val = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
+        mp_int_t val = 0;
+        if (exit_val != mp_const_none && !mp_obj_get_int_maybe(exit_val, &val)) {
+            val = 1;
+        }
+        return PYEXEC_FORCED_EXIT | (val & 255);
+    }
+
+    mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(exc));
+    return 1;
+}
+
 // parses, compiles and executes the code in the lexer
 // frees the lexer before returning
 // EXEC_FLAG_PRINT_EOF prints 2 EOF chars: 1 after normal output, 1 after exception output
@@ -139,14 +159,7 @@ static int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             mp_hal_stdout_tx_strn("\x04", 1);
         }
 
-        // check for SystemExit
-        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
-            // at the moment, the value of SystemExit is unused
-            ret = PYEXEC_FORCED_EXIT;
-        } else {
-            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
-            ret = 0;
-        }
+        pyexec_handle_uncaught_exception(nlr.ret_val);
     }
 
     #if MICROPY_REPL_INFO

shared/runtime/pyexec.h

@@ -36,6 +36,7 @@ typedef enum {
 extern pyexec_mode_kind_t pyexec_mode_kind;
 
 #define PYEXEC_FORCED_EXIT (0x100)
+int pyexec_handle_uncaught_exception(mp_obj_base_t *exc);
 
 int pyexec_raw_repl(void);
 int pyexec_friendly_repl(void);