Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 1 | #include <stdint.h> |
| 2 | #include <stdlib.h> |
| 3 | #include <stdio.h> |
| 4 | #include <string.h> |
| 5 | #include <assert.h> |
| 6 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 7 | #include "nlr.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 8 | #include "misc.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 9 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 10 | #include "qstr.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 11 | #include "obj.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 12 | #include "runtime.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 13 | #include "bc0.h" |
Damien | eb19efb | 2013-10-10 22:06:54 +0100 | [diff] [blame] | 14 | #include "bc.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 15 | |
Paul Sokolovsky | 8519342 | 2014-01-31 19:45:15 +0200 | [diff] [blame] | 16 | // Value stack grows up (this makes it incompatible with native C stack, but |
| 17 | // makes sure that arguments to functions are in natural order arg1..argN |
| 18 | // (Python semantics mandates left-to-right evaluation order, including for |
| 19 | // function arguments). Stack pointer is pre-incremented and points at the |
| 20 | // top element. |
| 21 | // Exception stack also grows up, top element is also pointed at. |
| 22 | |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 23 | // Exception stack entry |
| 24 | typedef struct _mp_exc_stack { |
| 25 | const byte *handler; |
| 26 | // bit 0 is saved currently_in_except_block value |
| 27 | machine_uint_t val_sp; |
| 28 | // We might only have 2 interesting cases here: SETUP_EXCEPT & SETUP_FINALLY, |
| 29 | // consider storing it in bit 1 of val_sp. TODO: SETUP_WITH? |
| 30 | byte opcode; |
| 31 | } mp_exc_stack; |
| 32 | |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 33 | // Exception stack unwind reasons (WHY_* in CPython-speak) |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 34 | // TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds |
| 35 | // left to do encoded in the JUMP number |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 36 | typedef enum { |
| 37 | UNWIND_RETURN = 1, |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 38 | UNWIND_JUMP, |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 39 | } mp_unwind_reason_t; |
| 40 | |
Paul Sokolovsky | 0f96ec8 | 2014-02-18 21:21:22 +0200 | [diff] [blame] | 41 | #define DECODE_UINT { \ |
| 42 | unum = 0; \ |
| 43 | do { \ |
| 44 | unum = (unum << 7) + (*ip & 0x7f); \ |
| 45 | } while ((*ip++ & 0x80) != 0); \ |
| 46 | } |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 47 | #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0) |
| 48 | #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] | 49 | #define DECODE_QSTR { \ |
| 50 | qst = 0; \ |
| 51 | do { \ |
| 52 | qst = (qst << 7) + (*ip & 0x7f); \ |
| 53 | } while ((*ip++ & 0x80) != 0); \ |
| 54 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 55 | #define PUSH(val) *++sp = (val) |
| 56 | #define POP() (*sp--) |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 57 | #define TOP() (*sp) |
| 58 | #define SET_TOP(val) *sp = (val) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 59 | |
Damien George | c8f78bc | 2014-02-15 22:55:00 +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, uint n_state, mp_obj_t *ret) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 61 | // allocate state for locals and stack |
| 62 | mp_obj_t temp_state[10]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 63 | mp_obj_t *state = &temp_state[0]; |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 64 | if (n_state > 10) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 65 | state = m_new(mp_obj_t, n_state); |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 66 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 67 | mp_obj_t *sp = &state[0] - 1; |
| 68 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 69 | // init args |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 70 | for (uint i = 0; i < n_args; i++) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 71 | state[n_state - 1 - i] = args[i]; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 72 | } |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 73 | for (uint i = 0; i < n_args2; i++) { |
| 74 | state[n_state - 1 - n_args - i] = args2[i]; |
| 75 | } |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 76 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 77 | const byte *ip = code; |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 78 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 79 | // get code info size |
| 80 | machine_uint_t code_info_size = ip[0] | (ip[1] << 8) | (ip[2] << 16) | (ip[3] << 24); |
| 81 | ip += code_info_size; |
| 82 | |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 83 | // execute prelude to make any cells (closed over variables) |
| 84 | { |
| 85 | for (uint n_local = *ip++; n_local > 0; n_local--) { |
| 86 | uint local_num = *ip++; |
Damien George | fb083ea | 2014-02-01 18:29:40 +0000 | [diff] [blame] | 87 | if (local_num < n_args + n_args2) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 88 | state[n_state - 1 - local_num] = mp_obj_new_cell(state[n_state - 1 - local_num]); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 89 | } else { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 90 | 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] | 91 | } |
| 92 | } |
| 93 | } |
| 94 | |
| 95 | // execute the byte code |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 96 | mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp); |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 97 | |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 98 | switch (vm_return_kind) { |
| 99 | case MP_VM_RETURN_NORMAL: |
| 100 | *ret = *sp; |
| 101 | return MP_VM_RETURN_NORMAL; |
| 102 | case MP_VM_RETURN_EXCEPTION: |
| 103 | *ret = state[n_state - 1]; |
| 104 | return MP_VM_RETURN_EXCEPTION; |
| 105 | case MP_VM_RETURN_YIELD: // byte-code shouldn't yield |
| 106 | default: |
| 107 | assert(0); |
| 108 | *ret = mp_const_none; |
| 109 | return MP_VM_RETURN_NORMAL; |
| 110 | } |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 111 | } |
| 112 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 113 | // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc) |
| 114 | // sp points to bottom of stack which grows up |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 115 | // returns: |
| 116 | // MP_VM_RETURN_NORMAL, sp valid, return value in *sp |
| 117 | // MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp |
| 118 | // MP_VM_RETURN_EXCEPTION, exception in fastn[0] |
| 119 | mp_vm_return_kind_t mp_execute_byte_code_2(const byte *code_info, const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **sp_in_out) { |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 120 | // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think) |
| 121 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 122 | const byte *ip = *ip_in_out; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 123 | mp_obj_t *sp = *sp_in_out; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 124 | machine_uint_t unum; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 125 | qstr qst; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 126 | mp_obj_t obj1, obj2; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 127 | nlr_buf_t nlr; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 128 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 129 | volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 130 | mp_exc_stack exc_stack[4]; |
| 131 | mp_exc_stack *volatile exc_sp = &exc_stack[0] - 1; // stack grows up, exc_sp points to top of stack |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 132 | 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] | 133 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 134 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 135 | for (;;) { |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 136 | if (nlr_push(&nlr) == 0) { |
| 137 | // loop to execute byte code |
| 138 | for (;;) { |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 139 | dispatch_loop: |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 140 | save_ip = ip; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 141 | int op = *ip++; |
| 142 | switch (op) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 143 | case MP_BC_LOAD_CONST_FALSE: |
| 144 | PUSH(mp_const_false); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 145 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 146 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 147 | case MP_BC_LOAD_CONST_NONE: |
| 148 | PUSH(mp_const_none); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 149 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 150 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 151 | case MP_BC_LOAD_CONST_TRUE: |
| 152 | PUSH(mp_const_true); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 153 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 154 | |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 155 | case MP_BC_LOAD_CONST_ELLIPSIS: |
| 156 | PUSH(mp_const_ellipsis); |
| 157 | break; |
| 158 | |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 159 | case MP_BC_LOAD_CONST_SMALL_INT: { |
Damien George | 4d79d5d | 2014-02-20 00:00:04 +0000 | [diff] [blame] | 160 | machine_int_t num = 0; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 161 | if ((ip[0] & 0x40) != 0) { |
| 162 | // Number is negative |
| 163 | num--; |
| 164 | } |
| 165 | do { |
| 166 | num = (num << 7) | (*ip & 0x7f); |
| 167 | } while ((*ip++ & 0x80) != 0); |
| 168 | PUSH(MP_OBJ_NEW_SMALL_INT(num)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 169 | break; |
Paul Sokolovsky | 047cd40 | 2014-02-19 15:47:59 +0200 | [diff] [blame] | 170 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 171 | |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 172 | case MP_BC_LOAD_CONST_INT: |
| 173 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 174 | PUSH(mp_obj_new_int_from_long_str(qstr_str(qst))); |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 175 | break; |
| 176 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 177 | case MP_BC_LOAD_CONST_DEC: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 178 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 179 | PUSH(rt_load_const_dec(qst)); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 180 | break; |
| 181 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 182 | case MP_BC_LOAD_CONST_ID: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 183 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 184 | PUSH(rt_load_const_str(qst)); // TODO |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 185 | break; |
| 186 | |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 187 | case MP_BC_LOAD_CONST_BYTES: |
| 188 | DECODE_QSTR; |
Paul Sokolovsky | 91fb1c9 | 2014-01-24 22:50:40 +0200 | [diff] [blame] | 189 | PUSH(rt_load_const_bytes(qst)); |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 190 | break; |
| 191 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 192 | case MP_BC_LOAD_CONST_STRING: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 193 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 194 | PUSH(rt_load_const_str(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 195 | break; |
| 196 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 197 | case MP_BC_LOAD_FAST_0: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 198 | PUSH(fastn[0]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 199 | break; |
| 200 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 201 | case MP_BC_LOAD_FAST_1: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 202 | PUSH(fastn[-1]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 203 | break; |
| 204 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 205 | case MP_BC_LOAD_FAST_2: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 206 | PUSH(fastn[-2]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 207 | break; |
| 208 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 209 | case MP_BC_LOAD_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 210 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 211 | PUSH(fastn[-unum]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 212 | break; |
| 213 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 214 | case MP_BC_LOAD_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 215 | DECODE_UINT; |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 216 | PUSH(rt_get_cell(fastn[-unum])); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 217 | break; |
| 218 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 219 | case MP_BC_LOAD_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 220 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 221 | PUSH(rt_load_name(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 222 | break; |
| 223 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 224 | case MP_BC_LOAD_GLOBAL: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 225 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 226 | PUSH(rt_load_global(qst)); |
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_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 230 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 231 | SET_TOP(rt_load_attr(TOP(), qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 232 | break; |
| 233 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 234 | case MP_BC_LOAD_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 235 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 236 | rt_load_method(*sp, qst, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 237 | sp += 1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 238 | break; |
| 239 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 240 | case MP_BC_LOAD_BUILD_CLASS: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 241 | PUSH(rt_load_build_class()); |
| 242 | break; |
| 243 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 244 | case MP_BC_STORE_FAST_0: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 245 | fastn[0] = POP(); |
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_STORE_FAST_1: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 249 | fastn[-1] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 250 | break; |
| 251 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 252 | case MP_BC_STORE_FAST_2: |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 253 | fastn[-2] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 254 | break; |
| 255 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 256 | case MP_BC_STORE_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 257 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 258 | fastn[-unum] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 259 | break; |
| 260 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 261 | case MP_BC_STORE_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 262 | DECODE_UINT; |
Damien George | d0691cc | 2014-01-29 20:30:52 +0000 | [diff] [blame] | 263 | rt_set_cell(fastn[-unum], POP()); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 264 | break; |
| 265 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 266 | case MP_BC_STORE_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 267 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 268 | rt_store_name(qst, POP()); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 269 | break; |
| 270 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 271 | case MP_BC_STORE_GLOBAL: |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 272 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 273 | rt_store_global(qst, POP()); |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 274 | break; |
| 275 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 276 | case MP_BC_STORE_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 277 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 278 | rt_store_attr(sp[0], qst, sp[-1]); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 279 | sp -= 2; |
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_SUBSCR: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 283 | rt_store_subscr(sp[-1], sp[0], sp[-2]); |
| 284 | sp -= 3; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 285 | break; |
| 286 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 287 | case MP_BC_DUP_TOP: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 288 | obj1 = TOP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 289 | PUSH(obj1); |
| 290 | break; |
| 291 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 292 | case MP_BC_DUP_TOP_TWO: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 293 | sp += 2; |
| 294 | sp[0] = sp[-2]; |
| 295 | sp[-1] = sp[-3]; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 296 | break; |
| 297 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 298 | case MP_BC_POP_TOP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 299 | sp -= 1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 300 | break; |
| 301 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 302 | case MP_BC_ROT_TWO: |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 303 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 304 | sp[0] = sp[-1]; |
| 305 | sp[-1] = obj1; |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 306 | break; |
| 307 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 308 | case MP_BC_ROT_THREE: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 309 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 310 | sp[0] = sp[-1]; |
| 311 | sp[-1] = sp[-2]; |
| 312 | sp[-2] = obj1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 313 | break; |
| 314 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 315 | case MP_BC_JUMP: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 316 | DECODE_SLABEL; |
| 317 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 318 | break; |
| 319 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 320 | case MP_BC_POP_JUMP_IF_TRUE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 321 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 322 | if (rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 323 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 324 | } |
| 325 | break; |
| 326 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 327 | case MP_BC_POP_JUMP_IF_FALSE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 328 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 329 | if (!rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 330 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 331 | } |
| 332 | break; |
| 333 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 334 | case MP_BC_JUMP_IF_TRUE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 335 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 336 | if (rt_is_true(TOP())) { |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 337 | ip += unum; |
| 338 | } else { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 339 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 340 | } |
| 341 | break; |
| 342 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 343 | case MP_BC_JUMP_IF_FALSE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 344 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 345 | if (rt_is_true(TOP())) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 346 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 347 | } else { |
| 348 | ip += unum; |
| 349 | } |
| 350 | break; |
| 351 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 352 | /* we are trying to get away without using this opcode |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 353 | case MP_BC_SETUP_LOOP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 354 | DECODE_UINT; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 355 | // push_block(MP_BC_SETUP_LOOP, ip + unum, sp) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 356 | break; |
| 357 | */ |
| 358 | |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 359 | case MP_BC_UNWIND_JUMP: |
| 360 | DECODE_SLABEL; |
| 361 | PUSH((void*)(ip + unum)); // push destination ip for jump |
| 362 | PUSH((void*)(machine_uint_t)(*ip)); // push number of exception handlers to unwind |
| 363 | unwind_jump: |
| 364 | unum = (machine_uint_t)POP(); // get number of exception handlers to unwind |
| 365 | while (unum > 0) { |
| 366 | unum -= 1; |
| 367 | assert(exc_sp >= exc_stack); |
| 368 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY) { |
| 369 | // We're going to run "finally" code as a coroutine |
| 370 | // (not calling it recursively). Set up a sentinel |
| 371 | // on a stack so it can return back to us when it is |
| 372 | // done (when END_FINALLY reached). |
| 373 | PUSH((void*)unum); // push number of exception handlers left to unwind |
| 374 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_JUMP)); // push sentinel |
| 375 | ip = exc_sp->handler; // get exception handler byte code address |
| 376 | exc_sp--; // pop exception handler |
| 377 | goto dispatch_loop; // run the exception handler |
| 378 | } |
| 379 | exc_sp--; |
| 380 | } |
| 381 | ip = (const byte*)POP(); // pop destination ip for jump |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 382 | break; |
| 383 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 384 | // matched against: POP_BLOCK or POP_EXCEPT (anything else?) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 385 | case MP_BC_SETUP_EXCEPT: |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 386 | case MP_BC_SETUP_FINALLY: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 387 | DECODE_ULABEL; // except labels are always forward |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 388 | ++exc_sp; |
| 389 | exc_sp->opcode = op; |
| 390 | exc_sp->handler = ip + unum; |
| 391 | exc_sp->val_sp = (((machine_uint_t)sp) | currently_in_except_block); |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 392 | currently_in_except_block = 0; // in a try block now |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 393 | break; |
| 394 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 395 | case MP_BC_END_FINALLY: |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 396 | // not fully implemented |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 397 | // if TOS is an exception, reraises the exception (3 values on TOS) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 398 | // if TOS is None, just pops it and continues |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 399 | // if TOS is an integer, does something else |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 400 | // else error |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 401 | if (mp_obj_is_exception_instance(TOP())) { |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 402 | nlr_jump(TOP()); |
| 403 | } |
| 404 | if (TOP() == mp_const_none) { |
| 405 | sp--; |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 406 | } else if (MP_OBJ_IS_SMALL_INT(TOP())) { |
| 407 | // We finished "finally" coroutine and now dispatch back |
| 408 | // to our caller, based on TOS value |
| 409 | mp_unwind_reason_t reason = MP_OBJ_SMALL_INT_VALUE(POP()); |
| 410 | switch (reason) { |
| 411 | case UNWIND_RETURN: |
| 412 | goto unwind_return; |
Damien George | cbddb27 | 2014-02-01 20:08:18 +0000 | [diff] [blame] | 413 | case UNWIND_JUMP: |
| 414 | goto unwind_jump; |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 415 | } |
| 416 | assert(0); |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 417 | } else { |
| 418 | assert(0); |
| 419 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 420 | break; |
| 421 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 422 | case MP_BC_GET_ITER: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 423 | SET_TOP(rt_getiter(TOP())); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 424 | break; |
| 425 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 426 | case MP_BC_FOR_ITER: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 427 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 428 | obj1 = rt_iternext(TOP()); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 429 | if (obj1 == mp_const_stop_iteration) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 430 | --sp; // pop the exhausted iterator |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 431 | ip += unum; // jump to after for-block |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 432 | } else { |
| 433 | PUSH(obj1); // push the next iteration value |
| 434 | } |
| 435 | break; |
| 436 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 437 | // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 438 | case MP_BC_POP_BLOCK: |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 439 | // we are exiting an exception handler, so pop the last one of the exception-stack |
| 440 | assert(exc_sp >= &exc_stack[0]); |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 441 | currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state |
| 442 | exc_sp--; // pop back to previous exception handler |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 443 | break; |
| 444 | |
Damien George | 600ae73 | 2014-01-21 23:48:04 +0000 | [diff] [blame] | 445 | // matched against: SETUP_EXCEPT |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 446 | case MP_BC_POP_EXCEPT: |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 447 | // TODO need to work out how blocks work etc |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 448 | // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 449 | assert(exc_sp >= &exc_stack[0]); |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 450 | assert(currently_in_except_block); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 451 | //sp = (mp_obj_t*)(*exc_sp--); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 452 | //exc_sp--; // discard ip |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 453 | currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state |
| 454 | exc_sp--; // pop back to previous exception handler |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 455 | //sp -= 3; // pop 3 exception values |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 456 | break; |
| 457 | |
Damien George | 9aa2a52 | 2014-02-01 23:04:09 +0000 | [diff] [blame] | 458 | case MP_BC_NOT: |
| 459 | if (TOP() == mp_const_true) { |
| 460 | SET_TOP(mp_const_false); |
| 461 | } else { |
| 462 | SET_TOP(mp_const_true); |
| 463 | } |
| 464 | break; |
| 465 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 466 | case MP_BC_UNARY_OP: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 467 | unum = *ip++; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 468 | SET_TOP(rt_unary_op(unum, TOP())); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 469 | break; |
| 470 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 471 | case MP_BC_BINARY_OP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 472 | unum = *ip++; |
| 473 | obj2 = POP(); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 474 | obj1 = TOP(); |
| 475 | SET_TOP(rt_binary_op(unum, obj1, obj2)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 476 | break; |
| 477 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 478 | case MP_BC_BUILD_TUPLE: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 479 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 480 | sp -= unum - 1; |
| 481 | SET_TOP(rt_build_tuple(unum, sp)); |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 482 | break; |
| 483 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 484 | case MP_BC_BUILD_LIST: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 485 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 486 | sp -= unum - 1; |
| 487 | SET_TOP(rt_build_list(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 488 | break; |
| 489 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 490 | case MP_BC_LIST_APPEND: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 491 | DECODE_UINT; |
| 492 | // 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] | 493 | rt_list_append(sp[-unum], sp[0]); |
| 494 | sp--; |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 495 | break; |
| 496 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 497 | case MP_BC_BUILD_MAP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 498 | DECODE_UINT; |
| 499 | PUSH(rt_build_map(unum)); |
| 500 | break; |
| 501 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 502 | case MP_BC_STORE_MAP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 503 | sp -= 2; |
| 504 | rt_store_map(sp[0], sp[2], sp[1]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 505 | break; |
| 506 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 507 | case MP_BC_MAP_ADD: |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 508 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 509 | // I think it's guaranteed by the compiler that sp[-unum - 1] is a map |
| 510 | rt_store_map(sp[-unum - 1], sp[0], sp[-1]); |
| 511 | sp -= 2; |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 512 | break; |
| 513 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 514 | case MP_BC_BUILD_SET: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 515 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 516 | sp -= unum - 1; |
| 517 | SET_TOP(rt_build_set(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 518 | break; |
| 519 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 520 | case MP_BC_SET_ADD: |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 521 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 522 | // I think it's guaranteed by the compiler that sp[-unum] is a set |
| 523 | rt_store_set(sp[-unum], sp[0]); |
| 524 | sp--; |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 525 | break; |
| 526 | |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 527 | #if MICROPY_ENABLE_SLICE |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 528 | case MP_BC_BUILD_SLICE: |
| 529 | DECODE_UINT; |
| 530 | if (unum == 2) { |
| 531 | obj2 = POP(); |
| 532 | obj1 = TOP(); |
| 533 | SET_TOP(mp_obj_new_slice(obj1, obj2, NULL)); |
| 534 | } else { |
| 535 | printf("3-argument slice is not supported\n"); |
| 536 | assert(0); |
| 537 | } |
| 538 | break; |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 539 | #endif |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 540 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 541 | case MP_BC_UNPACK_SEQUENCE: |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 542 | DECODE_UINT; |
Damien George | 932bf1c | 2014-01-18 23:42:49 +0000 | [diff] [blame] | 543 | rt_unpack_sequence(sp[0], unum, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 544 | sp += unum - 1; |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 545 | break; |
| 546 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 547 | case MP_BC_MAKE_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 548 | DECODE_UINT; |
Paul Sokolovsky | 9075002 | 2014-02-01 15:05:04 +0200 | [diff] [blame] | 549 | PUSH(rt_make_function_from_id(unum, MP_OBJ_NULL)); |
| 550 | break; |
| 551 | |
| 552 | case MP_BC_MAKE_FUNCTION_DEFARGS: |
| 553 | DECODE_UINT; |
| 554 | SET_TOP(rt_make_function_from_id(unum, TOP())); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 555 | break; |
| 556 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 557 | case MP_BC_MAKE_CLOSURE: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 558 | DECODE_UINT; |
Damien George | 08d0755 | 2014-01-29 18:58:52 +0000 | [diff] [blame] | 559 | SET_TOP(rt_make_closure_from_id(unum, TOP())); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 560 | break; |
| 561 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 562 | case MP_BC_CALL_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 563 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 564 | // unum & 0xff == n_positional |
| 565 | // (unum >> 8) & 0xff == n_keyword |
| 566 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe); |
| 567 | 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] | 568 | break; |
| 569 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 570 | case MP_BC_CALL_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 571 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 572 | // unum & 0xff == n_positional |
| 573 | // (unum >> 8) & 0xff == n_keyword |
| 574 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1; |
| 575 | SET_TOP(rt_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 576 | break; |
| 577 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 578 | case MP_BC_RETURN_VALUE: |
Paul Sokolovsky | 6472dea | 2014-02-01 00:55:05 +0200 | [diff] [blame] | 579 | unwind_return: |
| 580 | while (exc_sp >= exc_stack) { |
| 581 | if (exc_sp->opcode == MP_BC_SETUP_FINALLY) { |
| 582 | // We're going to run "finally" code as a coroutine |
| 583 | // (not calling it recursively). Set up a sentinel |
| 584 | // on a stack so it can return back to us when it is |
| 585 | // done (when END_FINALLY reached). |
| 586 | PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_RETURN)); |
| 587 | ip = exc_sp->handler; |
| 588 | // We don't need to do anything with sp, finally is just |
| 589 | // syntactic sugar for sequential execution?? |
| 590 | // sp = |
| 591 | exc_sp--; |
| 592 | goto dispatch_loop; |
| 593 | } |
| 594 | exc_sp--; |
| 595 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 596 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 597 | *sp_in_out = sp; |
Damien George | 6632700 | 2014-01-02 18:20:41 +0000 | [diff] [blame] | 598 | assert(exc_sp == &exc_stack[0] - 1); |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 599 | return MP_VM_RETURN_NORMAL; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 600 | |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 601 | case MP_BC_RAISE_VARARGS: |
| 602 | unum = *ip++; |
| 603 | assert(unum == 1); |
| 604 | obj1 = POP(); |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 605 | nlr_jump(rt_make_raise_obj(obj1)); |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 606 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 607 | case MP_BC_YIELD_VALUE: |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 608 | nlr_pop(); |
| 609 | *ip_in_out = ip; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 610 | *sp_in_out = sp; |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 611 | return MP_VM_RETURN_YIELD; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 612 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 613 | case MP_BC_IMPORT_NAME: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 614 | DECODE_QSTR; |
| 615 | obj1 = POP(); |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 616 | SET_TOP(rt_import_name(qst, obj1, TOP())); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 617 | break; |
| 618 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 619 | case MP_BC_IMPORT_FROM: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 620 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 621 | obj1 = rt_import_from(TOP(), qst); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 622 | PUSH(obj1); |
| 623 | break; |
| 624 | |
Paul Sokolovsky | da1ce93 | 2014-02-14 00:22:06 +0200 | [diff] [blame] | 625 | case MP_BC_IMPORT_STAR: |
Damien George | aa9b74f | 2014-02-14 23:06:33 +0000 | [diff] [blame] | 626 | rt_import_all(POP()); |
Paul Sokolovsky | da1ce93 | 2014-02-14 00:22:06 +0200 | [diff] [blame] | 627 | break; |
| 628 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 629 | default: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 630 | printf("code %p, byte code 0x%02x not implemented\n", ip, op); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 631 | assert(0); |
| 632 | nlr_pop(); |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 633 | return MP_VM_RETURN_NORMAL; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 634 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 635 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 636 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 637 | } else { |
| 638 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 639 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 640 | // set file and line number that the exception occurred at |
Paul Sokolovsky | 382e8ee | 2014-01-30 13:49:18 +0200 | [diff] [blame] | 641 | // TODO: don't set traceback for exceptions re-raised by END_FINALLY. |
| 642 | // But consider how to handle nested exceptions. |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 643 | if (mp_obj_is_exception_instance(nlr.ret_val)) { |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 644 | 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] | 645 | qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24); |
| 646 | 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] | 647 | machine_uint_t source_line = 1; |
| 648 | machine_uint_t bc = save_ip - code_info - code_info_size; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame] | 649 | //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] | 650 | for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) { |
| 651 | bc -= *ci & 31; |
| 652 | source_line += *ci >> 5; |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 653 | } |
Damien George | 136b149 | 2014-01-19 12:38:49 +0000 | [diff] [blame] | 654 | 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] | 655 | } |
| 656 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 657 | while (currently_in_except_block) { |
| 658 | // nested exception |
| 659 | |
| 660 | assert(exc_sp >= &exc_stack[0]); |
| 661 | |
| 662 | // TODO make a proper message for nested exception |
| 663 | // at the moment we are just raising the very last exception (the one that caused the nested exception) |
| 664 | |
| 665 | // move up to previous exception handler |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 666 | currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state |
| 667 | exc_sp--; // pop back to previous exception handler |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 668 | } |
| 669 | |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 670 | if (exc_sp >= &exc_stack[0]) { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 671 | // set flag to indicate that we are now handling an exception |
| 672 | currently_in_except_block = 1; |
| 673 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 674 | // catch exception and pass to byte code |
Paul Sokolovsky | c7a0b14 | 2014-01-31 19:40:09 +0200 | [diff] [blame] | 675 | sp = (mp_obj_t*)(exc_sp->val_sp & (~((machine_uint_t)1))); |
| 676 | ip = exc_sp->handler; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 677 | // push(traceback, exc-val, exc-type) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 678 | PUSH(mp_const_none); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 679 | PUSH(nlr.ret_val); |
Damien | b86e3f9 | 2013-12-29 17:17:43 +0000 | [diff] [blame] | 680 | PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think... |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 681 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 682 | } else { |
Damien George | c8f78bc | 2014-02-15 22:55:00 +0000 | [diff] [blame] | 683 | // propagate exception to higher level |
| 684 | // TODO what to do about ip and sp? they don't really make sense at this point |
| 685 | fastn[0] = nlr.ret_val; // must put exception here because sp is invalid |
| 686 | return MP_VM_RETURN_EXCEPTION; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 687 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 688 | } |
| 689 | } |
| 690 | } |