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> |
| 31 | |
Damien George | b4b10fd | 2015-01-01 23:30:53 +0000 | [diff] [blame] | 32 | #include "py/mpstate.h" |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 33 | #include "py/nlr.h" |
| 34 | #include "py/emitglue.h" |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 35 | #include "py/objtype.h" |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 36 | #include "py/runtime.h" |
| 37 | #include "py/bc0.h" |
| 38 | #include "py/bc.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 39 | |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 40 | #if 0 |
Damien George | 7764f16 | 2014-12-12 17:18:56 +0000 | [diff] [blame] | 41 | #define TRACE(ip) printf("sp=" INT_FMT " ", sp - code_state->sp); mp_bytecode_print2(ip, 1); |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 42 | #else |
| 43 | #define TRACE(ip) |
| 44 | #endif |
Damien George | e90be0d | 2014-04-10 16:21:34 +0000 | [diff] [blame] | 45 | |
Paul Sokolovsky | 8519342 | 2014-01-31 19:45:15 +0200 | [diff] [blame] | 46 | // Value stack grows up (this makes it incompatible with native C stack, but |
| 47 | // makes sure that arguments to functions are in natural order arg1..argN |
| 48 | // (Python semantics mandates left-to-right evaluation order, including for |
| 49 | // function arguments). Stack pointer is pre-incremented and points at the |
| 50 | // top element. |
| 51 | // Exception stack also grows up, top element is also pointed at. |
| 52 | |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 53 | // Exception stack unwind reasons (WHY_* in CPython-speak) |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 54 | // TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds |
| 55 | // left to do encoded in the JUMP number |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 56 | typedef enum { |
| 57 | UNWIND_RETURN = 1, |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 58 | UNWIND_JUMP, |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 59 | } mp_unwind_reason_t; |
| 60 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 61 | #define DECODE_UINT \ |
| 62 | mp_uint_t unum = 0; \ |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 63 | do { \ |
| 64 | unum = (unum << 7) + (*ip & 0x7f); \ |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 65 | } while ((*ip++ & 0x80) != 0) |
| 66 | #define DECODE_ULABEL mp_uint_t ulab = (ip[0] | (ip[1] << 8)); ip += 2 |
| 67 | #define DECODE_SLABEL mp_uint_t slab = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2 |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 68 | #define DECODE_QSTR qstr qst = 0; \ |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 69 | do { \ |
| 70 | qst = (qst << 7) + (*ip & 0x7f); \ |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 71 | } while ((*ip++ & 0x80) != 0) |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 72 | #define DECODE_PTR \ |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 73 | ip = (byte*)(((mp_uint_t)ip + sizeof(mp_uint_t) - 1) & (~(sizeof(mp_uint_t) - 1))); /* align ip */ \ |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 74 | void *ptr = (void*)*(mp_uint_t*)ip; \ |
| 75 | ip += sizeof(mp_uint_t) |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 76 | #define PUSH(val) *++sp = (val) |
| 77 | #define POP() (*sp--) |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 78 | #define TOP() (*sp) |
| 79 | #define SET_TOP(val) *sp = (val) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 80 | |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 81 | #define PUSH_EXC_BLOCK(with_or_finally) do { \ |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 82 | DECODE_ULABEL; /* except labels are always forward */ \ |
| 83 | ++exc_sp; \ |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 84 | exc_sp->handler = ip + ulab; \ |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 85 | exc_sp->val_sp = MP_TAGPTR_MAKE(sp, ((with_or_finally) << 1) | currently_in_except_block); \ |
Damien George | d7592a1 | 2014-03-30 00:54:48 +0000 | [diff] [blame] | 86 | exc_sp->prev_exc = MP_OBJ_NULL; \ |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 87 | currently_in_except_block = 0; /* in a try block now */ \ |
| 88 | } while (0) |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 89 | |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 90 | #define POP_EXC_BLOCK() \ |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 91 | currently_in_except_block = MP_TAGPTR_TAG0(exc_sp->val_sp); /* restore previous state */ \ |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 92 | exc_sp--; /* pop back to previous exception handler */ |
| 93 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 94 | // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc) |
| 95 | // sp points to bottom of stack which grows up |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 96 | // returns: |
| 97 | // MP_VM_RETURN_NORMAL, sp valid, return value in *sp |
| 98 | // MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp |
| 99 | // MP_VM_RETURN_EXCEPTION, exception in fastn[0] |
Damien George | aabd83e | 2014-06-07 14:16:08 +0100 | [diff] [blame] | 100 | mp_vm_return_kind_t mp_execute_bytecode(mp_code_state *code_state, volatile mp_obj_t inject_exc) { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 101 | #define SELECTIVE_EXC_IP (0) |
| 102 | #if SELECTIVE_EXC_IP |
Damien George | f89d659 | 2014-12-29 00:29:59 +0000 | [diff] [blame] | 103 | #define MARK_EXC_IP_SELECTIVE() { code_state->ip = ip; } /* stores ip 1 byte past last opcode */ |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 104 | #define MARK_EXC_IP_GLOBAL() |
| 105 | #else |
| 106 | #define MARK_EXC_IP_SELECTIVE() |
Damien George | f89d659 | 2014-12-29 00:29:59 +0000 | [diff] [blame] | 107 | #define MARK_EXC_IP_GLOBAL() { code_state->ip = ip; } /* stores ip pointing to last opcode */ |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 108 | #endif |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 109 | #if MICROPY_OPT_COMPUTED_GOTO |
Damien George | 51dfcb4 | 2015-01-01 20:27:54 +0000 | [diff] [blame] | 110 | #include "py/vmentrytable.h" |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 111 | #define DISPATCH() do { \ |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 112 | TRACE(ip); \ |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 113 | MARK_EXC_IP_GLOBAL(); \ |
Damien George | db12891 | 2014-04-27 18:19:06 +0100 | [diff] [blame] | 114 | goto *entry_table[*ip++]; \ |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 115 | } while(0) |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 116 | #define DISPATCH_WITH_PEND_EXC_CHECK() goto pending_exception_check |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 117 | #define ENTRY(op) entry_##op |
| 118 | #define ENTRY_DEFAULT entry_default |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 119 | #else |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 120 | #define DISPATCH() break |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 121 | #define DISPATCH_WITH_PEND_EXC_CHECK() goto pending_exception_check |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 122 | #define ENTRY(op) case op |
| 123 | #define ENTRY_DEFAULT default |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 124 | #endif |
| 125 | |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 126 | // nlr_raise needs to be implemented as a goto, so that the C compiler's flow analyser |
| 127 | // sees that it's possible for us to jump from the dispatch loop to the exception |
| 128 | // handler. Without this, the code may have a different stack layout in the dispatch |
| 129 | // loop and the exception handler, leading to very obscure bugs. |
| 130 | #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] | 131 | |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 132 | #if MICROPY_STACKLESS |
| 133 | run_code_state: ; |
| 134 | #endif |
Damien George | aabd83e | 2014-06-07 14:16:08 +0100 | [diff] [blame] | 135 | // Pointers which are constant for particular invocation of mp_execute_bytecode() |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 136 | mp_obj_t */*const*/ fastn = &code_state->state[code_state->n_state - 1]; |
| 137 | mp_exc_stack_t */*const*/ exc_stack = (mp_exc_stack_t*)(code_state->state + code_state->n_state); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 138 | |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 139 | // variables that are visible to the exception handler (declared volatile) |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 140 | volatile bool currently_in_except_block = MP_TAGPTR_TAG0(code_state->exc_sp); // 0 or 1, to detect nested exceptions |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 141 | 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] | 142 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 143 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 144 | for (;;) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 145 | nlr_buf_t nlr; |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 146 | outer_dispatch_loop: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 147 | if (nlr_push(&nlr) == 0) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 148 | // local variables that are not visible to the exception handler |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 149 | const byte *ip = code_state->ip; |
| 150 | mp_obj_t *sp = code_state->sp; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 151 | mp_obj_t obj_shared; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 152 | |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 153 | // If we have exception to inject, now that we finish setting up |
| 154 | // execution context, raise it. This works as if RAISE_VARARGS |
| 155 | // bytecode was executed. |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 156 | // Injecting exc into yield from generator is a special case, |
| 157 | // handled by MP_BC_YIELD_FROM itself |
| 158 | if (inject_exc != MP_OBJ_NULL && *ip != MP_BC_YIELD_FROM) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 159 | mp_obj_t exc = inject_exc; |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 160 | inject_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 161 | exc = mp_make_raise_obj(exc); |
| 162 | RAISE(exc); |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 163 | } |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 164 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 165 | // loop to execute byte code |
| 166 | for (;;) { |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 167 | dispatch_loop: |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 168 | #if MICROPY_OPT_COMPUTED_GOTO |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 169 | DISPATCH(); |
| 170 | #else |
Paul Sokolovsky | c5e32c6 | 2014-04-23 03:40:24 +0300 | [diff] [blame] | 171 | TRACE(ip); |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 172 | MARK_EXC_IP_GLOBAL(); |
Damien George | db12891 | 2014-04-27 18:19:06 +0100 | [diff] [blame] | 173 | switch (*ip++) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 174 | #endif |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 175 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 176 | ENTRY(MP_BC_LOAD_CONST_FALSE): |
| 177 | PUSH(mp_const_false); |
| 178 | DISPATCH(); |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 179 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 180 | ENTRY(MP_BC_LOAD_CONST_NONE): |
| 181 | PUSH(mp_const_none); |
| 182 | DISPATCH(); |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 183 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 184 | ENTRY(MP_BC_LOAD_CONST_TRUE): |
| 185 | PUSH(mp_const_true); |
| 186 | DISPATCH(); |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 187 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 188 | ENTRY(MP_BC_LOAD_CONST_ELLIPSIS): |
| 189 | PUSH((mp_obj_t)&mp_const_ellipsis_obj); |
| 190 | DISPATCH(); |
| 191 | |
| 192 | ENTRY(MP_BC_LOAD_CONST_SMALL_INT): { |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 193 | mp_int_t num = 0; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 194 | if ((ip[0] & 0x40) != 0) { |
| 195 | // Number is negative |
| 196 | num--; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 197 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 198 | do { |
| 199 | num = (num << 7) | (*ip & 0x7f); |
| 200 | } while ((*ip++ & 0x80) != 0); |
| 201 | PUSH(MP_OBJ_NEW_SMALL_INT(num)); |
| 202 | DISPATCH(); |
| 203 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 204 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 205 | ENTRY(MP_BC_LOAD_CONST_BYTES): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 206 | DECODE_QSTR; |
| 207 | PUSH(mp_load_const_bytes(qst)); |
| 208 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 209 | } |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 210 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 211 | ENTRY(MP_BC_LOAD_CONST_STRING): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 212 | DECODE_QSTR; |
| 213 | PUSH(mp_load_const_str(qst)); |
| 214 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 215 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 216 | |
Damien George | dab1385 | 2015-01-13 15:55:54 +0000 | [diff] [blame] | 217 | ENTRY(MP_BC_LOAD_CONST_OBJ): { |
| 218 | DECODE_PTR; |
| 219 | PUSH(ptr); |
| 220 | DISPATCH(); |
| 221 | } |
| 222 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 223 | ENTRY(MP_BC_LOAD_NULL): |
| 224 | PUSH(MP_OBJ_NULL); |
| 225 | DISPATCH(); |
Damien George | 523b575 | 2014-03-31 11:59:23 +0100 | [diff] [blame] | 226 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 227 | ENTRY(MP_BC_LOAD_FAST_N): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 228 | DECODE_UINT; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 229 | obj_shared = fastn[-unum]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 230 | load_check: |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 231 | if (obj_shared == MP_OBJ_NULL) { |
| 232 | local_name_error: { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 233 | MARK_EXC_IP_SELECTIVE(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 234 | mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NameError, "local variable referenced before assignment"); |
| 235 | RAISE(obj); |
| 236 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 237 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 238 | PUSH(obj_shared); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 239 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 240 | } |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 241 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 242 | ENTRY(MP_BC_LOAD_DEREF): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 243 | DECODE_UINT; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 244 | obj_shared = mp_obj_cell_get(fastn[-unum]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 245 | goto load_check; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 246 | } |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 247 | |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 248 | #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 249 | ENTRY(MP_BC_LOAD_NAME): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 250 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 251 | DECODE_QSTR; |
| 252 | PUSH(mp_load_name(qst)); |
| 253 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 254 | } |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 255 | #else |
| 256 | ENTRY(MP_BC_LOAD_NAME): { |
| 257 | MARK_EXC_IP_SELECTIVE(); |
| 258 | DECODE_QSTR; |
| 259 | mp_obj_t key = MP_OBJ_NEW_QSTR(qst); |
| 260 | mp_uint_t x = *ip; |
| 261 | if (x < MP_STATE_CTX(dict_locals)->map.alloc && MP_STATE_CTX(dict_locals)->map.table[x].key == key) { |
| 262 | PUSH(MP_STATE_CTX(dict_locals)->map.table[x].value); |
| 263 | } else { |
| 264 | mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_locals)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP); |
| 265 | if (elem != NULL) { |
| 266 | *(byte*)ip = (elem - &MP_STATE_CTX(dict_locals)->map.table[0]) & 0xff; |
| 267 | PUSH(elem->value); |
| 268 | } else { |
| 269 | PUSH(mp_load_name(MP_OBJ_QSTR_VALUE(key))); |
| 270 | } |
| 271 | } |
| 272 | ip++; |
| 273 | DISPATCH(); |
| 274 | } |
| 275 | #endif |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 276 | |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 277 | #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 278 | ENTRY(MP_BC_LOAD_GLOBAL): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 279 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 280 | DECODE_QSTR; |
| 281 | PUSH(mp_load_global(qst)); |
| 282 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 283 | } |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 284 | #else |
| 285 | ENTRY(MP_BC_LOAD_GLOBAL): { |
| 286 | MARK_EXC_IP_SELECTIVE(); |
| 287 | DECODE_QSTR; |
| 288 | mp_obj_t key = MP_OBJ_NEW_QSTR(qst); |
| 289 | mp_uint_t x = *ip; |
| 290 | if (x < MP_STATE_CTX(dict_globals)->map.alloc && MP_STATE_CTX(dict_globals)->map.table[x].key == key) { |
| 291 | PUSH(MP_STATE_CTX(dict_globals)->map.table[x].value); |
| 292 | } else { |
| 293 | mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_CTX(dict_globals)->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP); |
| 294 | if (elem != NULL) { |
| 295 | *(byte*)ip = (elem - &MP_STATE_CTX(dict_globals)->map.table[0]) & 0xff; |
| 296 | PUSH(elem->value); |
| 297 | } else { |
| 298 | PUSH(mp_load_global(MP_OBJ_QSTR_VALUE(key))); |
| 299 | } |
| 300 | } |
| 301 | ip++; |
| 302 | DISPATCH(); |
| 303 | } |
| 304 | #endif |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 305 | |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 306 | #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 307 | ENTRY(MP_BC_LOAD_ATTR): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 308 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 309 | DECODE_QSTR; |
| 310 | SET_TOP(mp_load_attr(TOP(), qst)); |
| 311 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 312 | } |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 313 | #else |
| 314 | ENTRY(MP_BC_LOAD_ATTR): { |
| 315 | MARK_EXC_IP_SELECTIVE(); |
| 316 | DECODE_QSTR; |
| 317 | mp_obj_t top = TOP(); |
| 318 | if (mp_obj_get_type(top)->load_attr == mp_obj_instance_load_attr) { |
| 319 | mp_obj_instance_t *self = top; |
| 320 | mp_uint_t x = *ip; |
| 321 | mp_obj_t key = MP_OBJ_NEW_QSTR(qst); |
| 322 | mp_map_elem_t *elem; |
| 323 | if (x < self->members.alloc && self->members.table[x].key == key) { |
| 324 | elem = &self->members.table[x]; |
| 325 | } else { |
| 326 | elem = mp_map_lookup(&self->members, key, MP_MAP_LOOKUP); |
| 327 | if (elem != NULL) { |
| 328 | *(byte*)ip = elem - &self->members.table[0]; |
| 329 | } else { |
| 330 | goto load_attr_cache_fail; |
| 331 | } |
| 332 | } |
| 333 | SET_TOP(elem->value); |
| 334 | ip++; |
| 335 | DISPATCH(); |
| 336 | } |
| 337 | load_attr_cache_fail: |
| 338 | SET_TOP(mp_load_attr(top, qst)); |
| 339 | ip++; |
| 340 | DISPATCH(); |
| 341 | } |
| 342 | #endif |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 343 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 344 | ENTRY(MP_BC_LOAD_METHOD): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 345 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 346 | DECODE_QSTR; |
| 347 | mp_load_method(*sp, qst, sp); |
| 348 | sp += 1; |
| 349 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 350 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 351 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 352 | ENTRY(MP_BC_LOAD_BUILD_CLASS): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 353 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 354 | PUSH(mp_load_build_class()); |
| 355 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 356 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 357 | ENTRY(MP_BC_LOAD_SUBSCR): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 358 | MARK_EXC_IP_SELECTIVE(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 359 | mp_obj_t index = POP(); |
| 360 | SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL)); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 361 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 362 | } |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 363 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 364 | ENTRY(MP_BC_STORE_FAST_N): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 365 | DECODE_UINT; |
| 366 | fastn[-unum] = POP(); |
| 367 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 368 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 369 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 370 | ENTRY(MP_BC_STORE_DEREF): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 371 | DECODE_UINT; |
| 372 | mp_obj_cell_set(fastn[-unum], POP()); |
| 373 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 374 | } |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 375 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 376 | ENTRY(MP_BC_STORE_NAME): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 377 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 378 | DECODE_QSTR; |
| 379 | mp_store_name(qst, POP()); |
| 380 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 381 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 382 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 383 | ENTRY(MP_BC_STORE_GLOBAL): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 384 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 385 | DECODE_QSTR; |
| 386 | mp_store_global(qst, POP()); |
| 387 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 388 | } |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 389 | |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 390 | #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 391 | ENTRY(MP_BC_STORE_ATTR): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 392 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 393 | DECODE_QSTR; |
| 394 | mp_store_attr(sp[0], qst, sp[-1]); |
| 395 | sp -= 2; |
| 396 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 397 | } |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 398 | #else |
stijn | 28fa84b | 2015-02-14 18:43:54 +0100 | [diff] [blame] | 399 | // This caching code works with MICROPY_PY_BUILTINS_PROPERTY and/or |
| 400 | // MICROPY_PY_DESCRIPTORS enabled because if the attr exists in |
| 401 | // self->members then it can't be a property or have descriptors. A |
Damien George | 7ee91cf | 2015-01-06 12:51:39 +0000 | [diff] [blame] | 402 | // consequence of this is that we can't use MP_MAP_LOOKUP_ADD_IF_NOT_FOUND |
| 403 | // in the fast-path below, because that store could override a property. |
| 404 | ENTRY(MP_BC_STORE_ATTR): { |
| 405 | MARK_EXC_IP_SELECTIVE(); |
| 406 | DECODE_QSTR; |
| 407 | mp_obj_t top = TOP(); |
| 408 | if (mp_obj_get_type(top)->store_attr == mp_obj_instance_store_attr && sp[-1] != MP_OBJ_NULL) { |
| 409 | mp_obj_instance_t *self = top; |
| 410 | mp_uint_t x = *ip; |
| 411 | mp_obj_t key = MP_OBJ_NEW_QSTR(qst); |
| 412 | mp_map_elem_t *elem; |
| 413 | if (x < self->members.alloc && self->members.table[x].key == key) { |
| 414 | elem = &self->members.table[x]; |
| 415 | } else { |
| 416 | elem = mp_map_lookup(&self->members, key, MP_MAP_LOOKUP); |
| 417 | if (elem != NULL) { |
| 418 | *(byte*)ip = elem - &self->members.table[0]; |
| 419 | } else { |
| 420 | goto store_attr_cache_fail; |
| 421 | } |
| 422 | } |
| 423 | elem->value = sp[-1]; |
| 424 | sp -= 2; |
| 425 | ip++; |
| 426 | DISPATCH(); |
| 427 | } |
| 428 | store_attr_cache_fail: |
| 429 | mp_store_attr(sp[0], qst, sp[-1]); |
| 430 | sp -= 2; |
| 431 | ip++; |
| 432 | DISPATCH(); |
| 433 | } |
| 434 | #endif |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 435 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 436 | ENTRY(MP_BC_STORE_SUBSCR): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 437 | MARK_EXC_IP_SELECTIVE(); |
Damien George | 729f7b4 | 2014-04-17 22:10:53 +0100 | [diff] [blame] | 438 | mp_obj_subscr(sp[-1], sp[0], sp[-2]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 439 | sp -= 3; |
| 440 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 441 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 442 | ENTRY(MP_BC_DELETE_FAST): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 443 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 444 | DECODE_UINT; |
| 445 | if (fastn[-unum] == MP_OBJ_NULL) { |
| 446 | goto local_name_error; |
| 447 | } |
| 448 | fastn[-unum] = MP_OBJ_NULL; |
| 449 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 450 | } |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 451 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 452 | ENTRY(MP_BC_DELETE_DEREF): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 453 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 454 | DECODE_UINT; |
| 455 | if (mp_obj_cell_get(fastn[-unum]) == MP_OBJ_NULL) { |
| 456 | goto local_name_error; |
| 457 | } |
| 458 | mp_obj_cell_set(fastn[-unum], MP_OBJ_NULL); |
| 459 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 460 | } |
Damien George | 2bf7c09 | 2014-04-09 15:26:46 +0100 | [diff] [blame] | 461 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 462 | ENTRY(MP_BC_DELETE_NAME): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 463 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 464 | DECODE_QSTR; |
| 465 | mp_delete_name(qst); |
| 466 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 467 | } |
Paul Sokolovsky | f909034 | 2014-03-23 21:19:02 +0200 | [diff] [blame] | 468 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 469 | ENTRY(MP_BC_DELETE_GLOBAL): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 470 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 471 | DECODE_QSTR; |
| 472 | mp_delete_global(qst); |
| 473 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 474 | } |
Damien George | 1d24ea5 | 2014-04-08 21:11:49 +0100 | [diff] [blame] | 475 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 476 | ENTRY(MP_BC_DUP_TOP): { |
| 477 | mp_obj_t top = TOP(); |
| 478 | PUSH(top); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 479 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 480 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 481 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 482 | ENTRY(MP_BC_DUP_TOP_TWO): |
| 483 | sp += 2; |
| 484 | sp[0] = sp[-2]; |
| 485 | sp[-1] = sp[-3]; |
| 486 | DISPATCH(); |
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_POP_TOP): |
| 489 | sp -= 1; |
| 490 | DISPATCH(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 491 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 492 | ENTRY(MP_BC_ROT_TWO): { |
| 493 | mp_obj_t top = sp[0]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 494 | sp[0] = sp[-1]; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 495 | sp[-1] = top; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 496 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 497 | } |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 498 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 499 | ENTRY(MP_BC_ROT_THREE): { |
| 500 | mp_obj_t top = sp[0]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 501 | sp[0] = sp[-1]; |
| 502 | sp[-1] = sp[-2]; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 503 | sp[-2] = top; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 504 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 505 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 506 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 507 | ENTRY(MP_BC_JUMP): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 508 | DECODE_SLABEL; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 509 | ip += slab; |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 510 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 511 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 512 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 513 | ENTRY(MP_BC_POP_JUMP_IF_TRUE): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 514 | DECODE_SLABEL; |
| 515 | if (mp_obj_is_true(POP())) { |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 516 | ip += slab; |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 517 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 518 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 519 | } |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 520 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 521 | ENTRY(MP_BC_POP_JUMP_IF_FALSE): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 522 | DECODE_SLABEL; |
| 523 | if (!mp_obj_is_true(POP())) { |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 524 | ip += slab; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 525 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 526 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 527 | } |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 528 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 529 | ENTRY(MP_BC_JUMP_IF_TRUE_OR_POP): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 530 | DECODE_SLABEL; |
| 531 | if (mp_obj_is_true(TOP())) { |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 532 | ip += slab; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 533 | } else { |
| 534 | sp--; |
| 535 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 536 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 537 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 538 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 539 | ENTRY(MP_BC_JUMP_IF_FALSE_OR_POP): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 540 | DECODE_SLABEL; |
| 541 | if (mp_obj_is_true(TOP())) { |
| 542 | sp--; |
| 543 | } else { |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 544 | ip += slab; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 545 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 546 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 547 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 548 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 549 | ENTRY(MP_BC_SETUP_WITH): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 550 | MARK_EXC_IP_SELECTIVE(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 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); |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 555 | PUSH_EXC_BLOCK(1); |
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): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 561 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 562 | // Arriving here, there's "exception control block" on top of stack, |
| 563 | // and __exit__ bound method underneath it. Bytecode calls __exit__, |
| 564 | // and "deletes" it off stack, shifting "exception control block" |
| 565 | // to its place. |
| 566 | static const mp_obj_t no_exc[] = {mp_const_none, mp_const_none, mp_const_none}; |
| 567 | if (TOP() == mp_const_none) { |
| 568 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 569 | mp_obj_t obj = TOP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 570 | SET_TOP(mp_const_none); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 571 | mp_call_function_n_kw(obj, 3, 0, no_exc); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 572 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
Damien George | 5e1d993 | 2015-03-25 22:20:37 +0000 | [diff] [blame] | 573 | mp_int_t cause_val = MP_OBJ_SMALL_INT_VALUE(TOP()); |
| 574 | if (cause_val == UNWIND_RETURN) { |
| 575 | mp_call_function_n_kw(sp[-2], 3, 0, no_exc); |
| 576 | } else { |
| 577 | assert(cause_val == UNWIND_JUMP); |
| 578 | mp_call_function_n_kw(sp[-3], 3, 0, no_exc); |
| 579 | // Pop __exit__ boundmethod at sp[-3] |
| 580 | sp[-3] = sp[-2]; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 581 | } |
Damien George | 12d6d77 | 2015-02-26 17:54:50 +0000 | [diff] [blame] | 582 | sp[-2] = sp[-1]; // copy retval down |
| 583 | sp[-1] = sp[0]; // copy cause down |
| 584 | sp--; // discard top value (was cause) |
Damien George | 5e1d993 | 2015-03-25 22:20:37 +0000 | [diff] [blame] | 585 | } else { |
| 586 | assert(mp_obj_is_exception_type(TOP())); |
Damien George | 596f41d | 2015-02-10 13:21:42 +0000 | [diff] [blame] | 587 | // Need to pass (sp[0], sp[-1], sp[-2]) as arguments so must reverse the |
| 588 | // order of these on the value stack (don't want to create a temporary |
| 589 | // array because it increases stack footprint of the VM). |
| 590 | mp_obj_t obj = sp[-2]; |
| 591 | sp[-2] = sp[0]; |
| 592 | sp[0] = obj; |
| 593 | mp_obj_t ret_value = mp_call_function_n_kw(sp[-3], 3, 0, &sp[-2]); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 594 | if (mp_obj_is_true(ret_value)) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 595 | // This is what CPython does |
| 596 | //PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_SILENCED)); |
| 597 | // But what we need to do is - pop exception from value stack... |
Damien George | 596f41d | 2015-02-10 13:21:42 +0000 | [diff] [blame] | 598 | sp -= 4; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 599 | // ... pop "with" exception handler, and signal END_FINALLY |
| 600 | // to just execute finally handler normally (by pushing None |
| 601 | // on value stack) |
| 602 | assert(exc_sp >= exc_stack); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 603 | POP_EXC_BLOCK(); |
| 604 | PUSH(mp_const_none); |
Damien George | 596f41d | 2015-02-10 13:21:42 +0000 | [diff] [blame] | 605 | } else { |
| 606 | // Pop __exit__ boundmethod at sp[-3], remembering that top 3 values |
| 607 | // are reversed. |
| 608 | sp[-3] = sp[0]; |
| 609 | obj = sp[-2]; |
| 610 | sp[-2] = sp[-1]; |
| 611 | sp[-1] = obj; |
| 612 | sp--; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 613 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 614 | } |
| 615 | DISPATCH(); |
| 616 | } |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 617 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 618 | ENTRY(MP_BC_UNWIND_JUMP): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 619 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 620 | DECODE_SLABEL; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 621 | PUSH((void*)(ip + slab)); // push destination ip for jump |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 622 | PUSH((void*)(mp_uint_t)(*ip)); // push number of exception handlers to unwind (0x80 bit set if we also need to pop stack) |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 623 | unwind_jump:; |
| 624 | mp_uint_t unum = (mp_uint_t)POP(); // get number of exception handlers to unwind |
Damien George | 25c8464 | 2014-05-30 15:20:41 +0100 | [diff] [blame] | 625 | while ((unum & 0x7f) > 0) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 626 | unum -= 1; |
| 627 | assert(exc_sp >= exc_stack); |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 628 | if (MP_TAGPTR_TAG1(exc_sp->val_sp)) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 629 | // We're going to run "finally" code as a coroutine |
| 630 | // (not calling it recursively). Set up a sentinel |
| 631 | // on a stack so it can return back to us when it is |
| 632 | // done (when END_FINALLY reached). |
| 633 | PUSH((void*)unum); // push number of exception handlers left to unwind |
| 634 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_JUMP)); // push sentinel |
| 635 | ip = exc_sp->handler; // get exception handler byte code address |
| 636 | exc_sp--; // pop exception handler |
| 637 | goto dispatch_loop; // run the exception handler |
| 638 | } |
| 639 | exc_sp--; |
| 640 | } |
| 641 | ip = (const byte*)POP(); // pop destination ip for jump |
Damien George | 25c8464 | 2014-05-30 15:20:41 +0100 | [diff] [blame] | 642 | if (unum != 0) { |
| 643 | sp--; |
| 644 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 645 | DISPATCH_WITH_PEND_EXC_CHECK(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 646 | } |
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): |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 650 | ENTRY(MP_BC_SETUP_FINALLY): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 651 | MARK_EXC_IP_SELECTIVE(); |
Damien George | f89d659 | 2014-12-29 00:29:59 +0000 | [diff] [blame] | 652 | #if SELECTIVE_EXC_IP |
| 653 | PUSH_EXC_BLOCK((code_state->ip[-1] == MP_BC_SETUP_FINALLY) ? 1 : 0); |
| 654 | #else |
| 655 | PUSH_EXC_BLOCK((code_state->ip[0] == MP_BC_SETUP_FINALLY) ? 1 : 0); |
| 656 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 657 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 658 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 659 | |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 660 | ENTRY(MP_BC_END_FINALLY): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 661 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 662 | // not fully implemented |
| 663 | // if TOS is an exception, reraises the exception (3 values on TOS) |
| 664 | // if TOS is None, just pops it and continues |
| 665 | // if TOS is an integer, does something else |
| 666 | // else error |
| 667 | if (mp_obj_is_exception_type(TOP())) { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 668 | RAISE(sp[-1]); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 669 | } |
| 670 | if (TOP() == mp_const_none) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 671 | sp--; |
Damien George | 5e1d993 | 2015-03-25 22:20:37 +0000 | [diff] [blame] | 672 | } else { |
| 673 | assert(MP_OBJ_IS_SMALL_INT(TOP())); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 674 | // We finished "finally" coroutine and now dispatch back |
| 675 | // to our caller, based on TOS value |
| 676 | mp_unwind_reason_t reason = MP_OBJ_SMALL_INT_VALUE(POP()); |
Damien George | 5e1d993 | 2015-03-25 22:20:37 +0000 | [diff] [blame] | 677 | if (reason == UNWIND_RETURN) { |
| 678 | goto unwind_return; |
| 679 | } else { |
| 680 | assert(reason == UNWIND_JUMP); |
| 681 | goto unwind_jump; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 682 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 683 | } |
| 684 | DISPATCH(); |
| 685 | |
| 686 | ENTRY(MP_BC_GET_ITER): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 687 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 688 | SET_TOP(mp_getiter(TOP())); |
| 689 | DISPATCH(); |
| 690 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 691 | ENTRY(MP_BC_FOR_ITER): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 692 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 693 | 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] | 694 | code_state->sp = sp; |
Paul Sokolovsky | c48d6f7 | 2014-05-11 20:32:39 +0300 | [diff] [blame] | 695 | assert(TOP()); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 696 | mp_obj_t value = mp_iternext_allow_raise(TOP()); |
| 697 | if (value == MP_OBJ_STOP_ITERATION) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 698 | --sp; // pop the exhausted iterator |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 699 | ip += ulab; // jump to after for-block |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 700 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 701 | PUSH(value); // push the next iteration value |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 702 | } |
| 703 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 704 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 705 | |
| 706 | // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH |
| 707 | ENTRY(MP_BC_POP_BLOCK): |
| 708 | // we are exiting an exception handler, so pop the last one of the exception-stack |
| 709 | assert(exc_sp >= exc_stack); |
| 710 | POP_EXC_BLOCK(); |
| 711 | DISPATCH(); |
| 712 | |
| 713 | // matched against: SETUP_EXCEPT |
| 714 | ENTRY(MP_BC_POP_EXCEPT): |
| 715 | // TODO need to work out how blocks work etc |
| 716 | // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate |
| 717 | assert(exc_sp >= exc_stack); |
| 718 | assert(currently_in_except_block); |
| 719 | //sp = (mp_obj_t*)(*exc_sp--); |
| 720 | //exc_sp--; // discard ip |
| 721 | POP_EXC_BLOCK(); |
| 722 | //sp -= 3; // pop 3 exception values |
| 723 | DISPATCH(); |
| 724 | |
| 725 | ENTRY(MP_BC_NOT): |
| 726 | if (TOP() == mp_const_true) { |
| 727 | SET_TOP(mp_const_false); |
| 728 | } else { |
| 729 | SET_TOP(mp_const_true); |
| 730 | } |
| 731 | DISPATCH(); |
| 732 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 733 | ENTRY(MP_BC_BUILD_TUPLE): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 734 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 735 | DECODE_UINT; |
| 736 | sp -= unum - 1; |
| 737 | SET_TOP(mp_obj_new_tuple(unum, sp)); |
| 738 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 739 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 740 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 741 | ENTRY(MP_BC_BUILD_LIST): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 742 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 743 | DECODE_UINT; |
| 744 | sp -= unum - 1; |
| 745 | SET_TOP(mp_obj_new_list(unum, sp)); |
| 746 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 747 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 748 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 749 | ENTRY(MP_BC_LIST_APPEND): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 750 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 751 | DECODE_UINT; |
| 752 | // I think it's guaranteed by the compiler that sp[unum] is a list |
| 753 | mp_obj_list_append(sp[-unum], sp[0]); |
| 754 | sp--; |
| 755 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 756 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 757 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 758 | ENTRY(MP_BC_BUILD_MAP): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 759 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 760 | DECODE_UINT; |
| 761 | PUSH(mp_obj_new_dict(unum)); |
| 762 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 763 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 764 | |
| 765 | ENTRY(MP_BC_STORE_MAP): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 766 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 767 | sp -= 2; |
| 768 | mp_obj_dict_store(sp[0], sp[2], sp[1]); |
| 769 | DISPATCH(); |
| 770 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 771 | ENTRY(MP_BC_MAP_ADD): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 772 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 773 | DECODE_UINT; |
| 774 | // I think it's guaranteed by the compiler that sp[-unum - 1] is a map |
| 775 | mp_obj_dict_store(sp[-unum - 1], sp[0], sp[-1]); |
| 776 | sp -= 2; |
| 777 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 778 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 779 | |
Damien George | 3ebd4d0 | 2014-06-01 13:46:47 +0100 | [diff] [blame] | 780 | #if MICROPY_PY_BUILTINS_SET |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 781 | ENTRY(MP_BC_BUILD_SET): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 782 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 783 | DECODE_UINT; |
| 784 | sp -= unum - 1; |
| 785 | SET_TOP(mp_obj_new_set(unum, sp)); |
| 786 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 787 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 788 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 789 | ENTRY(MP_BC_SET_ADD): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 790 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 791 | DECODE_UINT; |
| 792 | // I think it's guaranteed by the compiler that sp[-unum] is a set |
| 793 | mp_obj_set_store(sp[-unum], sp[0]); |
| 794 | sp--; |
| 795 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 796 | } |
Damien George | 3ebd4d0 | 2014-06-01 13:46:47 +0100 | [diff] [blame] | 797 | #endif |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 798 | |
Damien George | fb510b3 | 2014-06-01 13:32:54 +0100 | [diff] [blame] | 799 | #if MICROPY_PY_BUILTINS_SLICE |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 800 | ENTRY(MP_BC_BUILD_SLICE): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 801 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 802 | DECODE_UINT; |
| 803 | if (unum == 2) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 804 | mp_obj_t stop = POP(); |
| 805 | mp_obj_t start = TOP(); |
| 806 | SET_TOP(mp_obj_new_slice(start, stop, mp_const_none)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 807 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 808 | mp_obj_t step = POP(); |
| 809 | mp_obj_t stop = POP(); |
| 810 | mp_obj_t start = TOP(); |
| 811 | SET_TOP(mp_obj_new_slice(start, stop, step)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 812 | } |
| 813 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 814 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 815 | #endif |
| 816 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 817 | ENTRY(MP_BC_UNPACK_SEQUENCE): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 818 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 819 | DECODE_UINT; |
| 820 | mp_unpack_sequence(sp[0], unum, sp); |
| 821 | sp += unum - 1; |
| 822 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 823 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 824 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 825 | ENTRY(MP_BC_UNPACK_EX): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 826 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 827 | DECODE_UINT; |
| 828 | mp_unpack_ex(sp[0], unum, sp); |
| 829 | sp += (unum & 0xff) + ((unum >> 8) & 0xff); |
| 830 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 831 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 832 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 833 | ENTRY(MP_BC_MAKE_FUNCTION): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 834 | DECODE_PTR; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 835 | PUSH(mp_make_function_from_raw_code(ptr, MP_OBJ_NULL, MP_OBJ_NULL)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 836 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 837 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 838 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 839 | ENTRY(MP_BC_MAKE_FUNCTION_DEFARGS): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 840 | DECODE_PTR; |
| 841 | // Stack layout: def_tuple def_dict <- TOS |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 842 | mp_obj_t def_dict = POP(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 843 | SET_TOP(mp_make_function_from_raw_code(ptr, TOP(), def_dict)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 844 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 845 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 846 | |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 847 | ENTRY(MP_BC_MAKE_CLOSURE): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 848 | DECODE_PTR; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 849 | mp_uint_t n_closed_over = *ip++; |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 850 | // Stack layout: closed_overs <- TOS |
| 851 | sp -= n_closed_over - 1; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 852 | SET_TOP(mp_make_closure_from_raw_code(ptr, n_closed_over, sp)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 853 | DISPATCH(); |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 854 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 855 | |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 856 | ENTRY(MP_BC_MAKE_CLOSURE_DEFARGS): { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 857 | DECODE_PTR; |
Damien George | 40f3c02 | 2014-07-03 13:25:24 +0100 | [diff] [blame] | 858 | mp_uint_t n_closed_over = *ip++; |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 859 | // Stack layout: def_tuple def_dict closed_overs <- TOS |
| 860 | sp -= 2 + n_closed_over - 1; |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 861 | SET_TOP(mp_make_closure_from_raw_code(ptr, 0x100 | n_closed_over, sp)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 862 | DISPATCH(); |
Damien George | 3558f62 | 2014-04-20 17:50:40 +0100 | [diff] [blame] | 863 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 864 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 865 | ENTRY(MP_BC_CALL_FUNCTION): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 866 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 867 | DECODE_UINT; |
| 868 | // unum & 0xff == n_positional |
| 869 | // (unum >> 8) & 0xff == n_keyword |
| 870 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe); |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 871 | #if MICROPY_STACKLESS |
| 872 | if (mp_obj_get_type(*sp) == &mp_type_fun_bc) { |
| 873 | code_state->ip = ip; |
| 874 | code_state->sp = sp; |
| 875 | code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
| 876 | mp_code_state *new_state = mp_obj_fun_bc_prepare_codestate(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1); |
Paul Sokolovsky | 332a909 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 877 | if (new_state) { |
| 878 | new_state->prev = code_state; |
| 879 | code_state = new_state; |
| 880 | nlr_pop(); |
| 881 | goto run_code_state; |
| 882 | } |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 883 | } |
| 884 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 885 | SET_TOP(mp_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1)); |
| 886 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 887 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 888 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 889 | ENTRY(MP_BC_CALL_FUNCTION_VAR_KW): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 890 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 891 | DECODE_UINT; |
| 892 | // unum & 0xff == n_positional |
| 893 | // (unum >> 8) & 0xff == n_keyword |
| 894 | // We have folowing stack layout here: |
| 895 | // fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS |
| 896 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2; |
Paul Sokolovsky | f0a8f21 | 2015-03-28 01:14:45 +0200 | [diff] [blame^] | 897 | #if MICROPY_STACKLESS |
| 898 | if (mp_obj_get_type(*sp) == &mp_type_fun_bc) { |
| 899 | code_state->ip = ip; |
| 900 | code_state->sp = sp; |
| 901 | code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
| 902 | |
| 903 | call_args_t out_args; |
| 904 | mp_call_prepare_args_n_kw_var(false, unum, sp, &out_args); |
| 905 | |
| 906 | mp_code_state *new_state = mp_obj_fun_bc_prepare_codestate(out_args.fun, |
| 907 | out_args.n_args, out_args.n_kw, out_args.args); |
| 908 | m_del(mp_obj_t, out_args.args, out_args.n_alloc); |
| 909 | if (new_state) { |
| 910 | new_state->prev = code_state; |
| 911 | code_state = new_state; |
| 912 | nlr_pop(); |
| 913 | goto run_code_state; |
| 914 | } |
| 915 | } |
| 916 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 917 | SET_TOP(mp_call_method_n_kw_var(false, unum, sp)); |
| 918 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 919 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 920 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 921 | ENTRY(MP_BC_CALL_METHOD): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 922 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 923 | DECODE_UINT; |
| 924 | // unum & 0xff == n_positional |
| 925 | // (unum >> 8) & 0xff == n_keyword |
| 926 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1; |
Paul Sokolovsky | 390e926 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 927 | #if MICROPY_STACKLESS |
| 928 | if (mp_obj_get_type(*sp) == &mp_type_fun_bc) { |
| 929 | code_state->ip = ip; |
| 930 | code_state->sp = sp; |
| 931 | code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
| 932 | |
| 933 | mp_uint_t n_args = unum & 0xff; |
| 934 | mp_uint_t n_kw = (unum >> 8) & 0xff; |
| 935 | int adjust = (sp[1] == NULL) ? 0 : 1; |
| 936 | |
| 937 | mp_code_state *new_state = mp_obj_fun_bc_prepare_codestate(*sp, n_args + adjust, n_kw, sp + 2 - adjust); |
| 938 | if (new_state) { |
| 939 | new_state->prev = code_state; |
| 940 | code_state = new_state; |
| 941 | nlr_pop(); |
| 942 | goto run_code_state; |
| 943 | } |
| 944 | } |
| 945 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 946 | SET_TOP(mp_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp)); |
| 947 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 948 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 949 | |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 950 | ENTRY(MP_BC_CALL_METHOD_VAR_KW): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 951 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 952 | DECODE_UINT; |
| 953 | // unum & 0xff == n_positional |
| 954 | // (unum >> 8) & 0xff == n_keyword |
| 955 | // We have folowing stack layout here: |
| 956 | // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS |
| 957 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 3; |
Paul Sokolovsky | f0a8f21 | 2015-03-28 01:14:45 +0200 | [diff] [blame^] | 958 | #if MICROPY_STACKLESS |
| 959 | if (mp_obj_get_type(*sp) == &mp_type_fun_bc) { |
| 960 | code_state->ip = ip; |
| 961 | code_state->sp = sp; |
| 962 | code_state->exc_sp = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
| 963 | |
| 964 | call_args_t out_args; |
| 965 | mp_call_prepare_args_n_kw_var(true, unum, sp, &out_args); |
| 966 | |
| 967 | mp_code_state *new_state = mp_obj_fun_bc_prepare_codestate(out_args.fun, |
| 968 | out_args.n_args, out_args.n_kw, out_args.args); |
| 969 | m_del(mp_obj_t, out_args.args, out_args.n_alloc); |
| 970 | if (new_state) { |
| 971 | new_state->prev = code_state; |
| 972 | code_state = new_state; |
| 973 | nlr_pop(); |
| 974 | goto run_code_state; |
| 975 | } |
| 976 | } |
| 977 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 978 | SET_TOP(mp_call_method_n_kw_var(true, unum, sp)); |
| 979 | DISPATCH(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 980 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 981 | |
| 982 | ENTRY(MP_BC_RETURN_VALUE): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 983 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 984 | unwind_return: |
| 985 | while (exc_sp >= exc_stack) { |
Damien George | 74eb44c | 2014-12-22 12:49:57 +0000 | [diff] [blame] | 986 | if (MP_TAGPTR_TAG1(exc_sp->val_sp)) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 987 | // We're going to run "finally" code as a coroutine |
| 988 | // (not calling it recursively). Set up a sentinel |
| 989 | // on a stack so it can return back to us when it is |
| 990 | // done (when END_FINALLY reached). |
| 991 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_RETURN)); |
| 992 | ip = exc_sp->handler; |
| 993 | // We don't need to do anything with sp, finally is just |
| 994 | // syntactic sugar for sequential execution?? |
| 995 | // sp = |
| 996 | exc_sp--; |
| 997 | goto dispatch_loop; |
| 998 | } |
| 999 | exc_sp--; |
| 1000 | } |
| 1001 | nlr_pop(); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1002 | code_state->sp = sp; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1003 | assert(exc_sp == exc_stack - 1); |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 1004 | #if MICROPY_STACKLESS |
| 1005 | if (code_state->prev != NULL) { |
| 1006 | mp_obj_t res = *sp; |
| 1007 | mp_globals_set(code_state->old_globals); |
| 1008 | code_state = code_state->prev; |
| 1009 | *code_state->sp = res; |
| 1010 | goto run_code_state; |
| 1011 | } |
| 1012 | #endif |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1013 | return MP_VM_RETURN_NORMAL; |
| 1014 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1015 | ENTRY(MP_BC_RAISE_VARARGS): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1016 | MARK_EXC_IP_SELECTIVE(); |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 1017 | mp_uint_t unum = *ip++; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1018 | mp_obj_t obj; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1019 | assert(unum <= 1); |
| 1020 | if (unum == 0) { |
| 1021 | // search for the inner-most previous exception, to reraise it |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1022 | obj = MP_OBJ_NULL; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1023 | for (mp_exc_stack_t *e = exc_sp; e >= exc_stack; e--) { |
| 1024 | if (e->prev_exc != MP_OBJ_NULL) { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1025 | obj = e->prev_exc; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1026 | break; |
| 1027 | } |
| 1028 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1029 | if (obj == MP_OBJ_NULL) { |
| 1030 | obj = mp_obj_new_exception_msg(&mp_type_RuntimeError, "No active exception to reraise"); |
| 1031 | RAISE(obj); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1032 | } |
| 1033 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1034 | obj = POP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1035 | } |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1036 | obj = mp_make_raise_obj(obj); |
| 1037 | RAISE(obj); |
| 1038 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1039 | |
| 1040 | ENTRY(MP_BC_YIELD_VALUE): |
| 1041 | yield: |
| 1042 | nlr_pop(); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1043 | code_state->ip = ip; |
| 1044 | code_state->sp = sp; |
| 1045 | 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] | 1046 | return MP_VM_RETURN_YIELD; |
| 1047 | |
| 1048 | ENTRY(MP_BC_YIELD_FROM): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1049 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1050 | //#define EXC_MATCH(exc, type) MP_OBJ_IS_TYPE(exc, type) |
| 1051 | #define EXC_MATCH(exc, type) mp_obj_exception_match(exc, type) |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1052 | #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] | 1053 | mp_vm_return_kind_t ret_kind; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1054 | mp_obj_t send_value = POP(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1055 | mp_obj_t t_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1056 | mp_obj_t ret_value; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1057 | if (inject_exc != MP_OBJ_NULL) { |
| 1058 | t_exc = inject_exc; |
| 1059 | inject_exc = MP_OBJ_NULL; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1060 | ret_kind = mp_resume(TOP(), MP_OBJ_NULL, t_exc, &ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1061 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1062 | ret_kind = mp_resume(TOP(), send_value, MP_OBJ_NULL, &ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1063 | } |
| 1064 | |
| 1065 | if (ret_kind == MP_VM_RETURN_YIELD) { |
| 1066 | ip--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1067 | PUSH(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1068 | goto yield; |
| 1069 | } |
| 1070 | if (ret_kind == MP_VM_RETURN_NORMAL) { |
| 1071 | // Pop exhausted gen |
| 1072 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1073 | if (ret_value == MP_OBJ_NULL) { |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1074 | // Optimize StopIteration |
| 1075 | // TODO: get StopIteration's value |
| 1076 | PUSH(mp_const_none); |
| 1077 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1078 | PUSH(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1079 | } |
| 1080 | |
| 1081 | // If we injected GeneratorExit downstream, then even |
| 1082 | // if it was swallowed, we re-raise GeneratorExit |
| 1083 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
| 1084 | DISPATCH(); |
| 1085 | } |
| 1086 | if (ret_kind == MP_VM_RETURN_EXCEPTION) { |
| 1087 | // Pop exhausted gen |
| 1088 | sp--; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1089 | if (EXC_MATCH(ret_value, &mp_type_StopIteration)) { |
| 1090 | PUSH(mp_obj_exception_get_value(ret_value)); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1091 | // If we injected GeneratorExit downstream, then even |
| 1092 | // if it was swallowed, we re-raise GeneratorExit |
| 1093 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
| 1094 | DISPATCH(); |
| 1095 | } else { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1096 | RAISE(ret_value); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1097 | } |
| 1098 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1099 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1100 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1101 | ENTRY(MP_BC_IMPORT_NAME): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1102 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1103 | DECODE_QSTR; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1104 | mp_obj_t obj = POP(); |
| 1105 | SET_TOP(mp_import_name(qst, obj, TOP())); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1106 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1107 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1108 | |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1109 | ENTRY(MP_BC_IMPORT_FROM): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1110 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1111 | DECODE_QSTR; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1112 | mp_obj_t obj = mp_import_from(TOP(), qst); |
| 1113 | PUSH(obj); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1114 | DISPATCH(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1115 | } |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1116 | |
| 1117 | ENTRY(MP_BC_IMPORT_STAR): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1118 | MARK_EXC_IP_SELECTIVE(); |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1119 | mp_import_all(POP()); |
| 1120 | DISPATCH(); |
| 1121 | |
Damien George | 8456cc0 | 2014-10-25 16:43:46 +0100 | [diff] [blame] | 1122 | #if MICROPY_OPT_COMPUTED_GOTO |
| 1123 | ENTRY(MP_BC_LOAD_CONST_SMALL_INT_MULTI): |
| 1124 | PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16)); |
| 1125 | DISPATCH(); |
| 1126 | |
| 1127 | ENTRY(MP_BC_LOAD_FAST_MULTI): |
| 1128 | obj_shared = fastn[MP_BC_LOAD_FAST_MULTI - (mp_int_t)ip[-1]]; |
| 1129 | goto load_check; |
| 1130 | |
| 1131 | ENTRY(MP_BC_STORE_FAST_MULTI): |
| 1132 | fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP(); |
| 1133 | DISPATCH(); |
| 1134 | |
| 1135 | ENTRY(MP_BC_UNARY_OP_MULTI): |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1136 | MARK_EXC_IP_SELECTIVE(); |
Damien George | 8456cc0 | 2014-10-25 16:43:46 +0100 | [diff] [blame] | 1137 | SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP())); |
| 1138 | DISPATCH(); |
| 1139 | |
| 1140 | ENTRY(MP_BC_BINARY_OP_MULTI): { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1141 | MARK_EXC_IP_SELECTIVE(); |
Damien George | 8456cc0 | 2014-10-25 16:43:46 +0100 | [diff] [blame] | 1142 | mp_obj_t rhs = POP(); |
| 1143 | mp_obj_t lhs = TOP(); |
| 1144 | SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs)); |
| 1145 | DISPATCH(); |
| 1146 | } |
| 1147 | |
| 1148 | ENTRY_DEFAULT: |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1149 | MARK_EXC_IP_SELECTIVE(); |
Damien George | 8456cc0 | 2014-10-25 16:43:46 +0100 | [diff] [blame] | 1150 | #else |
| 1151 | ENTRY_DEFAULT: |
| 1152 | if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + 64) { |
| 1153 | PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16)); |
| 1154 | DISPATCH(); |
| 1155 | } else if (ip[-1] < MP_BC_LOAD_FAST_MULTI + 16) { |
| 1156 | obj_shared = fastn[MP_BC_LOAD_FAST_MULTI - (mp_int_t)ip[-1]]; |
| 1157 | goto load_check; |
| 1158 | } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) { |
| 1159 | fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP(); |
| 1160 | DISPATCH(); |
| 1161 | } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 5) { |
| 1162 | SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP())); |
| 1163 | DISPATCH(); |
| 1164 | } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + 35) { |
| 1165 | mp_obj_t rhs = POP(); |
| 1166 | mp_obj_t lhs = TOP(); |
| 1167 | SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs)); |
| 1168 | DISPATCH(); |
| 1169 | } else |
| 1170 | #endif |
| 1171 | { |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1172 | 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] | 1173 | nlr_pop(); |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1174 | fastn[0] = obj; |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1175 | return MP_VM_RETURN_EXCEPTION; |
Damien George | d867554 | 2014-05-25 22:58:04 +0100 | [diff] [blame] | 1176 | } |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1177 | |
Damien George | 58ebde4 | 2014-05-21 20:32:59 +0100 | [diff] [blame] | 1178 | #if !MICROPY_OPT_COMPUTED_GOTO |
AZ Huang | 9309d99 | 2014-04-15 15:57:01 +0800 | [diff] [blame] | 1179 | } // switch |
AZ Huang | b1f692e | 2014-04-14 23:22:44 +0800 | [diff] [blame] | 1180 | #endif |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 1181 | |
| 1182 | pending_exception_check: |
Damien George | b4b10fd | 2015-01-01 23:30:53 +0000 | [diff] [blame] | 1183 | if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) { |
Paul Sokolovsky | 7495750 | 2014-12-28 07:17:43 +0200 | [diff] [blame] | 1184 | MARK_EXC_IP_SELECTIVE(); |
Damien George | b4b10fd | 2015-01-01 23:30:53 +0000 | [diff] [blame] | 1185 | mp_obj_t obj = MP_STATE_VM(mp_pending_exception); |
| 1186 | MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL; |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 1187 | RAISE(obj); |
| 1188 | } |
Damien George | 124df6f | 2014-10-25 18:19:55 +0100 | [diff] [blame] | 1189 | |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1190 | } // for loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1191 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1192 | } else { |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1193 | exception_handler: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1194 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1195 | |
Damien George | f89d659 | 2014-12-29 00:29:59 +0000 | [diff] [blame] | 1196 | #if SELECTIVE_EXC_IP |
| 1197 | // with selective ip, we store the ip 1 byte past the opcode, so move ptr back |
| 1198 | code_state->ip -= 1; |
| 1199 | #endif |
| 1200 | |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1201 | // check if it's a StopIteration within a for block |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 1202 | if (*code_state->ip == MP_BC_FOR_ITER && mp_obj_is_subclass_fast(mp_obj_get_type(nlr.ret_val), &mp_type_StopIteration)) { |
| 1203 | const byte *ip = code_state->ip + 1; |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1204 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien George | cd97a43 | 2014-12-02 19:25:10 +0000 | [diff] [blame] | 1205 | code_state->ip = ip + ulab; // jump to after for-block |
Damien George | c60a261 | 2014-06-01 12:32:28 +0100 | [diff] [blame] | 1206 | code_state->sp -= 1; // pop the exhausted iterator |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 1207 | goto outer_dispatch_loop; // continue with dispatch loop |
| 1208 | } |
| 1209 | |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 1210 | #if MICROPY_STACKLESS |
| 1211 | unwind_loop: |
| 1212 | #endif |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1213 | // set file and line number that the exception occurred at |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 1214 | // TODO: don't set traceback for exceptions re-raised by END_FINALLY. |
| 1215 | // But consider how to handle nested exceptions. |
Damien George | 6902eed | 2014-04-04 10:52:59 +0000 | [diff] [blame] | 1216 | // TODO need a better way of not adding traceback to constant objects (right now, just GeneratorExit_obj and MemoryError_obj) |
| 1217 | if (mp_obj_is_exception_instance(nlr.ret_val) && nlr.ret_val != &mp_const_GeneratorExit_obj && nlr.ret_val != &mp_const_MemoryError_obj) { |
Damien George | b534e1b | 2014-09-04 14:44:01 +0100 | [diff] [blame] | 1218 | const byte *ip = code_state->code_info; |
| 1219 | mp_uint_t code_info_size = mp_decode_uint(&ip); |
| 1220 | qstr block_name = mp_decode_uint(&ip); |
| 1221 | qstr source_file = mp_decode_uint(&ip); |
| 1222 | mp_uint_t bc = code_state->ip - code_state->code_info - code_info_size; |
Damien George | b427d6a | 2014-08-26 23:35:57 +0100 | [diff] [blame] | 1223 | mp_uint_t source_line = 1; |
| 1224 | mp_uint_t c; |
Damien George | b534e1b | 2014-09-04 14:44:01 +0100 | [diff] [blame] | 1225 | while ((c = *ip)) { |
Damien George | b427d6a | 2014-08-26 23:35:57 +0100 | [diff] [blame] | 1226 | mp_uint_t b, l; |
| 1227 | if ((c & 0x80) == 0) { |
| 1228 | // 0b0LLBBBBB encoding |
| 1229 | b = c & 0x1f; |
| 1230 | l = c >> 5; |
Damien George | b534e1b | 2014-09-04 14:44:01 +0100 | [diff] [blame] | 1231 | ip += 1; |
Damien George | b427d6a | 2014-08-26 23:35:57 +0100 | [diff] [blame] | 1232 | } else { |
| 1233 | // 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte) |
| 1234 | b = c & 0xf; |
Damien George | b534e1b | 2014-09-04 14:44:01 +0100 | [diff] [blame] | 1235 | l = ((c << 4) & 0x700) | ip[1]; |
| 1236 | ip += 2; |
Damien George | b427d6a | 2014-08-26 23:35:57 +0100 | [diff] [blame] | 1237 | } |
| 1238 | if (bc >= b) { |
| 1239 | bc -= b; |
| 1240 | source_line += l; |
| 1241 | } else { |
| 1242 | // found source line corresponding to bytecode offset |
| 1243 | break; |
Paul Sokolovsky | 411732e | 2014-06-02 18:24:34 +0300 | [diff] [blame] | 1244 | } |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 1245 | } |
Damien George | 136b149 | 2014-01-19 12:38:49 +0000 | [diff] [blame] | 1246 | 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] | 1247 | } |
| 1248 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1249 | while (currently_in_except_block) { |
| 1250 | // nested exception |
| 1251 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 1252 | assert(exc_sp >= exc_stack); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1253 | |
| 1254 | // TODO make a proper message for nested exception |
| 1255 | // at the moment we are just raising the very last exception (the one that caused the nested exception) |
| 1256 | |
| 1257 | // move up to previous exception handler |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame] | 1258 | POP_EXC_BLOCK(); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1259 | } |
| 1260 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 1261 | if (exc_sp >= exc_stack) { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1262 | // set flag to indicate that we are now handling an exception |
| 1263 | currently_in_except_block = 1; |
| 1264 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1265 | // catch exception and pass to byte code |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1266 | code_state->ip = exc_sp->handler; |
Damien George | 66ae8c9 | 2014-04-17 16:50:23 +0100 | [diff] [blame] | 1267 | mp_obj_t *sp = MP_TAGPTR_PTR(exc_sp->val_sp); |
Damien George | d7592a1 | 2014-03-30 00:54:48 +0000 | [diff] [blame] | 1268 | // save this exception in the stack so it can be used in a reraise, if needed |
| 1269 | exc_sp->prev_exc = nlr.ret_val; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 1270 | // push(traceback, exc-val, exc-type) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 1271 | PUSH(mp_const_none); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 1272 | PUSH(nlr.ret_val); |
Paul Sokolovsky | 682f9e6 | 2014-03-29 02:52:17 +0200 | [diff] [blame] | 1273 | PUSH(mp_obj_get_type(nlr.ret_val)); |
Paul Sokolovsky | b4ebad3 | 2014-05-31 16:50:46 +0300 | [diff] [blame] | 1274 | code_state->sp = sp; |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 1275 | |
Paul Sokolovsky | 2039757 | 2015-03-28 01:14:44 +0200 | [diff] [blame] | 1276 | #if MICROPY_STACKLESS |
| 1277 | } else if (code_state->prev != NULL) { |
| 1278 | mp_globals_set(code_state->old_globals); |
| 1279 | code_state = code_state->prev; |
| 1280 | fastn = &code_state->state[code_state->n_state - 1]; |
| 1281 | exc_stack = (mp_exc_stack_t*)(code_state->state + code_state->n_state); |
| 1282 | // variables that are visible to the exception handler (declared volatile) |
| 1283 | currently_in_except_block = MP_TAGPTR_TAG0(code_state->exc_sp); // 0 or 1, to detect nested exceptions |
| 1284 | exc_sp = MP_TAGPTR_PTR(code_state->exc_sp); // stack grows up, exc_sp points to top of stack |
| 1285 | goto unwind_loop; |
| 1286 | |
| 1287 | #endif |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1288 | } else { |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 1289 | // propagate exception to higher level |
| 1290 | // TODO what to do about ip and sp? they don't really make sense at this point |
| 1291 | fastn[0] = nlr.ret_val; // must put exception here because sp is invalid |
| 1292 | return MP_VM_RETURN_EXCEPTION; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 1293 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1294 | } |
| 1295 | } |
| 1296 | } |