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