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