Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 1 | /* |
| 2 | * This file is part of the Micro Python project, http://micropython.org/ |
| 3 | * |
| 4 | * The MIT License (MIT) |
| 5 | * |
| 6 | * Copyright (c) 2013, 2014 Damien P. George |
Paul Sokolovsky | da9f092 | 2014-05-13 08:44:45 +0300 | [diff] [blame] | 7 | * Copyright (c) 2014 Paul Sokolovsky |
Damien George | 04b9147 | 2014-05-03 23:27:38 +0100 | [diff] [blame] | 8 | * |
| 9 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 10 | * of this software and associated documentation files (the "Software"), to deal |
| 11 | * in the Software without restriction, including without limitation the rights |
| 12 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| 13 | * copies of the Software, and to permit persons to whom the Software is |
| 14 | * furnished to do so, subject to the following conditions: |
| 15 | * |
| 16 | * The above copyright notice and this permission notice shall be included in |
| 17 | * all copies or substantial portions of the Software. |
| 18 | * |
| 19 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 20 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 21 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| 22 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 23 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 24 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 25 | * THE SOFTWARE. |
| 26 | */ |
| 27 | |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 28 | #include <stdio.h> |
Paul Sokolovsky | 55ca075 | 2014-03-30 17:35:53 +0300 | [diff] [blame] | 29 | #include <string.h> |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 30 | #include <assert.h> |
Paul Sokolovsky | b16523a | 2014-05-31 03:41:08 +0300 | [diff] [blame] | 31 | #include <alloca.h> |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 32 | |
Paul Sokolovsky | f54bcbf | 2014-05-02 17:47:01 +0300 | [diff] [blame] | 33 | #include "mpconfig.h" |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 34 | #include "nlr.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 35 | #include "misc.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 36 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 37 | #include "obj.h" |
Damien George | df8127a | 2014-04-13 11:04:33 +0100 | [diff] [blame] | 38 | #include "emitglue.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 39 | #include "runtime.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 40 | #include "bc0.h" |
Damien | eb19efb | 2013-10-10 22:06:54 +0100 | [diff] [blame] | 41 | #include "bc.h" |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 42 | #include "objgenerator.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 43 | |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 44 | // With these macros you can tune the maximum number of function state bytes |
Damien George | d5e8482 | 2014-04-24 13:52:06 +0100 | [diff] [blame] | 45 | // that will be allocated on the stack. Any function that needs more |
| 46 | // than this will use the heap. |
Damien George | 1b87d10 | 2014-06-01 12:06:17 +0100 | [diff] [blame] | 47 | #define VM_MAX_STATE_ON_STACK (10 * sizeof(machine_uint_t)) |
Damien George | d5e8482 | 2014-04-24 13:52:06 +0100 | [diff] [blame] | 48 | |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 49 | #define DETECT_VM_STACK_OVERFLOW (0) |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 50 | #if 0 |
Damien George | 3417bc2 | 2014-05-10 10:36:38 +0100 | [diff] [blame] | 51 | #define TRACE(ip) mp_bytecode_print2(ip, 1); |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 52 | #else |
| 53 | #define TRACE(ip) |
| 54 | #endif |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 55 | |
Paul Sokolovsky | 8519342 | 2014-01-31 19:45:15 +0200 | [diff] [blame] | 56 | // Value stack grows up (this makes it incompatible with native C stack, but |
| 57 | // makes sure that arguments to functions are in natural order arg1..argN |
| 58 | // (Python semantics mandates left-to-right evaluation order, including for |
| 59 | // function arguments). Stack pointer is pre-incremented and points at the |
| 60 | // top element. |
| 61 | // Exception stack also grows up, top element is also pointed at. |
| 62 | |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 63 | // Exception stack unwind reasons (WHY_* in CPython-speak) |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 64 | // TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds |
| 65 | // left to do encoded in the JUMP number |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 66 | typedef enum { |
| 67 | UNWIND_RETURN = 1, |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 68 | UNWIND_JUMP, |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 69 | } mp_unwind_reason_t; |
| 70 | |
Damien George | df8127a | 2014-04-13 11:04:33 +0100 | [diff] [blame] | 71 | #define DECODE_UINT do { \ |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 72 | unum = 0; \ |
| 73 | do { \ |
| 74 | unum = (unum << 7) + (*ip & 0x7f); \ |
| 75 | } while ((*ip++ & 0x80) != 0); \ |
Damien George | df8127a | 2014-04-13 11:04:33 +0100 | [diff] [blame] | 76 | } while (0) |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 77 | #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0) |
| 78 | #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0) |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 79 | #define DECODE_QSTR qstr qst = 0; \ |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 80 | do { \ |
| 81 | qst = (qst << 7) + (*ip & 0x7f); \ |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 82 | } while ((*ip++ & 0x80) != 0) |
Damien George | df8127a | 2014-04-13 11:04:33 +0100 | [diff] [blame] | 83 | #define DECODE_PTR do { \ |
| 84 | ip = (byte*)(((machine_uint_t)ip + sizeof(machine_uint_t) - 1) & (~(sizeof(machine_uint_t) - 1))); /* align ip */ \ |
| 85 | unum = *(machine_uint_t*)ip; \ |
| 86 | ip += sizeof(machine_uint_t); \ |
| 87 | } while (0) |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 88 | #define PUSH(val) *++sp = (val) |
| 89 | #define POP() (*sp--) |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 90 | #define TOP() (*sp) |
| 91 | #define SET_TOP(val) *sp = (val) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 92 | |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 93 | #define PUSH_EXC_BLOCK() \ |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 94 | DECODE_ULABEL; /* except labels are always forward */ \ |
| 95 | ++exc_sp; \ |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 96 | exc_sp->opcode = *code_state->ip; \ |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 97 | exc_sp->handler = ip + unum; \ |
| 98 | exc_sp->val_sp = MP_TAGPTR_MAKE(sp, currently_in_except_block); \ |
Damien George | d7592a1 | 2014-03-30 00:54:48 +0000 | [diff] [blame] | 99 | exc_sp->prev_exc = MP_OBJ_NULL; \ |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 100 | currently_in_except_block = 0; /* in a try block now */ |
| 101 | |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 102 | #define POP_EXC_BLOCK() \ |
| 103 | currently_in_except_block = MP_TAGPTR_TAG(exc_sp->val_sp); /* restore previous state */ \ |
| 104 | exc_sp--; /* pop back to previous exception handler */ |
| 105 | |
Paul Sokolovsky | 1f07b7e | 2014-05-31 03:36:37 +0300 | [diff] [blame] | 106 | mp_vm_return_kind_t mp_execute_bytecode(const byte *code, const mp_obj_t *args, uint n_args, |
| 107 | const mp_obj_t *args2, uint n_args2, mp_obj_t *ret) { |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 108 | const byte *ip = code; |
| 109 | |
| 110 | // get code info size, and skip line number table |
| 111 | machine_uint_t code_info_size = ip[0] | (ip[1] << 8) | (ip[2] << 16) | (ip[3] << 24); |
| 112 | ip += code_info_size; |
| 113 | |
Damien George | bee17b0 | 2014-03-27 11:07:04 +0000 | [diff] [blame] | 114 | // bytecode prelude: state size and exception stack size; 16 bit uints |
| 115 | machine_uint_t n_state = ip[0] | (ip[1] << 8); |
| 116 | machine_uint_t n_exc_stack = ip[2] | (ip[3] << 8); |
| 117 | ip += 4; |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 118 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 119 | // allocate state for locals and stack |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 120 | #if DETECT_VM_STACK_OVERFLOW |
Damien George | a1ef441 | 2014-04-10 16:59:44 +0000 | [diff] [blame] | 121 | n_state += 1; |
| 122 | #endif |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 123 | |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 124 | int state_size = n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t); |
| 125 | mp_code_state *code_state; |
| 126 | if (state_size > VM_MAX_STATE_ON_STACK) { |
| 127 | code_state = m_new_obj_var(mp_code_state, byte, state_size); |
Paul Sokolovsky | b16523a | 2014-05-31 03:41:08 +0300 | [diff] [blame] | 128 | } else { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 129 | code_state = alloca(sizeof(mp_code_state) + state_size); |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 130 | } |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 131 | |
| 132 | code_state->code_info = code; |
| 133 | code_state->sp = &code_state->state[0] - 1; |
| 134 | code_state->exc_sp = (mp_exc_stack_t*)(code_state->state + n_state) - 1; |
| 135 | code_state->n_state = n_state; |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 136 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 137 | // init args |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 138 | for (uint i = 0; i < n_args; i++) { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 139 | code_state->state[n_state - 1 - i] = args[i]; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 140 | } |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 141 | for (uint i = 0; i < n_args2; i++) { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 142 | code_state->state[n_state - 1 - n_args - i] = args2[i]; |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 143 | } |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 144 | |
Damien George | d99944a | 2014-04-09 19:53:31 +0100 | [diff] [blame] | 145 | // set rest of state to MP_OBJ_NULL |
| 146 | for (uint i = 0; i < n_state - n_args - n_args2; i++) { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 147 | code_state->state[i] = MP_OBJ_NULL; |
Damien George | d99944a | 2014-04-09 19:53:31 +0100 | [diff] [blame] | 148 | } |
| 149 | |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 150 | // bytecode prelude: initialise closed over variables |
| 151 | for (uint n_local = *ip++; n_local > 0; n_local--) { |
| 152 | uint local_num = *ip++; |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 153 | code_state->state[n_state - 1 - local_num] = mp_obj_new_cell(code_state->state[n_state - 1 - local_num]); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 154 | } |
| 155 | |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 156 | code_state->ip = ip; |
| 157 | |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 158 | // execute the byte code |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 159 | mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode2(code_state, MP_OBJ_NULL); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 160 | |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 161 | #if DETECT_VM_STACK_OVERFLOW |
Paul Sokolovsky | ff8da0b | 2014-05-31 18:14:54 +0300 | [diff] [blame] | 162 | if (vm_return_kind == MP_VM_RETURN_NORMAL) { |
Damien George | 1b87d10 | 2014-06-01 12:06:17 +0100 | [diff] [blame] | 163 | if (code_state->sp < code_state->state) { |
| 164 | printf("VM stack underflow: " INT_FMT "\n", code_state->sp - code_state->state); |
Paul Sokolovsky | ff8da0b | 2014-05-31 18:14:54 +0300 | [diff] [blame] | 165 | assert(0); |
| 166 | } |
| 167 | } |
Damien George | a1ef441 | 2014-04-10 16:59:44 +0000 | [diff] [blame] | 168 | // We can't check the case when an exception is returned in state[n_state - 1] |
| 169 | // and there are no arguments, because in this case our detection slot may have |
| 170 | // been overwritten by the returned exception (which is allowed). |
| 171 | if (!(vm_return_kind == MP_VM_RETURN_EXCEPTION && n_args == 0 && n_args2 == 0)) { |
| 172 | // Just check to see that we have at least 1 null object left in the state. |
| 173 | bool overflow = true; |
| 174 | for (uint i = 0; i < n_state - n_args - n_args2; i++) { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 175 | if (code_state->state[i] == MP_OBJ_NULL) { |
Damien George | a1ef441 | 2014-04-10 16:59:44 +0000 | [diff] [blame] | 176 | overflow = false; |
| 177 | break; |
| 178 | } |
| 179 | } |
| 180 | if (overflow) { |
Damien George | 1b87d10 | 2014-06-01 12:06:17 +0100 | [diff] [blame] | 181 | printf("VM stack overflow state=%p n_state+1=" UINT_FMT "\n", code_state->state, n_state); |
Damien George | a1ef441 | 2014-04-10 16:59:44 +0000 | [diff] [blame] | 182 | assert(0); |
| 183 | } |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 184 | } |
| 185 | #endif |
| 186 | |
Damien George | c0dc7c3 | 2014-04-24 15:42:05 +0100 | [diff] [blame] | 187 | mp_vm_return_kind_t ret_kind; |
| 188 | switch (vm_return_kind) { |
| 189 | case MP_VM_RETURN_NORMAL: |
| 190 | // return value is in *sp |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 191 | *ret = *code_state->sp; |
Damien George | c0dc7c3 | 2014-04-24 15:42:05 +0100 | [diff] [blame] | 192 | ret_kind = MP_VM_RETURN_NORMAL; |
| 193 | break; |
| 194 | |
| 195 | case MP_VM_RETURN_EXCEPTION: |
| 196 | // return value is in state[n_state - 1] |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 197 | *ret = code_state->state[n_state - 1]; |
Damien George | c0dc7c3 | 2014-04-24 15:42:05 +0100 | [diff] [blame] | 198 | ret_kind = MP_VM_RETURN_EXCEPTION; |
| 199 | break; |
| 200 | |
| 201 | case MP_VM_RETURN_YIELD: // byte-code shouldn't yield |
| 202 | default: |
| 203 | assert(0); |
| 204 | *ret = mp_const_none; |
| 205 | ret_kind = MP_VM_RETURN_NORMAL; |
Damien George | 1b87d10 | 2014-06-01 12:06:17 +0100 | [diff] [blame] | 206 | break; |
Damien George | c0dc7c3 | 2014-04-24 15:42:05 +0100 | [diff] [blame] | 207 | } |
Damien George | d5e8482 | 2014-04-24 13:52:06 +0100 | [diff] [blame] | 208 | |
| 209 | // free the state if it was allocated on the heap |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 210 | if (state_size > VM_MAX_STATE_ON_STACK) { |
| 211 | m_del_var(mp_code_state, byte, state_size, code_state); |
Damien George | d5e8482 | 2014-04-24 13:52:06 +0100 | [diff] [blame] | 212 | } |
Damien George | c0dc7c3 | 2014-04-24 15:42:05 +0100 | [diff] [blame] | 213 | return ret_kind; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 214 | } |
| 215 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 216 | // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc) |
| 217 | // sp points to bottom of stack which grows up |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 218 | // returns: |
| 219 | // MP_VM_RETURN_NORMAL, sp valid, return value in *sp |
| 220 | // MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp |
| 221 | // MP_VM_RETURN_EXCEPTION, exception in fastn[0] |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 222 | mp_vm_return_kind_t mp_execute_bytecode2(mp_code_state *code_state, volatile mp_obj_t inject_exc) { |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 223 | #if MICROPY_OPT_COMPUTED_GOTO |
AZ Huang | 9413ca0 | 2014-04-15 21:29:08 +0800 | [diff] [blame] | 224 | #include "vmentrytable.h" |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 225 | #define DISPATCH() do { \ |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 226 | TRACE(ip); \ |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 227 | code_state->ip = ip; \ |
Damien George | db12891 | 2014-04-27 18:19:06 +0100 | [diff] [blame] | 228 | goto *entry_table[*ip++]; \ |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 229 | } while(0) |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 230 | #define ENTRY(op) entry_##op |
| 231 | #define ENTRY_DEFAULT entry_default |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 232 | #else |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 233 | #define DISPATCH() break |
| 234 | #define ENTRY(op) case op |
| 235 | #define ENTRY_DEFAULT default |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 236 | #endif |
| 237 | |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 238 | // nlr_raise needs to be implemented as a goto, so that the C compiler's flow analyser |
| 239 | // sees that it's possible for us to jump from the dispatch loop to the exception |
| 240 | // handler. Without this, the code may have a different stack layout in the dispatch |
| 241 | // loop and the exception handler, leading to very obscure bugs. |
| 242 | #define RAISE(o) do { nlr_pop(); nlr.ret_val = o; goto exception_handler; } while(0) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 243 | |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 244 | // Pointers which are constant for particular invocation of mp_execute_bytecode2() |
| 245 | mp_obj_t *const fastn = &code_state->state[code_state->n_state - 1]; |
| 246 | mp_exc_stack_t *const exc_stack = (mp_exc_stack_t*)(code_state->state + code_state->n_state); |
| 247 | |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 248 | // variables that are visible to the exception handler (declared volatile) |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 249 | volatile bool currently_in_except_block = MP_TAGPTR_TAG(code_state->exc_sp); // 0 or 1, to detect nested exceptions |
| 250 | mp_exc_stack_t *volatile exc_sp = MP_TAGPTR_PTR(code_state->exc_sp); // stack grows up, exc_sp points to top of stack |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 251 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 252 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 253 | for (;;) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 254 | nlr_buf_t nlr; |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 255 | outer_dispatch_loop: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 256 | if (nlr_push(&nlr) == 0) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 257 | // local variables that are not visible to the exception handler |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 258 | const byte *ip = code_state->ip; |
| 259 | mp_obj_t *sp = code_state->sp; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 260 | machine_uint_t unum; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 261 | mp_obj_t obj_shared; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 262 | |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 263 | // If we have exception to inject, now that we finish setting up |
| 264 | // execution context, raise it. This works as if RAISE_VARARGS |
| 265 | // bytecode was executed. |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 266 | // Injecting exc into yield from generator is a special case, |
| 267 | // handled by MP_BC_YIELD_FROM itself |
| 268 | if (inject_exc != MP_OBJ_NULL && *ip != MP_BC_YIELD_FROM) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 269 | mp_obj_t exc = inject_exc; |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 270 | inject_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 271 | exc = mp_make_raise_obj(exc); |
| 272 | RAISE(exc); |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 273 | } |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 274 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 275 | // loop to execute byte code |
| 276 | for (;;) { |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 277 | dispatch_loop: |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 278 | #if MICROPY_OPT_COMPUTED_GOTO |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 279 | DISPATCH(); |
| 280 | #else |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 281 | TRACE(ip); |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 282 | code_state->ip = ip; |
Damien George | db12891 | 2014-04-27 18:19:06 +0100 | [diff] [blame] | 283 | switch (*ip++) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 284 | #endif |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 285 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 286 | ENTRY(MP_BC_LOAD_CONST_FALSE): |
| 287 | PUSH(mp_const_false); |
| 288 | DISPATCH(); |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 289 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 290 | ENTRY(MP_BC_LOAD_CONST_NONE): |
| 291 | PUSH(mp_const_none); |
| 292 | DISPATCH(); |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 293 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 294 | ENTRY(MP_BC_LOAD_CONST_TRUE): |
| 295 | PUSH(mp_const_true); |
| 296 | DISPATCH(); |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 297 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 298 | ENTRY(MP_BC_LOAD_CONST_ELLIPSIS): |
| 299 | PUSH((mp_obj_t)&mp_const_ellipsis_obj); |
| 300 | DISPATCH(); |
| 301 | |
| 302 | ENTRY(MP_BC_LOAD_CONST_SMALL_INT): { |
| 303 | machine_int_t num = 0; |
| 304 | if ((ip[0] & 0x40) != 0) { |
| 305 | // Number is negative |
| 306 | num--; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 307 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 308 | do { |
| 309 | num = (num << 7) | (*ip & 0x7f); |
| 310 | } while ((*ip++ & 0x80) != 0); |
| 311 | PUSH(MP_OBJ_NEW_SMALL_INT(num)); |
| 312 | DISPATCH(); |
| 313 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 314 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 315 | ENTRY(MP_BC_LOAD_CONST_INT): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 316 | DECODE_QSTR; |
Damien George | 503d611 | 2014-05-28 14:07:21 +0100 | [diff] [blame] | 317 | PUSH(mp_load_const_int(qst)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 318 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 319 | } |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 320 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 321 | ENTRY(MP_BC_LOAD_CONST_DEC): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 322 | DECODE_QSTR; |
| 323 | PUSH(mp_load_const_dec(qst)); |
| 324 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 325 | } |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 326 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 327 | ENTRY(MP_BC_LOAD_CONST_BYTES): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 328 | DECODE_QSTR; |
| 329 | PUSH(mp_load_const_bytes(qst)); |
| 330 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 331 | } |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 332 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 333 | ENTRY(MP_BC_LOAD_CONST_STRING): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 334 | DECODE_QSTR; |
| 335 | PUSH(mp_load_const_str(qst)); |
| 336 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 337 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 338 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 339 | ENTRY(MP_BC_LOAD_NULL): |
| 340 | PUSH(MP_OBJ_NULL); |
| 341 | DISPATCH(); |
Damien George | 523b575 | 2014-03-31 11:59:23 +0100 | [diff] [blame] | 342 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 343 | ENTRY(MP_BC_LOAD_FAST_0): |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 344 | obj_shared = fastn[0]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 345 | goto load_check; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 346 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 347 | ENTRY(MP_BC_LOAD_FAST_1): |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 348 | obj_shared = fastn[-1]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 349 | goto load_check; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 350 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 351 | ENTRY(MP_BC_LOAD_FAST_2): |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 352 | obj_shared = fastn[-2]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 353 | goto load_check; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 354 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 355 | ENTRY(MP_BC_LOAD_FAST_N): |
| 356 | DECODE_UINT; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 357 | obj_shared = fastn[-unum]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 358 | load_check: |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 359 | if (obj_shared == MP_OBJ_NULL) { |
| 360 | local_name_error: { |
| 361 | mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NameError, "local variable referenced before assignment"); |
| 362 | RAISE(obj); |
| 363 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 364 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 365 | PUSH(obj_shared); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 366 | DISPATCH(); |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 367 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 368 | ENTRY(MP_BC_LOAD_DEREF): |
| 369 | DECODE_UINT; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 370 | obj_shared = mp_obj_cell_get(fastn[-unum]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 371 | goto load_check; |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 372 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 373 | ENTRY(MP_BC_LOAD_NAME): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 374 | DECODE_QSTR; |
| 375 | PUSH(mp_load_name(qst)); |
| 376 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 377 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 378 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 379 | ENTRY(MP_BC_LOAD_GLOBAL): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 380 | DECODE_QSTR; |
| 381 | PUSH(mp_load_global(qst)); |
| 382 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 383 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 384 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 385 | ENTRY(MP_BC_LOAD_ATTR): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 386 | DECODE_QSTR; |
| 387 | SET_TOP(mp_load_attr(TOP(), qst)); |
| 388 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 389 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 390 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 391 | ENTRY(MP_BC_LOAD_METHOD): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 392 | DECODE_QSTR; |
| 393 | mp_load_method(*sp, qst, sp); |
| 394 | sp += 1; |
| 395 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 396 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 397 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 398 | ENTRY(MP_BC_LOAD_BUILD_CLASS): |
| 399 | PUSH(mp_load_build_class()); |
| 400 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 401 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 402 | ENTRY(MP_BC_LOAD_SUBSCR): { |
| 403 | mp_obj_t index = POP(); |
| 404 | SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL)); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 405 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 406 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 407 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 408 | ENTRY(MP_BC_STORE_FAST_0): |
| 409 | fastn[0] = POP(); |
| 410 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 411 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 412 | ENTRY(MP_BC_STORE_FAST_1): |
| 413 | fastn[-1] = POP(); |
| 414 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 415 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 416 | ENTRY(MP_BC_STORE_FAST_2): |
| 417 | fastn[-2] = POP(); |
| 418 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 419 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 420 | ENTRY(MP_BC_STORE_FAST_N): |
| 421 | DECODE_UINT; |
| 422 | fastn[-unum] = POP(); |
| 423 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 424 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 425 | ENTRY(MP_BC_STORE_DEREF): |
| 426 | DECODE_UINT; |
| 427 | mp_obj_cell_set(fastn[-unum], POP()); |
| 428 | DISPATCH(); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 429 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 430 | ENTRY(MP_BC_STORE_NAME): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 431 | DECODE_QSTR; |
| 432 | mp_store_name(qst, POP()); |
| 433 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 434 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 435 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 436 | ENTRY(MP_BC_STORE_GLOBAL): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 437 | DECODE_QSTR; |
| 438 | mp_store_global(qst, POP()); |
| 439 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 440 | } |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 441 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 442 | ENTRY(MP_BC_STORE_ATTR): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 443 | DECODE_QSTR; |
| 444 | mp_store_attr(sp[0], qst, sp[-1]); |
| 445 | sp -= 2; |
| 446 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 447 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 448 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 449 | ENTRY(MP_BC_STORE_SUBSCR): |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 450 | mp_obj_subscr(sp[-1], sp[0], sp[-2]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 451 | sp -= 3; |
| 452 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 453 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 454 | ENTRY(MP_BC_DELETE_FAST): |
| 455 | DECODE_UINT; |
| 456 | if (fastn[-unum] == MP_OBJ_NULL) { |
| 457 | goto local_name_error; |
| 458 | } |
| 459 | fastn[-unum] = MP_OBJ_NULL; |
| 460 | DISPATCH(); |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 461 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 462 | ENTRY(MP_BC_DELETE_DEREF): |
| 463 | DECODE_UINT; |
| 464 | if (mp_obj_cell_get(fastn[-unum]) == MP_OBJ_NULL) { |
| 465 | goto local_name_error; |
| 466 | } |
| 467 | mp_obj_cell_set(fastn[-unum], MP_OBJ_NULL); |
| 468 | DISPATCH(); |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 469 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 470 | ENTRY(MP_BC_DELETE_NAME): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 471 | DECODE_QSTR; |
| 472 | mp_delete_name(qst); |
| 473 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 474 | } |
Paul Sokolovsky | f909034 | 2014-03-23 21:19:02 +0200 | [diff] [blame] | 475 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 476 | ENTRY(MP_BC_DELETE_GLOBAL): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 477 | DECODE_QSTR; |
| 478 | mp_delete_global(qst); |
| 479 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 480 | } |
Damien George | 1d24ea5 | 2014-04-08 21:11:49 +0100 | [diff] [blame] | 481 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 482 | ENTRY(MP_BC_DUP_TOP): { |
| 483 | mp_obj_t top = TOP(); |
| 484 | PUSH(top); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 485 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 486 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 487 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 488 | ENTRY(MP_BC_DUP_TOP_TWO): |
| 489 | sp += 2; |
| 490 | sp[0] = sp[-2]; |
| 491 | sp[-1] = sp[-3]; |
| 492 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 493 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 494 | ENTRY(MP_BC_POP_TOP): |
| 495 | sp -= 1; |
| 496 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 497 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 498 | ENTRY(MP_BC_ROT_TWO): { |
| 499 | mp_obj_t top = sp[0]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 500 | sp[0] = sp[-1]; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 501 | sp[-1] = top; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 502 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 503 | } |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 504 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 505 | ENTRY(MP_BC_ROT_THREE): { |
| 506 | mp_obj_t top = sp[0]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 507 | sp[0] = sp[-1]; |
| 508 | sp[-1] = sp[-2]; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 509 | sp[-2] = top; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 510 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 511 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 512 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 513 | ENTRY(MP_BC_JUMP): |
| 514 | DECODE_SLABEL; |
| 515 | ip += unum; |
| 516 | DISPATCH(); |
| 517 | |
| 518 | ENTRY(MP_BC_POP_JUMP_IF_TRUE): |
| 519 | DECODE_SLABEL; |
| 520 | if (mp_obj_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 521 | ip += unum; |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 522 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 523 | DISPATCH(); |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 524 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 525 | ENTRY(MP_BC_POP_JUMP_IF_FALSE): |
| 526 | DECODE_SLABEL; |
| 527 | if (!mp_obj_is_true(POP())) { |
| 528 | ip += unum; |
| 529 | } |
| 530 | DISPATCH(); |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 531 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 532 | ENTRY(MP_BC_JUMP_IF_TRUE_OR_POP): |
| 533 | DECODE_SLABEL; |
| 534 | if (mp_obj_is_true(TOP())) { |
| 535 | ip += unum; |
| 536 | } else { |
| 537 | sp--; |
| 538 | } |
| 539 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 540 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 541 | ENTRY(MP_BC_JUMP_IF_FALSE_OR_POP): |
| 542 | DECODE_SLABEL; |
| 543 | if (mp_obj_is_true(TOP())) { |
| 544 | sp--; |
| 545 | } else { |
| 546 | ip += unum; |
| 547 | } |
| 548 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 549 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 550 | ENTRY(MP_BC_SETUP_WITH): { |
| 551 | mp_obj_t obj = TOP(); |
| 552 | SET_TOP(mp_load_attr(obj, MP_QSTR___exit__)); |
| 553 | mp_load_method(obj, MP_QSTR___enter__, sp + 1); |
| 554 | mp_obj_t ret = mp_call_method_n_kw(0, 0, sp + 1); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 555 | PUSH_EXC_BLOCK(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 556 | PUSH(ret); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 557 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 558 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 559 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 560 | ENTRY(MP_BC_WITH_CLEANUP): { |
| 561 | // Arriving here, there's "exception control block" on top of stack, |
| 562 | // and __exit__ bound method underneath it. Bytecode calls __exit__, |
| 563 | // and "deletes" it off stack, shifting "exception control block" |
| 564 | // to its place. |
| 565 | static const mp_obj_t no_exc[] = {mp_const_none, mp_const_none, mp_const_none}; |
| 566 | if (TOP() == mp_const_none) { |
| 567 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 568 | mp_obj_t obj = TOP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 569 | SET_TOP(mp_const_none); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 570 | mp_call_function_n_kw(obj, 3, 0, no_exc); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 571 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
| 572 | mp_obj_t cause = POP(); |
| 573 | switch (MP_OBJ_SMALL_INT_VALUE(cause)) { |
| 574 | case UNWIND_RETURN: { |
| 575 | mp_obj_t retval = POP(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 576 | mp_call_function_n_kw(TOP(), 3, 0, no_exc); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 577 | SET_TOP(retval); |
| 578 | PUSH(cause); |
| 579 | break; |
| 580 | } |
| 581 | case UNWIND_JUMP: { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 582 | mp_call_function_n_kw(sp[-2], 3, 0, no_exc); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 583 | // Pop __exit__ boundmethod at sp[-2] |
| 584 | sp[-2] = sp[-1]; |
| 585 | sp[-1] = sp[0]; |
| 586 | SET_TOP(cause); |
| 587 | break; |
| 588 | } |
| 589 | default: |
| 590 | assert(0); |
| 591 | } |
| 592 | } else if (mp_obj_is_exception_type(TOP())) { |
| 593 | mp_obj_t args[3] = {sp[0], sp[-1], sp[-2]}; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 594 | mp_obj_t ret_value = mp_call_function_n_kw(sp[-3], 3, 0, args); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 595 | // Pop __exit__ boundmethod at sp[-3] |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 596 | // TODO: Once semantics is proven, optimize for case when ret_value == True |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 597 | sp[-3] = sp[-2]; |
| 598 | sp[-2] = sp[-1]; |
| 599 | sp[-1] = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 600 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 601 | if (mp_obj_is_true(ret_value)) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 602 | // This is what CPython does |
| 603 | //PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_SILENCED)); |
| 604 | // But what we need to do is - pop exception from value stack... |
| 605 | sp -= 3; |
| 606 | // ... pop "with" exception handler, and signal END_FINALLY |
| 607 | // to just execute finally handler normally (by pushing None |
| 608 | // on value stack) |
| 609 | assert(exc_sp >= exc_stack); |
| 610 | assert(exc_sp->opcode == MP_BC_SETUP_WITH); |
| 611 | POP_EXC_BLOCK(); |
| 612 | PUSH(mp_const_none); |
| 613 | } |
| 614 | } else { |
| 615 | assert(0); |
| 616 | } |
| 617 | DISPATCH(); |
| 618 | } |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 619 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 620 | ENTRY(MP_BC_UNWIND_JUMP): |
| 621 | DECODE_SLABEL; |
| 622 | PUSH((void*)(ip + unum)); // push destination ip for jump |
Damien George | 25c8464 | 2014-05-30 15:20:41 +0100 | [diff] [blame] | 623 | PUSH((void*)(machine_uint_t)(*ip)); // push number of exception handlers to unwind (0x80 bit set if we also need to pop stack) |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 624 | unwind_jump: |
| 625 | unum = (machine_uint_t)POP(); // get number of exception handlers to unwind |
Damien George | 25c8464 | 2014-05-30 15:20:41 +0100 | [diff] [blame] | 626 | while ((unum & 0x7f) > 0) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 627 | unum -= 1; |
| 628 | assert(exc_sp >= exc_stack); |
| 629 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY || exc_sp->opcode == MP_BC_SETUP_WITH) { |
| 630 | // We're going to run "finally" code as a coroutine |
| 631 | // (not calling it recursively). Set up a sentinel |
| 632 | // on a stack so it can return back to us when it is |
| 633 | // done (when END_FINALLY reached). |
| 634 | PUSH((void*)unum); // push number of exception handlers left to unwind |
| 635 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_JUMP)); // push sentinel |
| 636 | ip = exc_sp->handler; // get exception handler byte code address |
| 637 | exc_sp--; // pop exception handler |
| 638 | goto dispatch_loop; // run the exception handler |
| 639 | } |
| 640 | exc_sp--; |
| 641 | } |
| 642 | ip = (const byte*)POP(); // pop destination ip for jump |
Damien George | 25c8464 | 2014-05-30 15:20:41 +0100 | [diff] [blame] | 643 | if (unum != 0) { |
| 644 | sp--; |
| 645 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 646 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 647 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 648 | // matched against: POP_BLOCK or POP_EXCEPT (anything else?) |
| 649 | ENTRY(MP_BC_SETUP_EXCEPT): |
| 650 | ENTRY(MP_BC_SETUP_FINALLY): |
| 651 | PUSH_EXC_BLOCK(); |
| 652 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 653 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 654 | ENTRY(MP_BC_END_FINALLY): |
| 655 | // not fully implemented |
| 656 | // if TOS is an exception, reraises the exception (3 values on TOS) |
| 657 | // if TOS is None, just pops it and continues |
| 658 | // if TOS is an integer, does something else |
| 659 | // else error |
| 660 | if (mp_obj_is_exception_type(TOP())) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 661 | RAISE(sp[-1]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 662 | } |
| 663 | if (TOP() == mp_const_none) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 664 | sp--; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 665 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
| 666 | // We finished "finally" coroutine and now dispatch back |
| 667 | // to our caller, based on TOS value |
| 668 | mp_unwind_reason_t reason = MP_OBJ_SMALL_INT_VALUE(POP()); |
| 669 | switch (reason) { |
| 670 | case UNWIND_RETURN: |
| 671 | goto unwind_return; |
| 672 | case UNWIND_JUMP: |
| 673 | goto unwind_jump; |
| 674 | } |
| 675 | assert(0); |
| 676 | } else { |
| 677 | assert(0); |
| 678 | } |
| 679 | DISPATCH(); |
| 680 | |
| 681 | ENTRY(MP_BC_GET_ITER): |
| 682 | SET_TOP(mp_getiter(TOP())); |
| 683 | DISPATCH(); |
| 684 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 685 | ENTRY(MP_BC_FOR_ITER): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 686 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 687 | code_state->sp = sp; |
Paul Sokolovsky | c48d6f7 | 2014-05-11 20:32:39 +0300 | [diff] [blame] | 688 | assert(TOP()); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 689 | mp_obj_t value = mp_iternext_allow_raise(TOP()); |
| 690 | if (value == MP_OBJ_STOP_ITERATION) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 691 | --sp; // pop the exhausted iterator |
| 692 | ip += unum; // jump to after for-block |
| 693 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 694 | PUSH(value); // push the next iteration value |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 695 | } |
| 696 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 697 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 698 | |
| 699 | // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH |
| 700 | ENTRY(MP_BC_POP_BLOCK): |
| 701 | // we are exiting an exception handler, so pop the last one of the exception-stack |
| 702 | assert(exc_sp >= exc_stack); |
| 703 | POP_EXC_BLOCK(); |
| 704 | DISPATCH(); |
| 705 | |
| 706 | // matched against: SETUP_EXCEPT |
| 707 | ENTRY(MP_BC_POP_EXCEPT): |
| 708 | // TODO need to work out how blocks work etc |
| 709 | // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate |
| 710 | assert(exc_sp >= exc_stack); |
| 711 | assert(currently_in_except_block); |
| 712 | //sp = (mp_obj_t*)(*exc_sp--); |
| 713 | //exc_sp--; // discard ip |
| 714 | POP_EXC_BLOCK(); |
| 715 | //sp -= 3; // pop 3 exception values |
| 716 | DISPATCH(); |
| 717 | |
| 718 | ENTRY(MP_BC_NOT): |
| 719 | if (TOP() == mp_const_true) { |
| 720 | SET_TOP(mp_const_false); |
| 721 | } else { |
| 722 | SET_TOP(mp_const_true); |
| 723 | } |
| 724 | DISPATCH(); |
| 725 | |
| 726 | ENTRY(MP_BC_UNARY_OP): |
| 727 | unum = *ip++; |
| 728 | SET_TOP(mp_unary_op(unum, TOP())); |
| 729 | DISPATCH(); |
| 730 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 731 | ENTRY(MP_BC_BINARY_OP): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 732 | unum = *ip++; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 733 | mp_obj_t rhs = POP(); |
| 734 | mp_obj_t lhs = TOP(); |
| 735 | SET_TOP(mp_binary_op(unum, lhs, rhs)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 736 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 737 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 738 | |
| 739 | ENTRY(MP_BC_BUILD_TUPLE): |
| 740 | DECODE_UINT; |
| 741 | sp -= unum - 1; |
| 742 | SET_TOP(mp_obj_new_tuple(unum, sp)); |
| 743 | DISPATCH(); |
| 744 | |
| 745 | ENTRY(MP_BC_BUILD_LIST): |
| 746 | DECODE_UINT; |
| 747 | sp -= unum - 1; |
| 748 | SET_TOP(mp_obj_new_list(unum, sp)); |
| 749 | DISPATCH(); |
| 750 | |
| 751 | ENTRY(MP_BC_LIST_APPEND): |
| 752 | DECODE_UINT; |
| 753 | // I think it's guaranteed by the compiler that sp[unum] is a list |
| 754 | mp_obj_list_append(sp[-unum], sp[0]); |
| 755 | sp--; |
| 756 | DISPATCH(); |
| 757 | |
| 758 | ENTRY(MP_BC_BUILD_MAP): |
| 759 | DECODE_UINT; |
| 760 | PUSH(mp_obj_new_dict(unum)); |
| 761 | DISPATCH(); |
| 762 | |
| 763 | ENTRY(MP_BC_STORE_MAP): |
| 764 | sp -= 2; |
| 765 | mp_obj_dict_store(sp[0], sp[2], sp[1]); |
| 766 | DISPATCH(); |
| 767 | |
| 768 | ENTRY(MP_BC_MAP_ADD): |
| 769 | DECODE_UINT; |
| 770 | // I think it's guaranteed by the compiler that sp[-unum - 1] is a map |
| 771 | mp_obj_dict_store(sp[-unum - 1], sp[0], sp[-1]); |
| 772 | sp -= 2; |
| 773 | DISPATCH(); |
| 774 | |
Damien George | 3ebd4d0 | 2014-06-01 13:46:47 +0100 | [diff] [blame^] | 775 | #if MICROPY_PY_BUILTINS_SET |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 776 | ENTRY(MP_BC_BUILD_SET): |
| 777 | DECODE_UINT; |
| 778 | sp -= unum - 1; |
| 779 | SET_TOP(mp_obj_new_set(unum, sp)); |
| 780 | DISPATCH(); |
| 781 | |
| 782 | ENTRY(MP_BC_SET_ADD): |
| 783 | DECODE_UINT; |
| 784 | // I think it's guaranteed by the compiler that sp[-unum] is a set |
| 785 | mp_obj_set_store(sp[-unum], sp[0]); |
| 786 | sp--; |
| 787 | DISPATCH(); |
Damien George | 3ebd4d0 | 2014-06-01 13:46:47 +0100 | [diff] [blame^] | 788 | #endif |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 789 | |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 790 | #if MICROPY_PY_BUILTINS_SLICE |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 791 | ENTRY(MP_BC_BUILD_SLICE): |
| 792 | DECODE_UINT; |
| 793 | if (unum == 2) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 794 | mp_obj_t stop = POP(); |
| 795 | mp_obj_t start = TOP(); |
| 796 | SET_TOP(mp_obj_new_slice(start, stop, mp_const_none)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 797 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 798 | mp_obj_t step = POP(); |
| 799 | mp_obj_t stop = POP(); |
| 800 | mp_obj_t start = TOP(); |
| 801 | SET_TOP(mp_obj_new_slice(start, stop, step)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 802 | } |
| 803 | DISPATCH(); |
| 804 | #endif |
| 805 | |
| 806 | ENTRY(MP_BC_UNPACK_SEQUENCE): |
| 807 | DECODE_UINT; |
| 808 | mp_unpack_sequence(sp[0], unum, sp); |
| 809 | sp += unum - 1; |
| 810 | DISPATCH(); |
| 811 | |
| 812 | ENTRY(MP_BC_UNPACK_EX): |
| 813 | DECODE_UINT; |
| 814 | mp_unpack_ex(sp[0], unum, sp); |
| 815 | sp += (unum & 0xff) + ((unum >> 8) & 0xff); |
| 816 | DISPATCH(); |
| 817 | |
| 818 | ENTRY(MP_BC_MAKE_FUNCTION): |
| 819 | DECODE_PTR; |
| 820 | PUSH(mp_make_function_from_raw_code((mp_raw_code_t*)unum, MP_OBJ_NULL, MP_OBJ_NULL)); |
| 821 | DISPATCH(); |
| 822 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 823 | ENTRY(MP_BC_MAKE_FUNCTION_DEFARGS): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 824 | DECODE_PTR; |
| 825 | // Stack layout: def_tuple def_dict <- TOS |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 826 | mp_obj_t def_dict = POP(); |
| 827 | SET_TOP(mp_make_function_from_raw_code((mp_raw_code_t*)unum, TOP(), def_dict)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 828 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 829 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 830 | |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 831 | ENTRY(MP_BC_MAKE_CLOSURE): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 832 | DECODE_PTR; |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 833 | machine_uint_t n_closed_over = *ip++; |
| 834 | // Stack layout: closed_overs <- TOS |
| 835 | sp -= n_closed_over - 1; |
| 836 | SET_TOP(mp_make_closure_from_raw_code((mp_raw_code_t*)unum, n_closed_over, sp)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 837 | DISPATCH(); |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 838 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 839 | |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 840 | ENTRY(MP_BC_MAKE_CLOSURE_DEFARGS): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 841 | DECODE_PTR; |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 842 | machine_uint_t n_closed_over = *ip++; |
| 843 | // Stack layout: def_tuple def_dict closed_overs <- TOS |
| 844 | sp -= 2 + n_closed_over - 1; |
| 845 | SET_TOP(mp_make_closure_from_raw_code((mp_raw_code_t*)unum, 0x100 | n_closed_over, sp)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 846 | DISPATCH(); |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 847 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 848 | |
| 849 | ENTRY(MP_BC_CALL_FUNCTION): |
| 850 | DECODE_UINT; |
| 851 | // unum & 0xff == n_positional |
| 852 | // (unum >> 8) & 0xff == n_keyword |
| 853 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe); |
| 854 | SET_TOP(mp_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1)); |
| 855 | DISPATCH(); |
| 856 | |
| 857 | ENTRY(MP_BC_CALL_FUNCTION_VAR_KW): |
| 858 | DECODE_UINT; |
| 859 | // unum & 0xff == n_positional |
| 860 | // (unum >> 8) & 0xff == n_keyword |
| 861 | // We have folowing stack layout here: |
| 862 | // fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS |
| 863 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2; |
| 864 | SET_TOP(mp_call_method_n_kw_var(false, unum, sp)); |
| 865 | DISPATCH(); |
| 866 | |
| 867 | ENTRY(MP_BC_CALL_METHOD): |
| 868 | DECODE_UINT; |
| 869 | // unum & 0xff == n_positional |
| 870 | // (unum >> 8) & 0xff == n_keyword |
| 871 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1; |
| 872 | SET_TOP(mp_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp)); |
| 873 | DISPATCH(); |
| 874 | |
| 875 | ENTRY(MP_BC_CALL_METHOD_VAR_KW): |
| 876 | DECODE_UINT; |
| 877 | // unum & 0xff == n_positional |
| 878 | // (unum >> 8) & 0xff == n_keyword |
| 879 | // We have folowing stack layout here: |
| 880 | // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS |
| 881 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 3; |
| 882 | SET_TOP(mp_call_method_n_kw_var(true, unum, sp)); |
| 883 | DISPATCH(); |
| 884 | |
| 885 | ENTRY(MP_BC_RETURN_VALUE): |
| 886 | unwind_return: |
| 887 | while (exc_sp >= exc_stack) { |
| 888 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY || exc_sp->opcode == MP_BC_SETUP_WITH) { |
| 889 | // We're going to run "finally" code as a coroutine |
| 890 | // (not calling it recursively). Set up a sentinel |
| 891 | // on a stack so it can return back to us when it is |
| 892 | // done (when END_FINALLY reached). |
| 893 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_RETURN)); |
| 894 | ip = exc_sp->handler; |
| 895 | // We don't need to do anything with sp, finally is just |
| 896 | // syntactic sugar for sequential execution?? |
| 897 | // sp = |
| 898 | exc_sp--; |
| 899 | goto dispatch_loop; |
| 900 | } |
| 901 | exc_sp--; |
| 902 | } |
| 903 | nlr_pop(); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 904 | code_state->sp = sp; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 905 | assert(exc_sp == exc_stack - 1); |
| 906 | return MP_VM_RETURN_NORMAL; |
| 907 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 908 | ENTRY(MP_BC_RAISE_VARARGS): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 909 | unum = *ip++; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 910 | mp_obj_t obj; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 911 | assert(unum <= 1); |
| 912 | if (unum == 0) { |
| 913 | // search for the inner-most previous exception, to reraise it |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 914 | obj = MP_OBJ_NULL; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 915 | for (mp_exc_stack_t *e = exc_sp; e >= exc_stack; e--) { |
| 916 | if (e->prev_exc != MP_OBJ_NULL) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 917 | obj = e->prev_exc; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 918 | break; |
| 919 | } |
| 920 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 921 | if (obj == MP_OBJ_NULL) { |
| 922 | obj = mp_obj_new_exception_msg(&mp_type_RuntimeError, "No active exception to reraise"); |
| 923 | RAISE(obj); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 924 | } |
| 925 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 926 | obj = POP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 927 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 928 | obj = mp_make_raise_obj(obj); |
| 929 | RAISE(obj); |
| 930 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 931 | |
| 932 | ENTRY(MP_BC_YIELD_VALUE): |
| 933 | yield: |
| 934 | nlr_pop(); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 935 | code_state->ip = ip; |
| 936 | code_state->sp = sp; |
| 937 | code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 938 | return MP_VM_RETURN_YIELD; |
| 939 | |
| 940 | ENTRY(MP_BC_YIELD_FROM): { |
| 941 | //#define EXC_MATCH(exc, type) MP_OBJ_IS_TYPE(exc, type) |
| 942 | #define EXC_MATCH(exc, type) mp_obj_exception_match(exc, type) |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 943 | #define GENERATOR_EXIT_IF_NEEDED(t) if (t != MP_OBJ_NULL && EXC_MATCH(t, &mp_type_GeneratorExit)) { RAISE(t); } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 944 | mp_vm_return_kind_t ret_kind; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 945 | mp_obj_t send_value = POP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 946 | mp_obj_t t_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 947 | mp_obj_t ret_value; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 948 | if (inject_exc != MP_OBJ_NULL) { |
| 949 | t_exc = inject_exc; |
| 950 | inject_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 951 | ret_kind = mp_resume(TOP(), MP_OBJ_NULL, t_exc, &ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 952 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 953 | ret_kind = mp_resume(TOP(), send_value, MP_OBJ_NULL, &ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 954 | } |
| 955 | |
| 956 | if (ret_kind == MP_VM_RETURN_YIELD) { |
| 957 | ip--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 958 | PUSH(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 959 | goto yield; |
| 960 | } |
| 961 | if (ret_kind == MP_VM_RETURN_NORMAL) { |
| 962 | // Pop exhausted gen |
| 963 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 964 | if (ret_value == MP_OBJ_NULL) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 965 | // Optimize StopIteration |
| 966 | // TODO: get StopIteration's value |
| 967 | PUSH(mp_const_none); |
| 968 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 969 | PUSH(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 970 | } |
| 971 | |
| 972 | // If we injected GeneratorExit downstream, then even |
| 973 | // if it was swallowed, we re-raise GeneratorExit |
| 974 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
| 975 | DISPATCH(); |
| 976 | } |
| 977 | if (ret_kind == MP_VM_RETURN_EXCEPTION) { |
| 978 | // Pop exhausted gen |
| 979 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 980 | if (EXC_MATCH(ret_value, &mp_type_StopIteration)) { |
| 981 | PUSH(mp_obj_exception_get_value(ret_value)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 982 | // If we injected GeneratorExit downstream, then even |
| 983 | // if it was swallowed, we re-raise GeneratorExit |
| 984 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
| 985 | DISPATCH(); |
| 986 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 987 | RAISE(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 988 | } |
| 989 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 990 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 991 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 992 | ENTRY(MP_BC_IMPORT_NAME): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 993 | DECODE_QSTR; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 994 | mp_obj_t obj = POP(); |
| 995 | SET_TOP(mp_import_name(qst, obj, TOP())); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 996 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 997 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 998 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 999 | ENTRY(MP_BC_IMPORT_FROM): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1000 | DECODE_QSTR; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1001 | mp_obj_t obj = mp_import_from(TOP(), qst); |
| 1002 | PUSH(obj); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1003 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1004 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1005 | |
| 1006 | ENTRY(MP_BC_IMPORT_STAR): |
| 1007 | mp_import_all(POP()); |
| 1008 | DISPATCH(); |
| 1009 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1010 | ENTRY_DEFAULT: { |
| 1011 | mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NotImplementedError, "byte code not implemented"); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1012 | nlr_pop(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1013 | fastn[0] = obj; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1014 | return MP_VM_RETURN_EXCEPTION; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1015 | } |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1016 | |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 1017 | #if !MICROPY_OPT_COMPUTED_GOTO |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 1018 | } // switch |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1019 | #endif |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1020 | } // for loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1021 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1022 | } else { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1023 | exception_handler: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1024 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1025 | |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1026 | // check if it's a StopIteration within a for block |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 1027 | if (*code_state->ip == MP_BC_FOR_ITER && mp_obj_is_subclass_fast(mp_obj_get_type(nlr.ret_val), &mp_type_StopIteration)) { |
| 1028 | const byte *ip = code_state->ip + 1; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1029 | machine_uint_t unum; |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1030 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1031 | code_state->ip = ip + unum; // jump to after for-block |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 1032 | code_state->sp -= 1; // pop the exhausted iterator |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1033 | goto outer_dispatch_loop; // continue with dispatch loop |
| 1034 | } |
| 1035 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1036 | // set file and line number that the exception occurred at |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 1037 | // TODO: don't set traceback for exceptions re-raised by END_FINALLY. |
| 1038 | // But consider how to handle nested exceptions. |
Damien George | 6902eed | 2014-04-04 10:52:59 +0000 | [diff] [blame] | 1039 | // TODO need a better way of not adding traceback to constant objects (right now, just GeneratorExit_obj and MemoryError_obj) |
| 1040 | if (mp_obj_is_exception_instance(nlr.ret_val) && nlr.ret_val != &mp_const_GeneratorExit_obj && nlr.ret_val != &mp_const_MemoryError_obj) { |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1041 | const byte *code_info = code_state->code_info; |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1042 | machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24); |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 1043 | qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24); |
| 1044 | qstr block_name = code_info[8] | (code_info[9] << 8) | (code_info[10] << 16) | (code_info[11] << 24); |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1045 | machine_uint_t source_line = 1; |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 1046 | machine_uint_t bc = code_state->ip - code_info - code_info_size; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 1047 | //printf("find %lu %d %d\n", bc, code_info[12], code_info[13]); |
Damien George | 28eb577 | 2014-01-25 11:43:20 +0000 | [diff] [blame] | 1048 | for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) { |
| 1049 | bc -= *ci & 31; |
| 1050 | source_line += *ci >> 5; |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1051 | } |
Damien George | 136b149 | 2014-01-19 12:38:49 +0000 | [diff] [blame] | 1052 | mp_obj_exception_add_traceback(nlr.ret_val, source_file, source_line, block_name); |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1053 | } |
| 1054 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1055 | while (currently_in_except_block) { |
| 1056 | // nested exception |
| 1057 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 1058 | assert(exc_sp >= exc_stack); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1059 | |
| 1060 | // TODO make a proper message for nested exception |
| 1061 | // at the moment we are just raising the very last exception (the one that caused the nested exception) |
| 1062 | |
| 1063 | // move up to previous exception handler |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 1064 | POP_EXC_BLOCK(); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1065 | } |
| 1066 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 1067 | if (exc_sp >= exc_stack) { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1068 | // set flag to indicate that we are now handling an exception |
| 1069 | currently_in_except_block = 1; |
| 1070 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1071 | // catch exception and pass to byte code |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1072 | code_state->ip = exc_sp->handler; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1073 | mp_obj_t *sp = MP_TAGPTR_PTR(exc_sp->val_sp); |
Damien George | d7592a1 | 2014-03-30 00:54:48 +0000 | [diff] [blame] | 1074 | // save this exception in the stack so it can be used in a reraise, if needed |
| 1075 | exc_sp->prev_exc = nlr.ret_val; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 1076 | // push(traceback, exc-val, exc-type) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1077 | PUSH(mp_const_none); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 1078 | PUSH(nlr.ret_val); |
Paul Sokolovsky | 682f9e6 | 2014-03-29 02:52:17 +0200 | [diff] [blame] | 1079 | PUSH(mp_obj_get_type(nlr.ret_val)); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1080 | code_state->sp = sp; |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1081 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1082 | } else { |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 1083 | // propagate exception to higher level |
| 1084 | // TODO what to do about ip and sp? they don't really make sense at this point |
| 1085 | fastn[0] = nlr.ret_val; // must put exception here because sp is invalid |
| 1086 | return MP_VM_RETURN_EXCEPTION; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1087 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1088 | } |
| 1089 | } |
| 1090 | } |