Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1 | #include <stdio.h> |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 2 | #include <assert.h> |
| 3 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 4 | #include "nlr.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 5 | #include "misc.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 6 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 7 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 8 | #include "obj.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 9 | #include "runtime.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 10 | #include "bc0.h" |
Damien | eb19efb | 2013-10-10 22:06:54 +0100 | [diff] [blame] | 11 | #include "bc.h" |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 12 | #include "objgenerator.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 13 | |
Paul Sokolovsky | 8519342 | 2014-01-31 19:45:15 +0200 | [diff] [blame] | 14 | // Value stack grows up (this makes it incompatible with native C stack, but |
| 15 | // makes sure that arguments to functions are in natural order arg1..argN |
| 16 | // (Python semantics mandates left-to-right evaluation order, including for |
| 17 | // function arguments). Stack pointer is pre-incremented and points at the |
| 18 | // top element. |
| 19 | // Exception stack also grows up, top element is also pointed at. |
| 20 | |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 21 | // Exception stack unwind reasons (WHY_* in CPython-speak) |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 22 | // TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds |
| 23 | // left to do encoded in the JUMP number |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 24 | typedef enum { |
| 25 | UNWIND_RETURN = 1, |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 26 | UNWIND_JUMP, |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 27 | } mp_unwind_reason_t; |
| 28 | |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 29 | #define DECODE_UINT { \ |
| 30 | unum = 0; \ |
| 31 | do { \ |
| 32 | unum = (unum << 7) + (*ip & 0x7f); \ |
| 33 | } while ((*ip++ & 0x80) != 0); \ |
| 34 | } |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 35 | #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0) |
| 36 | #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0) |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 37 | #define DECODE_QSTR { \ |
| 38 | qst = 0; \ |
| 39 | do { \ |
| 40 | qst = (qst << 7) + (*ip & 0x7f); \ |
| 41 | } while ((*ip++ & 0x80) != 0); \ |
| 42 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 43 | #define PUSH(val) *++sp = (val) |
| 44 | #define POP() (*sp--) |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 45 | #define TOP() (*sp) |
| 46 | #define SET_TOP(val) *sp = (val) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 47 | |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 48 | #define PUSH_EXC_BLOCK() \ |
Paul Sokolovsky | 4fff26a | 2014-03-29 02:49:07 +0200 | [diff] [blame] | 49 | DECODE_ULABEL; /* except labels are always forward */ \ |
| 50 | ++exc_sp; \ |
| 51 | exc_sp->opcode = op; \ |
| 52 | exc_sp->handler = ip + unum; \ |
| 53 | exc_sp->val_sp = MP_TAGPTR_MAKE(sp, currently_in_except_block); \ |
| 54 | currently_in_except_block = 0; /* in a try block now */ |
| 55 | |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 56 | #define POP_EXC_BLOCK() \ |
| 57 | currently_in_except_block = MP_TAGPTR_TAG(exc_sp->val_sp); /* restore previous state */ \ |
| 58 | exc_sp--; /* pop back to previous exception handler */ |
| 59 | |
Damien George | bee17b0 | 2014-03-27 11:07:04 +0000 | [diff] [blame] | 60 | mp_vm_return_kind_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, const mp_obj_t *args2, uint n_args2, mp_obj_t *ret) { |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 61 | const byte *ip = code; |
| 62 | |
| 63 | // get code info size, and skip line number table |
| 64 | machine_uint_t code_info_size = ip[0] | (ip[1] << 8) | (ip[2] << 16) | (ip[3] << 24); |
| 65 | ip += code_info_size; |
| 66 | |
Damien George | bee17b0 | 2014-03-27 11:07:04 +0000 | [diff] [blame] | 67 | // bytecode prelude: state size and exception stack size; 16 bit uints |
| 68 | machine_uint_t n_state = ip[0] | (ip[1] << 8); |
| 69 | machine_uint_t n_exc_stack = ip[2] | (ip[3] << 8); |
| 70 | ip += 4; |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 71 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 72 | // allocate state for locals and stack |
| 73 | mp_obj_t temp_state[10]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 74 | mp_obj_t *state = &temp_state[0]; |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 75 | if (n_state > 10) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 76 | state = m_new(mp_obj_t, n_state); |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 77 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 78 | mp_obj_t *sp = &state[0] - 1; |
| 79 | |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 80 | // allocate state for exceptions |
| 81 | mp_exc_stack exc_state[4]; |
| 82 | mp_exc_stack *exc_stack = &exc_state[0]; |
| 83 | if (n_exc_stack > 4) { |
| 84 | exc_stack = m_new(mp_exc_stack, n_exc_stack); |
| 85 | } |
| 86 | mp_exc_stack *exc_sp = &exc_stack[0] - 1; |
| 87 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 88 | // init args |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 89 | for (uint i = 0; i < n_args; i++) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 90 | state[n_state - 1 - i] = args[i]; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 91 | } |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 92 | for (uint i = 0; i < n_args2; i++) { |
| 93 | state[n_state - 1 - n_args - i] = args2[i]; |
| 94 | } |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 95 | |
Damien George | 8dcc0c7 | 2014-03-27 10:55:21 +0000 | [diff] [blame] | 96 | // bytecode prelude: initialise closed over variables |
| 97 | for (uint n_local = *ip++; n_local > 0; n_local--) { |
| 98 | uint local_num = *ip++; |
| 99 | if (local_num < n_args + n_args2) { |
| 100 | state[n_state - 1 - local_num] = mp_obj_new_cell(state[n_state - 1 - local_num]); |
| 101 | } else { |
| 102 | state[n_state - 1 - local_num] = mp_obj_new_cell(MP_OBJ_NULL); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 103 | } |
| 104 | } |
| 105 | |
| 106 | // execute the byte code |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 107 | mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 108 | |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 109 | switch (vm_return_kind) { |
| 110 | case MP_VM_RETURN_NORMAL: |
| 111 | *ret = *sp; |
| 112 | return MP_VM_RETURN_NORMAL; |
| 113 | case MP_VM_RETURN_EXCEPTION: |
| 114 | *ret = state[n_state - 1]; |
| 115 | return MP_VM_RETURN_EXCEPTION; |
| 116 | case MP_VM_RETURN_YIELD: // byte-code shouldn't yield |
| 117 | default: |
| 118 | assert(0); |
| 119 | *ret = mp_const_none; |
| 120 | return MP_VM_RETURN_NORMAL; |
| 121 | } |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 122 | } |
| 123 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 124 | // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc) |
| 125 | // sp points to bottom of stack which grows up |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 126 | // returns: |
| 127 | // MP_VM_RETURN_NORMAL, sp valid, return value in *sp |
| 128 | // MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp |
| 129 | // MP_VM_RETURN_EXCEPTION, exception in fastn[0] |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 130 | mp_vm_return_kind_t mp_execute_byte_code_2(const byte *code_info, const byte **ip_in_out, |
| 131 | mp_obj_t *fastn, mp_obj_t **sp_in_out, |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 132 | mp_exc_stack *exc_stack, mp_exc_stack **exc_sp_in_out, |
| 133 | volatile mp_obj_t inject_exc) { |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 134 | // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think) |
| 135 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 136 | const byte *ip = *ip_in_out; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 137 | mp_obj_t *sp = *sp_in_out; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 138 | machine_uint_t unum; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 139 | qstr qst; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 140 | mp_obj_t obj1, obj2; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 141 | nlr_buf_t nlr; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 142 | |
Paul Sokolovsky | 1673420 | 2014-03-22 23:20:07 +0200 | [diff] [blame] | 143 | volatile bool currently_in_except_block = MP_TAGPTR_TAG(*exc_sp_in_out); // 0 or 1, to detect nested exceptions |
| 144 | mp_exc_stack *volatile exc_sp = MP_TAGPTR_PTR(*exc_sp_in_out); // stack grows up, exc_sp points to top of stack |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 145 | const byte *volatile save_ip = ip; // this is so we can access ip in the exception handler without making ip volatile (which means the compiler can't keep it in a register in the main loop) |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 146 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 147 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 148 | for (;;) { |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 149 | outer_dispatch_loop: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 150 | if (nlr_push(&nlr) == 0) { |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 151 | // If we have exception to inject, now that we finish setting up |
| 152 | // execution context, raise it. This works as if RAISE_VARARGS |
| 153 | // bytecode was executed. |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 154 | // Injecting exc into yield from generator is a special case, |
| 155 | // handled by MP_BC_YIELD_FROM itself |
| 156 | if (inject_exc != MP_OBJ_NULL && *ip != MP_BC_YIELD_FROM) { |
Paul Sokolovsky | 48caa09 | 2014-03-22 17:50:12 +0200 | [diff] [blame] | 157 | mp_obj_t t = inject_exc; |
| 158 | inject_exc = MP_OBJ_NULL; |
| 159 | nlr_jump(rt_make_raise_obj(t)); |
| 160 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 161 | // loop to execute byte code |
| 162 | for (;;) { |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 163 | dispatch_loop: |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 164 | save_ip = ip; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 165 | int op = *ip++; |
| 166 | switch (op) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 167 | case MP_BC_LOAD_CONST_FALSE: |
| 168 | PUSH(mp_const_false); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 169 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 170 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 171 | case MP_BC_LOAD_CONST_NONE: |
| 172 | PUSH(mp_const_none); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 173 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 174 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 175 | case MP_BC_LOAD_CONST_TRUE: |
| 176 | PUSH(mp_const_true); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 177 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 178 | |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 179 | case MP_BC_LOAD_CONST_ELLIPSIS: |
Damien George | 07ddab5 | 2014-03-29 13:15:08 +0000 | [diff] [blame] | 180 | PUSH((mp_obj_t)&mp_const_ellipsis_obj); |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 181 | break; |
| 182 | |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 183 | case MP_BC_LOAD_CONST_SMALL_INT: { |
Damien George | 4d79d5d | 2014-02-20 00:00:04 +0000 | [diff] [blame] | 184 | machine_int_t num = 0; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 185 | if ((ip[0] & 0x40) != 0) { |
| 186 | // Number is negative |
| 187 | num--; |
| 188 | } |
| 189 | do { |
| 190 | num = (num << 7) | (*ip & 0x7f); |
| 191 | } while ((*ip++ & 0x80) != 0); |
| 192 | PUSH(MP_OBJ_NEW_SMALL_INT(num)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 193 | break; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 194 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 195 | |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 196 | case MP_BC_LOAD_CONST_INT: |
| 197 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 198 | PUSH(mp_obj_new_int_from_long_str(qstr_str(qst))); |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 199 | break; |
| 200 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 201 | case MP_BC_LOAD_CONST_DEC: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 202 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 203 | PUSH(rt_load_const_dec(qst)); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 204 | break; |
| 205 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 206 | case MP_BC_LOAD_CONST_ID: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 207 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 208 | PUSH(rt_load_const_str(qst)); // TODO |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 209 | break; |
| 210 | |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 211 | case MP_BC_LOAD_CONST_BYTES: |
| 212 | DECODE_QSTR; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 213 | PUSH(rt_load_const_bytes(qst)); |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 214 | break; |
| 215 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 216 | case MP_BC_LOAD_CONST_STRING: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 217 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 218 | PUSH(rt_load_const_str(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 219 | break; |
| 220 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 221 | case MP_BC_LOAD_FAST_0: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 222 | PUSH(fastn[0]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 223 | break; |
| 224 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 225 | case MP_BC_LOAD_FAST_1: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 226 | PUSH(fastn[-1]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 227 | break; |
| 228 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 229 | case MP_BC_LOAD_FAST_2: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 230 | PUSH(fastn[-2]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 231 | break; |
| 232 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 233 | case MP_BC_LOAD_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 234 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 235 | PUSH(fastn[-unum]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 236 | break; |
| 237 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 238 | case MP_BC_LOAD_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 239 | DECODE_UINT; |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 240 | PUSH(rt_get_cell(fastn[-unum])); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 241 | break; |
| 242 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 243 | case MP_BC_LOAD_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 244 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 245 | PUSH(rt_load_name(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 246 | break; |
| 247 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 248 | case MP_BC_LOAD_GLOBAL: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 249 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 250 | PUSH(rt_load_global(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 251 | break; |
| 252 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 253 | case MP_BC_LOAD_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 254 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 255 | SET_TOP(rt_load_attr(TOP(), qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 256 | break; |
| 257 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 258 | case MP_BC_LOAD_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 259 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 260 | rt_load_method(*sp, qst, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 261 | sp += 1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 262 | break; |
| 263 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 264 | case MP_BC_LOAD_BUILD_CLASS: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 265 | PUSH(rt_load_build_class()); |
| 266 | break; |
| 267 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 268 | case MP_BC_STORE_FAST_0: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 269 | fastn[0] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 270 | break; |
| 271 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 272 | case MP_BC_STORE_FAST_1: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 273 | fastn[-1] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 274 | break; |
| 275 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 276 | case MP_BC_STORE_FAST_2: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 277 | fastn[-2] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 278 | break; |
| 279 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 280 | case MP_BC_STORE_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 281 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 282 | fastn[-unum] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 283 | break; |
| 284 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 285 | case MP_BC_STORE_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 286 | DECODE_UINT; |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 287 | rt_set_cell(fastn[-unum], POP()); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 288 | break; |
| 289 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 290 | case MP_BC_STORE_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 291 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 292 | rt_store_name(qst, POP()); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 293 | break; |
| 294 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 295 | case MP_BC_STORE_GLOBAL: |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 296 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 297 | rt_store_global(qst, POP()); |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 298 | break; |
| 299 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 300 | case MP_BC_STORE_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 301 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 302 | rt_store_attr(sp[0], qst, sp[-1]); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 303 | sp -= 2; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 304 | break; |
| 305 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 306 | case MP_BC_STORE_SUBSCR: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 307 | rt_store_subscr(sp[-1], sp[0], sp[-2]); |
| 308 | sp -= 3; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 309 | break; |
| 310 | |
Paul Sokolovsky | f909034 | 2014-03-23 21:19:02 +0200 | [diff] [blame] | 311 | case MP_BC_DELETE_NAME: |
| 312 | DECODE_QSTR; |
| 313 | rt_delete_name(qst); |
| 314 | break; |
| 315 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 316 | case MP_BC_DUP_TOP: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 317 | obj1 = TOP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 318 | PUSH(obj1); |
| 319 | break; |
| 320 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 321 | case MP_BC_DUP_TOP_TWO: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 322 | sp += 2; |
| 323 | sp[0] = sp[-2]; |
| 324 | sp[-1] = sp[-3]; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 325 | break; |
| 326 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 327 | case MP_BC_POP_TOP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 328 | sp -= 1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 329 | break; |
| 330 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 331 | case MP_BC_ROT_TWO: |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 332 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 333 | sp[0] = sp[-1]; |
| 334 | sp[-1] = obj1; |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 335 | break; |
| 336 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 337 | case MP_BC_ROT_THREE: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 338 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 339 | sp[0] = sp[-1]; |
| 340 | sp[-1] = sp[-2]; |
| 341 | sp[-2] = obj1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 342 | break; |
| 343 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 344 | case MP_BC_JUMP: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 345 | DECODE_SLABEL; |
| 346 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 347 | break; |
| 348 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 349 | case MP_BC_POP_JUMP_IF_TRUE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 350 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 351 | if (rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 352 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 353 | } |
| 354 | break; |
| 355 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 356 | case MP_BC_POP_JUMP_IF_FALSE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 357 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 358 | if (!rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 359 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 360 | } |
| 361 | break; |
| 362 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 363 | case MP_BC_JUMP_IF_TRUE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 364 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 365 | if (rt_is_true(TOP())) { |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 366 | ip += unum; |
| 367 | } else { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 368 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 369 | } |
| 370 | break; |
| 371 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 372 | case MP_BC_JUMP_IF_FALSE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 373 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 374 | if (rt_is_true(TOP())) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 375 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 376 | } else { |
| 377 | ip += unum; |
| 378 | } |
| 379 | break; |
| 380 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 381 | /* we are trying to get away without using this opcode |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 382 | case MP_BC_SETUP_LOOP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 383 | DECODE_UINT; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 384 | // push_block(MP_BC_SETUP_LOOP, ip + unum, sp) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 385 | break; |
| 386 | */ |
| 387 | |
Damien George | c689c19 | 2014-03-29 14:06:14 +0000 | [diff] [blame] | 388 | case MP_BC_SETUP_WITH: |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 389 | obj1 = TOP(); |
| 390 | SET_TOP(rt_load_attr(obj1, MP_QSTR___exit__)); |
Damien George | c689c19 | 2014-03-29 14:06:14 +0000 | [diff] [blame] | 391 | rt_load_method(obj1, MP_QSTR___enter__, sp + 1); |
| 392 | obj2 = rt_call_method_n_kw(0, 0, sp + 1); |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 393 | PUSH_EXC_BLOCK(); |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 394 | PUSH(obj2); |
| 395 | break; |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 396 | |
| 397 | case MP_BC_WITH_CLEANUP: { |
Paul Sokolovsky | 40d6d29 | 2014-03-29 16:49:33 +0200 | [diff] [blame] | 398 | // Arriving here, there's "exception control block" on top of stack, |
| 399 | // and __exit__ bound method underneath it. Bytecode calls __exit__, |
| 400 | // and "deletes" it off stack, shifting "exception control block" |
| 401 | // to its place. |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 402 | static const mp_obj_t no_exc[] = {mp_const_none, mp_const_none, mp_const_none}; |
| 403 | if (TOP() == mp_const_none) { |
| 404 | sp--; |
| 405 | obj1 = TOP(); |
| 406 | SET_TOP(mp_const_none); |
| 407 | obj2 = rt_call_function_n_kw(obj1, 3, 0, no_exc); |
| 408 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
| 409 | mp_obj_t cause = POP(); |
| 410 | switch (MP_OBJ_SMALL_INT_VALUE(cause)) { |
| 411 | case UNWIND_RETURN: { |
| 412 | mp_obj_t retval = POP(); |
| 413 | obj2 = rt_call_function_n_kw(TOP(), 3, 0, no_exc); |
| 414 | SET_TOP(retval); |
| 415 | PUSH(cause); |
| 416 | break; |
| 417 | } |
| 418 | case UNWIND_JUMP: { |
| 419 | obj2 = rt_call_function_n_kw(sp[-2], 3, 0, no_exc); |
| 420 | // Pop __exit__ boundmethod at sp[-2] |
| 421 | sp[-2] = sp[-1]; |
| 422 | sp[-1] = sp[0]; |
| 423 | SET_TOP(cause); |
| 424 | break; |
| 425 | } |
| 426 | default: |
| 427 | assert(0); |
| 428 | } |
| 429 | } else if (mp_obj_is_exception_type(TOP())) { |
| 430 | mp_obj_t args[3] = {sp[0], sp[-1], sp[-2]}; |
| 431 | obj2 = rt_call_function_n_kw(sp[-3], 3, 0, args); |
| 432 | // Pop __exit__ boundmethod at sp[-3] |
| 433 | // TODO: Once semantics is proven, optimize for case when obj2 == True |
| 434 | sp[-3] = sp[-2]; |
| 435 | sp[-2] = sp[-1]; |
| 436 | sp[-1] = sp[0]; |
| 437 | sp--; |
| 438 | if (rt_is_true(obj2)) { |
| 439 | // This is what CPython does |
| 440 | //PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_SILENCED)); |
| 441 | // But what we need to do is - pop exception from value stack... |
| 442 | sp -= 3; |
Paul Sokolovsky | 40d6d29 | 2014-03-29 16:49:33 +0200 | [diff] [blame] | 443 | // ... pop "with" exception handler, and signal END_FINALLY |
| 444 | // to just execute finally handler normally (by pushing None |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 445 | // on value stack) |
| 446 | assert(exc_sp >= exc_stack); |
| 447 | assert(exc_sp->opcode == MP_BC_SETUP_WITH); |
| 448 | exc_sp--; |
| 449 | PUSH(mp_const_none); |
| 450 | } |
| 451 | } else { |
| 452 | assert(0); |
| 453 | } |
| 454 | break; |
| 455 | } |
| 456 | |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 457 | case MP_BC_UNWIND_JUMP: |
| 458 | DECODE_SLABEL; |
| 459 | PUSH((void*)(ip + unum)); // push destination ip for jump |
| 460 | PUSH((void*)(machine_uint_t)(*ip)); // push number of exception handlers to unwind |
| 461 | unwind_jump: |
| 462 | unum = (machine_uint_t)POP(); // get number of exception handlers to unwind |
| 463 | while (unum > 0) { |
| 464 | unum -= 1; |
| 465 | assert(exc_sp >= exc_stack); |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 466 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY || exc_sp->opcode == MP_BC_SETUP_WITH) { |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 467 | // We're going to run "finally" code as a coroutine |
| 468 | // (not calling it recursively). Set up a sentinel |
| 469 | // on a stack so it can return back to us when it is |
| 470 | // done (when END_FINALLY reached). |
| 471 | PUSH((void*)unum); // push number of exception handlers left to unwind |
| 472 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_JUMP)); // push sentinel |
| 473 | ip = exc_sp->handler; // get exception handler byte code address |
| 474 | exc_sp--; // pop exception handler |
| 475 | goto dispatch_loop; // run the exception handler |
| 476 | } |
| 477 | exc_sp--; |
| 478 | } |
| 479 | ip = (const byte*)POP(); // pop destination ip for jump |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 480 | break; |
| 481 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 482 | // matched against: POP_BLOCK or POP_EXCEPT (anything else?) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 483 | case MP_BC_SETUP_EXCEPT: |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 484 | case MP_BC_SETUP_FINALLY: |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 485 | PUSH_EXC_BLOCK(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 486 | break; |
| 487 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 488 | case MP_BC_END_FINALLY: |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 489 | // not fully implemented |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 490 | // if TOS is an exception, reraises the exception (3 values on TOS) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 491 | // if TOS is None, just pops it and continues |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 492 | // if TOS is an integer, does something else |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 493 | // else error |
Paul Sokolovsky | 682f9e6 | 2014-03-29 02:52:17 +0200 | [diff] [blame] | 494 | if (mp_obj_is_exception_type(TOP())) { |
| 495 | nlr_jump(sp[-1]); |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 496 | } |
| 497 | if (TOP() == mp_const_none) { |
| 498 | sp--; |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 499 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
| 500 | // We finished "finally" coroutine and now dispatch back |
| 501 | // to our caller, based on TOS value |
| 502 | mp_unwind_reason_t reason = MP_OBJ_SMALL_INT_VALUE(POP()); |
| 503 | switch (reason) { |
| 504 | case UNWIND_RETURN: |
| 505 | goto unwind_return; |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 506 | case UNWIND_JUMP: |
| 507 | goto unwind_jump; |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 508 | } |
| 509 | assert(0); |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 510 | } else { |
| 511 | assert(0); |
| 512 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 513 | break; |
| 514 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 515 | case MP_BC_GET_ITER: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 516 | SET_TOP(rt_getiter(TOP())); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 517 | break; |
| 518 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 519 | case MP_BC_FOR_ITER: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 520 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien George | 66eaf84 | 2014-03-26 19:27:58 +0000 | [diff] [blame] | 521 | obj1 = rt_iternext_allow_raise(TOP()); |
| 522 | if (obj1 == MP_OBJ_NULL) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 523 | --sp; // pop the exhausted iterator |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 524 | ip += unum; // jump to after for-block |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 525 | } else { |
| 526 | PUSH(obj1); // push the next iteration value |
| 527 | } |
| 528 | break; |
| 529 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 530 | // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 531 | case MP_BC_POP_BLOCK: |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 532 | // we are exiting an exception handler, so pop the last one of the exception-stack |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 533 | assert(exc_sp >= exc_stack); |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 534 | POP_EXC_BLOCK(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 535 | break; |
| 536 | |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 537 | // matched against: SETUP_EXCEPT |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 538 | case MP_BC_POP_EXCEPT: |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 539 | // TODO need to work out how blocks work etc |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 540 | // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 541 | assert(exc_sp >= exc_stack); |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 542 | assert(currently_in_except_block); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 543 | //sp = (mp_obj_t*)(*exc_sp--); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 544 | //exc_sp--; // discard ip |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 545 | POP_EXC_BLOCK(); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 546 | //sp -= 3; // pop 3 exception values |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 547 | break; |
| 548 | |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 549 | case MP_BC_NOT: |
| 550 | if (TOP() == mp_const_true) { |
| 551 | SET_TOP(mp_const_false); |
| 552 | } else { |
| 553 | SET_TOP(mp_const_true); |
| 554 | } |
| 555 | break; |
| 556 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 557 | case MP_BC_UNARY_OP: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 558 | unum = *ip++; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 559 | SET_TOP(rt_unary_op(unum, TOP())); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 560 | break; |
| 561 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 562 | case MP_BC_BINARY_OP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 563 | unum = *ip++; |
| 564 | obj2 = POP(); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 565 | obj1 = TOP(); |
| 566 | SET_TOP(rt_binary_op(unum, obj1, obj2)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 567 | break; |
| 568 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 569 | case MP_BC_BUILD_TUPLE: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 570 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 571 | sp -= unum - 1; |
| 572 | SET_TOP(rt_build_tuple(unum, sp)); |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 573 | break; |
| 574 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 575 | case MP_BC_BUILD_LIST: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 576 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 577 | sp -= unum - 1; |
| 578 | SET_TOP(rt_build_list(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 579 | break; |
| 580 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 581 | case MP_BC_LIST_APPEND: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 582 | DECODE_UINT; |
| 583 | // I think it's guaranteed by the compiler that sp[unum] is a list |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 584 | rt_list_append(sp[-unum], sp[0]); |
| 585 | sp--; |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 586 | break; |
| 587 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 588 | case MP_BC_BUILD_MAP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 589 | DECODE_UINT; |
| 590 | PUSH(rt_build_map(unum)); |
| 591 | break; |
| 592 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 593 | case MP_BC_STORE_MAP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 594 | sp -= 2; |
| 595 | rt_store_map(sp[0], sp[2], sp[1]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 596 | break; |
| 597 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 598 | case MP_BC_MAP_ADD: |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 599 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 600 | // I think it's guaranteed by the compiler that sp[-unum - 1] is a map |
| 601 | rt_store_map(sp[-unum - 1], sp[0], sp[-1]); |
| 602 | sp -= 2; |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 603 | break; |
| 604 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 605 | case MP_BC_BUILD_SET: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 606 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 607 | sp -= unum - 1; |
| 608 | SET_TOP(rt_build_set(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 609 | break; |
| 610 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 611 | case MP_BC_SET_ADD: |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 612 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 613 | // I think it's guaranteed by the compiler that sp[-unum] is a set |
| 614 | rt_store_set(sp[-unum], sp[0]); |
| 615 | sp--; |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 616 | break; |
| 617 | |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 618 | #if MICROPY_ENABLE_SLICE |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 619 | case MP_BC_BUILD_SLICE: |
| 620 | DECODE_UINT; |
| 621 | if (unum == 2) { |
| 622 | obj2 = POP(); |
| 623 | obj1 = TOP(); |
| 624 | SET_TOP(mp_obj_new_slice(obj1, obj2, NULL)); |
| 625 | } else { |
| 626 | printf("3-argument slice is not supported\n"); |
| 627 | assert(0); |
| 628 | } |
| 629 | break; |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 630 | #endif |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 631 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 632 | case MP_BC_UNPACK_SEQUENCE: |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 633 | DECODE_UINT; |
Damien George | 932bf1c | 2014-01-18 23:42:49 +0000 | [diff] [blame] | 634 | rt_unpack_sequence(sp[0], unum, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 635 | sp += unum - 1; |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 636 | break; |
| 637 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 638 | case MP_BC_MAKE_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 639 | DECODE_UINT; |
Damien George | d1e443d | 2014-03-29 11:39:36 +0000 | [diff] [blame] | 640 | PUSH(rt_make_function_from_id(unum, false, MP_OBJ_NULL)); |
Paul Sokolovsky | 9075002 | 2014-02-01 15:05:04 +0200 | [diff] [blame] | 641 | break; |
| 642 | |
| 643 | case MP_BC_MAKE_FUNCTION_DEFARGS: |
| 644 | DECODE_UINT; |
Damien George | d1e443d | 2014-03-29 11:39:36 +0000 | [diff] [blame] | 645 | SET_TOP(rt_make_function_from_id(unum, false, TOP())); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 646 | break; |
| 647 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 648 | case MP_BC_MAKE_CLOSURE: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 649 | DECODE_UINT; |
Paul Sokolovsky | 2447a5b | 2014-03-26 23:14:59 +0200 | [diff] [blame] | 650 | SET_TOP(rt_make_closure_from_id(unum, TOP(), MP_OBJ_NULL)); |
| 651 | break; |
| 652 | |
| 653 | case MP_BC_MAKE_CLOSURE_DEFARGS: |
| 654 | DECODE_UINT; |
| 655 | obj1 = POP(); |
| 656 | SET_TOP(rt_make_closure_from_id(unum, obj1, TOP())); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 657 | break; |
| 658 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 659 | case MP_BC_CALL_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 660 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 661 | // unum & 0xff == n_positional |
| 662 | // (unum >> 8) & 0xff == n_keyword |
| 663 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe); |
| 664 | SET_TOP(rt_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 665 | break; |
| 666 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 667 | case MP_BC_CALL_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 668 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 669 | // unum & 0xff == n_positional |
| 670 | // (unum >> 8) & 0xff == n_keyword |
| 671 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1; |
| 672 | SET_TOP(rt_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 673 | break; |
| 674 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 675 | case MP_BC_RETURN_VALUE: |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 676 | unwind_return: |
| 677 | while (exc_sp >= exc_stack) { |
Paul Sokolovsky | 44307d5 | 2014-03-29 04:10:11 +0200 | [diff] [blame] | 678 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY || exc_sp->opcode == MP_BC_SETUP_WITH) { |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 679 | // We're going to run "finally" code as a coroutine |
| 680 | // (not calling it recursively). Set up a sentinel |
| 681 | // on a stack so it can return back to us when it is |
| 682 | // done (when END_FINALLY reached). |
| 683 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_RETURN)); |
| 684 | ip = exc_sp->handler; |
| 685 | // We don't need to do anything with sp, finally is just |
| 686 | // syntactic sugar for sequential execution?? |
| 687 | // sp = |
| 688 | exc_sp--; |
| 689 | goto dispatch_loop; |
| 690 | } |
| 691 | exc_sp--; |
| 692 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 693 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 694 | *sp_in_out = sp; |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 695 | assert(exc_sp == exc_stack - 1); |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 696 | return MP_VM_RETURN_NORMAL; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 697 | |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 698 | case MP_BC_RAISE_VARARGS: |
| 699 | unum = *ip++; |
Paul Sokolovsky | c403076 | 2014-03-26 14:42:17 +0200 | [diff] [blame] | 700 | assert(unum <= 1); |
| 701 | if (unum == 0) { |
Paul Sokolovsky | d109676 | 2014-03-29 19:44:15 +0200 | [diff] [blame] | 702 | if (!currently_in_except_block) { |
| 703 | nlr_jump(mp_obj_new_exception_msg(&mp_type_RuntimeError, "No active exception to reraise")); |
| 704 | } |
Paul Sokolovsky | c403076 | 2014-03-26 14:42:17 +0200 | [diff] [blame] | 705 | // This assumes that nlr.ret_val holds last raised |
| 706 | // exception and is not overwritten since then. |
| 707 | obj1 = nlr.ret_val; |
| 708 | } else { |
| 709 | obj1 = POP(); |
| 710 | } |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 711 | nlr_jump(rt_make_raise_obj(obj1)); |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 712 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 713 | case MP_BC_YIELD_VALUE: |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 714 | yield: |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 715 | nlr_pop(); |
| 716 | *ip_in_out = ip; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 717 | *sp_in_out = sp; |
Paul Sokolovsky | 1673420 | 2014-03-22 23:20:07 +0200 | [diff] [blame] | 718 | *exc_sp_in_out = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block); |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 719 | return MP_VM_RETURN_YIELD; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 720 | |
Paul Sokolovsky | 40d6d29 | 2014-03-29 16:49:33 +0200 | [diff] [blame] | 721 | case MP_BC_YIELD_FROM: { |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 722 | //#define EXC_MATCH(exc, type) MP_OBJ_IS_TYPE(exc, type) |
| 723 | #define EXC_MATCH(exc, type) mp_obj_exception_match(exc, type) |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 724 | #define GENERATOR_EXIT_IF_NEEDED(t) if (t != MP_OBJ_NULL && EXC_MATCH(t, &mp_type_GeneratorExit)) { nlr_jump(t); } |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 725 | mp_vm_return_kind_t ret_kind; |
| 726 | obj1 = POP(); |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 727 | mp_obj_t t_exc = MP_OBJ_NULL; |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 728 | if (inject_exc != MP_OBJ_NULL) { |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 729 | t_exc = inject_exc; |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 730 | inject_exc = MP_OBJ_NULL; |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 731 | ret_kind = mp_obj_gen_resume(TOP(), mp_const_none, t_exc, &obj2); |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 732 | } else { |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 733 | ret_kind = mp_obj_gen_resume(TOP(), obj1, MP_OBJ_NULL, &obj2); |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 734 | } |
| 735 | |
| 736 | if (ret_kind == MP_VM_RETURN_YIELD) { |
| 737 | ip--; |
| 738 | PUSH(obj2); |
| 739 | goto yield; |
| 740 | } |
| 741 | if (ret_kind == MP_VM_RETURN_NORMAL) { |
| 742 | // Pop exhausted gen |
| 743 | sp--; |
| 744 | if (obj2 == MP_OBJ_NULL) { |
| 745 | // Optimize StopIteration |
| 746 | // TODO: get StopIteration's value |
| 747 | PUSH(mp_const_none); |
| 748 | } else { |
| 749 | PUSH(obj2); |
| 750 | } |
| 751 | |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 752 | // If we injected GeneratorExit downstream, then even |
| 753 | // if it was swallowed, we re-raise GeneratorExit |
| 754 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 755 | break; |
| 756 | } |
| 757 | if (ret_kind == MP_VM_RETURN_EXCEPTION) { |
| 758 | // Pop exhausted gen |
| 759 | sp--; |
| 760 | if (EXC_MATCH(obj2, &mp_type_StopIteration)) { |
Paul Sokolovsky | 55234f4 | 2014-03-26 19:24:03 +0200 | [diff] [blame] | 761 | PUSH(mp_obj_exception_get_value(obj2)); |
| 762 | // If we injected GeneratorExit downstream, then even |
| 763 | // if it was swallowed, we re-raise GeneratorExit |
| 764 | GENERATOR_EXIT_IF_NEEDED(t_exc); |
Paul Sokolovsky | cf21a4e | 2014-03-26 17:36:12 +0200 | [diff] [blame] | 765 | break; |
| 766 | } else { |
| 767 | nlr_jump(obj2); |
| 768 | } |
| 769 | } |
| 770 | } |
| 771 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 772 | case MP_BC_IMPORT_NAME: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 773 | DECODE_QSTR; |
| 774 | obj1 = POP(); |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 775 | SET_TOP(rt_import_name(qst, obj1, TOP())); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 776 | break; |
| 777 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 778 | case MP_BC_IMPORT_FROM: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 779 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 780 | obj1 = rt_import_from(TOP(), qst); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 781 | PUSH(obj1); |
| 782 | break; |
| 783 | |
Paul Sokolovsky | da1ce93 | 2014-02-14 00:22:06 +0200 | [diff] [blame] | 784 | case MP_BC_IMPORT_STAR: |
Damien George | aa9b74f | 2014-02-14 23:06:33 +0000 | [diff] [blame] | 785 | rt_import_all(POP()); |
Paul Sokolovsky | da1ce93 | 2014-02-14 00:22:06 +0200 | [diff] [blame] | 786 | break; |
| 787 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 788 | default: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 789 | printf("code %p, byte code 0x%02x not implemented\n", ip, op); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 790 | assert(0); |
| 791 | nlr_pop(); |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 792 | return MP_VM_RETURN_NORMAL; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 793 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 794 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 795 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 796 | } else { |
| 797 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 798 | |
Damien George | 9e6e935 | 2014-03-26 18:37:06 +0000 | [diff] [blame] | 799 | // check if it's a StopIteration within a for block |
| 800 | if (*save_ip == MP_BC_FOR_ITER && mp_obj_is_subclass_fast(mp_obj_get_type(nlr.ret_val), &mp_type_StopIteration)) { |
| 801 | ip = save_ip + 1; |
| 802 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
| 803 | --sp; // pop the exhausted iterator |
| 804 | ip += unum; // jump to after for-block |
| 805 | goto outer_dispatch_loop; // continue with dispatch loop |
| 806 | } |
| 807 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 808 | // set file and line number that the exception occurred at |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 809 | // TODO: don't set traceback for exceptions re-raised by END_FINALLY. |
| 810 | // But consider how to handle nested exceptions. |
Damien George | b04be05 | 2014-03-29 13:52:51 +0000 | [diff] [blame] | 811 | // TODO need a better way of not adding traceback to constant objects (right now, just GeneratorExit_obj) |
| 812 | if (mp_obj_is_exception_instance(nlr.ret_val) && nlr.ret_val != &mp_const_GeneratorExit_obj) { |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 813 | machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24); |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 814 | qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24); |
| 815 | qstr block_name = code_info[8] | (code_info[9] << 8) | (code_info[10] << 16) | (code_info[11] << 24); |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 816 | machine_uint_t source_line = 1; |
| 817 | machine_uint_t bc = save_ip - code_info - code_info_size; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 818 | //printf("find %lu %d %d\n", bc, code_info[12], code_info[13]); |
Damien George | 28eb577 | 2014-01-25 11:43:20 +0000 | [diff] [blame] | 819 | for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) { |
| 820 | bc -= *ci & 31; |
| 821 | source_line += *ci >> 5; |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 822 | } |
Damien George | 136b149 | 2014-01-19 12:38:49 +0000 | [diff] [blame] | 823 | 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] | 824 | } |
| 825 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 826 | while (currently_in_except_block) { |
| 827 | // nested exception |
| 828 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 829 | assert(exc_sp >= exc_stack); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 830 | |
| 831 | // TODO make a proper message for nested exception |
| 832 | // at the moment we are just raising the very last exception (the one that caused the nested exception) |
| 833 | |
| 834 | // move up to previous exception handler |
Paul Sokolovsky | a0ad77b | 2014-03-29 23:16:27 +0200 | [diff] [blame^] | 835 | POP_EXC_BLOCK(); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 836 | } |
| 837 | |
Paul Sokolovsky | c0abc28 | 2014-03-22 13:49:31 +0200 | [diff] [blame] | 838 | if (exc_sp >= exc_stack) { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 839 | // set flag to indicate that we are now handling an exception |
| 840 | currently_in_except_block = 1; |
| 841 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 842 | // catch exception and pass to byte code |
Paul Sokolovsky | 1673420 | 2014-03-22 23:20:07 +0200 | [diff] [blame] | 843 | sp = MP_TAGPTR_PTR(exc_sp->val_sp); |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 844 | ip = exc_sp->handler; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 845 | // push(traceback, exc-val, exc-type) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 846 | PUSH(mp_const_none); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 847 | PUSH(nlr.ret_val); |
Paul Sokolovsky | 682f9e6 | 2014-03-29 02:52:17 +0200 | [diff] [blame] | 848 | PUSH(mp_obj_get_type(nlr.ret_val)); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 849 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 850 | } else { |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 851 | // propagate exception to higher level |
| 852 | // TODO what to do about ip and sp? they don't really make sense at this point |
| 853 | fastn[0] = nlr.ret_val; // must put exception here because sp is invalid |
| 854 | return MP_VM_RETURN_EXCEPTION; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 855 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 856 | } |
| 857 | } |
| 858 | } |