esp32: Convert to use core-provided KeyboardInterrupt exception.

dpgeorge · dpgeorge · commit e8a724c0c67c · 2017-04-03T17:19:14.000+10:00
diff --git a/esp32/main.c b/esp32/main.c
@@ -64,7 +64,6 @@ void mp_task(void *pvParameter) {
     mp_stack_set_limit(MP_TASK_STACK_SIZE - 512);
     gc_init(mp_task_heap, mp_task_heap + sizeof(mp_task_heap));
     mp_init();
-    MP_STATE_PORT(mp_kbd_exception) = mp_obj_new_exception(&mp_type_KeyboardInterrupt);
     mp_obj_list_init(mp_sys_path, 0);
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib));
diff --git a/esp32/mpconfigport.h b/esp32/mpconfigport.h
@@ -29,6 +29,7 @@
 #define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
+#define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
 #define MICROPY_REPL_EMACS_KEYS             (1)
 #define MICROPY_REPL_AUTO_INDENT            (1)
@@ -190,7 +191,6 @@ extern const struct _mp_obj_module_t mp_module_network;
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
-    mp_obj_t mp_kbd_exception; \
     mp_obj_t machine_pin_irq_handler[40]; \
 
 // type definitions for the specific machine
diff --git a/esp32/uart.c b/esp32/uart.c
@@ -51,7 +51,7 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
         uint8_t c = uart->fifo.rw_byte;
         if (c == mp_interrupt_char) {
             // inline version of mp_keyboard_interrupt();
-            MP_STATE_VM(mp_pending_exception) = MP_STATE_PORT(mp_kbd_exception);
+            MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
             #if MICROPY_ENABLE_SCHEDULER
             if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
                 MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
