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