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" |
| 10 | #include "obj.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 11 | #include "runtime.h" |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 12 | #include "bc0.h" |
Damien | eb19efb | 2013-10-10 22:06:54 +0100 | [diff] [blame] | 13 | #include "bc.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 14 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 15 | // (value) stack grows down (to be compatible with native code when passing pointers to the stack), top element is pointed to |
| 16 | // exception stack grows up, top element is pointed to |
| 17 | |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 18 | #define DECODE_UINT do { unum = *ip++; if (unum > 127) { unum = ((unum & 0x3f) << 8) | (*ip++); } } while (0) |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 19 | #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0) |
| 20 | #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0) |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 21 | #define DECODE_QSTR do { qst = *ip++; if (qst > 127) { qst = ((qst & 0x3f) << 8) | (*ip++); } } while (0) |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 22 | #define PUSH(val) *++sp = (val) |
| 23 | #define POP() (*sp--) |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 24 | #define TOP() (*sp) |
| 25 | #define SET_TOP(val) *sp = (val) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 26 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 27 | mp_obj_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, uint n_state) { |
Damien George | e02b2d4 | 2014-01-19 01:14:37 +0000 | [diff] [blame] | 28 | n_state += 1; // XXX there is a bug somewhere which doesn't count enough state... (conwaylife and mandel have the bug) |
| 29 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 30 | // allocate state for locals and stack |
| 31 | mp_obj_t temp_state[10]; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 32 | mp_obj_t *state = &temp_state[0]; |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 33 | if (n_state > 10) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 34 | state = m_new(mp_obj_t, n_state); |
Damien | 40fdfe3 | 2013-11-05 22:16:22 +0000 | [diff] [blame] | 35 | } |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 36 | mp_obj_t *sp = &state[0] - 1; |
| 37 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 38 | // init args |
| 39 | for (int i = 0; i < n_args; i++) { |
| 40 | assert(i < 8); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 41 | state[n_state - 1 - i] = args[i]; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 42 | } |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 43 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 44 | const byte *ip = code; |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 45 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 46 | // get code info size |
| 47 | machine_uint_t code_info_size = ip[0] | (ip[1] << 8) | (ip[2] << 16) | (ip[3] << 24); |
| 48 | ip += code_info_size; |
| 49 | |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 50 | // execute prelude to make any cells (closed over variables) |
| 51 | { |
| 52 | for (uint n_local = *ip++; n_local > 0; n_local--) { |
| 53 | uint local_num = *ip++; |
| 54 | if (local_num < n_args) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 55 | 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] | 56 | } else { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 57 | 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] | 58 | } |
| 59 | } |
| 60 | } |
| 61 | |
| 62 | // execute the byte code |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 63 | if (mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp)) { |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 64 | // it shouldn't yield |
| 65 | assert(0); |
| 66 | } |
Damien George | 6baf76e | 2013-12-30 22:32:17 +0000 | [diff] [blame] | 67 | |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 68 | // TODO check fails if, eg, return from within for loop |
| 69 | //assert(sp == &state[17]); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 70 | return *sp; |
| 71 | } |
| 72 | |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 73 | // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc) |
| 74 | // sp points to bottom of stack which grows up |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 75 | bool 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] | 76 | // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think) |
| 77 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 78 | const byte *ip = *ip_in_out; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 79 | mp_obj_t *sp = *sp_in_out; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 80 | machine_uint_t unum; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 81 | qstr qst; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 82 | mp_obj_t obj1, obj2; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 83 | mp_obj_t fast0 = fastn[0], fast1 = fastn[-1], fast2 = fastn[-2]; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 84 | nlr_buf_t nlr; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 85 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 86 | volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions |
| 87 | machine_uint_t exc_stack[8]; // on the exception stack we store (ip, sp | X) for each block, X = previous value of currently_in_except_block |
Damien George | 6632700 | 2014-01-02 18:20:41 +0000 | [diff] [blame] | 88 | machine_uint_t *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] | 89 | 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] | 90 | |
Damien George | e02b2d4 | 2014-01-19 01:14:37 +0000 | [diff] [blame] | 91 | // TODO if an exception occurs, do fast[0,1,2] become invalid?? |
| 92 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 93 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 94 | for (;;) { |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 95 | if (nlr_push(&nlr) == 0) { |
| 96 | // loop to execute byte code |
| 97 | for (;;) { |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 98 | save_ip = ip; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 99 | int op = *ip++; |
| 100 | switch (op) { |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 101 | case MP_BC_LOAD_CONST_FALSE: |
| 102 | PUSH(mp_const_false); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 103 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 104 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 105 | case MP_BC_LOAD_CONST_NONE: |
| 106 | PUSH(mp_const_none); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 107 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 108 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 109 | case MP_BC_LOAD_CONST_TRUE: |
| 110 | PUSH(mp_const_true); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 111 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 112 | |
Damien George | e9906ac | 2014-01-04 18:44:46 +0000 | [diff] [blame] | 113 | case MP_BC_LOAD_CONST_ELLIPSIS: |
| 114 | PUSH(mp_const_ellipsis); |
| 115 | break; |
| 116 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 117 | case MP_BC_LOAD_CONST_SMALL_INT: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 118 | unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000; |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 119 | ip += 3; |
Paul Sokolovsky | e5ee169 | 2014-01-06 17:49:46 +0200 | [diff] [blame] | 120 | PUSH(MP_OBJ_NEW_SMALL_INT(unum)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 121 | break; |
| 122 | |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 123 | case MP_BC_LOAD_CONST_INT: |
| 124 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 125 | PUSH(mp_obj_new_int_from_long_str(qstr_str(qst))); |
Paul Sokolovsky | a9f5abd | 2014-01-17 19:51:46 +0200 | [diff] [blame] | 126 | break; |
| 127 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 128 | case MP_BC_LOAD_CONST_DEC: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 129 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 130 | PUSH(rt_load_const_dec(qst)); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 131 | break; |
| 132 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 133 | case MP_BC_LOAD_CONST_ID: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 134 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 135 | PUSH(rt_load_const_str(qst)); // TODO |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 136 | break; |
| 137 | |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 138 | case MP_BC_LOAD_CONST_BYTES: |
| 139 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 140 | PUSH(rt_load_const_str(qst)); // TODO |
Paul Sokolovsky | bdf822b | 2014-01-02 18:46:27 +0200 | [diff] [blame] | 141 | break; |
| 142 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 143 | case MP_BC_LOAD_CONST_STRING: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 144 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 145 | PUSH(rt_load_const_str(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 146 | break; |
| 147 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 148 | case MP_BC_LOAD_FAST_0: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 149 | PUSH(fast0); |
| 150 | break; |
| 151 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 152 | case MP_BC_LOAD_FAST_1: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 153 | PUSH(fast1); |
| 154 | break; |
| 155 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 156 | case MP_BC_LOAD_FAST_2: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 157 | PUSH(fast2); |
| 158 | break; |
| 159 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 160 | case MP_BC_LOAD_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 161 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 162 | PUSH(fastn[-unum]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 163 | break; |
| 164 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 165 | case MP_BC_LOAD_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 166 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 167 | if (unum == 0) { |
| 168 | obj1 = fast0; |
| 169 | } else if (unum == 1) { |
| 170 | obj1 = fast1; |
| 171 | } else if (unum == 2) { |
| 172 | obj1 = fast2; |
| 173 | } else { |
| 174 | obj1 = fastn[-unum]; |
| 175 | } |
| 176 | PUSH(rt_get_cell(obj1)); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 177 | break; |
| 178 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 179 | case MP_BC_LOAD_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 180 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 181 | PUSH(rt_load_name(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 182 | break; |
| 183 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 184 | case MP_BC_LOAD_GLOBAL: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 185 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 186 | PUSH(rt_load_global(qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 187 | break; |
| 188 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 189 | case MP_BC_LOAD_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 190 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 191 | SET_TOP(rt_load_attr(TOP(), qst)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 192 | break; |
| 193 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 194 | case MP_BC_LOAD_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 195 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 196 | rt_load_method(*sp, qst, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 197 | sp += 1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 198 | break; |
| 199 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 200 | case MP_BC_LOAD_BUILD_CLASS: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 201 | PUSH(rt_load_build_class()); |
| 202 | break; |
| 203 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 204 | case MP_BC_STORE_FAST_0: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 205 | fast0 = POP(); |
| 206 | break; |
| 207 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 208 | case MP_BC_STORE_FAST_1: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 209 | fast1 = POP(); |
| 210 | break; |
| 211 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 212 | case MP_BC_STORE_FAST_2: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 213 | fast2 = POP(); |
| 214 | break; |
| 215 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 216 | case MP_BC_STORE_FAST_N: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 217 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 218 | fastn[-unum] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 219 | break; |
| 220 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 221 | case MP_BC_STORE_DEREF: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 222 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 223 | if (unum == 0) { |
| 224 | obj1 = fast0; |
| 225 | } else if (unum == 1) { |
| 226 | obj1 = fast1; |
| 227 | } else if (unum == 2) { |
| 228 | obj1 = fast2; |
| 229 | } else { |
| 230 | obj1 = fastn[-unum]; |
| 231 | } |
| 232 | rt_set_cell(obj1, POP()); |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 233 | break; |
| 234 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 235 | case MP_BC_STORE_NAME: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 236 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 237 | rt_store_name(qst, POP()); |
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_STORE_GLOBAL: |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 241 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 242 | rt_store_global(qst, POP()); |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 243 | break; |
| 244 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 245 | case MP_BC_STORE_ATTR: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 246 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 247 | rt_store_attr(sp[0], qst, sp[-1]); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 248 | sp -= 2; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 249 | break; |
| 250 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 251 | case MP_BC_STORE_SUBSCR: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 252 | rt_store_subscr(sp[-1], sp[0], sp[-2]); |
| 253 | sp -= 3; |
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_DUP_TOP: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 257 | obj1 = TOP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 258 | PUSH(obj1); |
| 259 | break; |
| 260 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 261 | case MP_BC_DUP_TOP_TWO: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 262 | sp += 2; |
| 263 | sp[0] = sp[-2]; |
| 264 | sp[-1] = sp[-3]; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 265 | break; |
| 266 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 267 | case MP_BC_POP_TOP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 268 | sp -= 1; |
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_ROT_TWO: |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 272 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 273 | sp[0] = sp[-1]; |
| 274 | sp[-1] = obj1; |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 275 | break; |
| 276 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 277 | case MP_BC_ROT_THREE: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 278 | obj1 = sp[0]; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 279 | sp[0] = sp[-1]; |
| 280 | sp[-1] = sp[-2]; |
| 281 | sp[-2] = obj1; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 282 | break; |
| 283 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 284 | case MP_BC_JUMP: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 285 | DECODE_SLABEL; |
| 286 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 287 | break; |
| 288 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 289 | case MP_BC_POP_JUMP_IF_TRUE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 290 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 291 | if (rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 292 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 293 | } |
| 294 | break; |
| 295 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 296 | case MP_BC_POP_JUMP_IF_FALSE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 297 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 298 | if (!rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 299 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 300 | } |
| 301 | break; |
| 302 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 303 | case MP_BC_JUMP_IF_TRUE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 304 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 305 | if (rt_is_true(TOP())) { |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 306 | ip += unum; |
| 307 | } else { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 308 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 309 | } |
| 310 | break; |
| 311 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 312 | case MP_BC_JUMP_IF_FALSE_OR_POP: |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 313 | DECODE_SLABEL; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 314 | if (rt_is_true(TOP())) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 315 | sp--; |
Damien | 94658e2 | 2013-11-09 20:12:32 +0000 | [diff] [blame] | 316 | } else { |
| 317 | ip += unum; |
| 318 | } |
| 319 | break; |
| 320 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 321 | /* we are trying to get away without using this opcode |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 322 | case MP_BC_SETUP_LOOP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 323 | DECODE_UINT; |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 324 | // push_block(MP_BC_SETUP_LOOP, ip + unum, sp) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 325 | break; |
| 326 | */ |
| 327 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 328 | // matched against: POP_BLOCK or POP_EXCEPT (anything else?) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 329 | case MP_BC_SETUP_EXCEPT: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 330 | DECODE_ULABEL; // except labels are always forward |
| 331 | *++exc_sp = (machine_uint_t)ip + unum; |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 332 | *++exc_sp = (((machine_uint_t)sp) | currently_in_except_block); |
| 333 | currently_in_except_block = 0; // in a try block now |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 334 | break; |
| 335 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 336 | case MP_BC_END_FINALLY: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 337 | // not implemented |
| 338 | // if TOS is an exception, reraises the exception (3 values on TOS) |
| 339 | // if TOS is an integer, does something else |
| 340 | // if TOS is None, just pops it and continues |
| 341 | // else error |
| 342 | assert(0); |
| 343 | break; |
| 344 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 345 | case MP_BC_GET_ITER: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 346 | SET_TOP(rt_getiter(TOP())); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 347 | break; |
| 348 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 349 | case MP_BC_FOR_ITER: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 350 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 351 | obj1 = rt_iternext(TOP()); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 352 | if (obj1 == mp_const_stop_iteration) { |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 353 | --sp; // pop the exhausted iterator |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 354 | ip += unum; // jump to after for-block |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 355 | } else { |
| 356 | PUSH(obj1); // push the next iteration value |
| 357 | } |
| 358 | break; |
| 359 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 360 | // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 361 | case MP_BC_POP_BLOCK: |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 362 | // we are exiting an exception handler, so pop the last one of the exception-stack |
| 363 | assert(exc_sp >= &exc_stack[0]); |
| 364 | currently_in_except_block = (exc_sp[0] & 1); // restore previous state |
| 365 | exc_sp -= 2; // pop back to previous exception handler |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 366 | break; |
| 367 | |
Damien | 02a7c41 | 2013-12-29 18:48:37 +0000 | [diff] [blame] | 368 | // matched againts: SETUP_EXCEPT |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 369 | case MP_BC_POP_EXCEPT: |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 370 | // TODO need to work out how blocks work etc |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 371 | // 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] | 372 | assert(exc_sp >= &exc_stack[0]); |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 373 | //sp = (mp_obj_t*)(*exc_sp--); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 374 | //exc_sp--; // discard ip |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 375 | currently_in_except_block = (exc_sp[0] & 1); // restore previous state |
| 376 | exc_sp -= 2; // pop back to previous exception handler |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 377 | //sp -= 3; // pop 3 exception values |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 378 | break; |
| 379 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 380 | case MP_BC_UNARY_OP: |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 381 | unum = *ip++; |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 382 | SET_TOP(rt_unary_op(unum, TOP())); |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 383 | break; |
| 384 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 385 | case MP_BC_BINARY_OP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 386 | unum = *ip++; |
| 387 | obj2 = POP(); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 388 | obj1 = TOP(); |
| 389 | SET_TOP(rt_binary_op(unum, obj1, obj2)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 390 | break; |
| 391 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 392 | case MP_BC_BUILD_TUPLE: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 393 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 394 | sp -= unum - 1; |
| 395 | SET_TOP(rt_build_tuple(unum, sp)); |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 396 | break; |
| 397 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 398 | case MP_BC_BUILD_LIST: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 399 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 400 | sp -= unum - 1; |
| 401 | SET_TOP(rt_build_list(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 402 | break; |
| 403 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 404 | case MP_BC_LIST_APPEND: |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 405 | DECODE_UINT; |
| 406 | // 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] | 407 | rt_list_append(sp[-unum], sp[0]); |
| 408 | sp--; |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 409 | break; |
| 410 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 411 | case MP_BC_BUILD_MAP: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 412 | DECODE_UINT; |
| 413 | PUSH(rt_build_map(unum)); |
| 414 | break; |
| 415 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 416 | case MP_BC_STORE_MAP: |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 417 | sp -= 2; |
| 418 | rt_store_map(sp[0], sp[2], sp[1]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 419 | break; |
| 420 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 421 | case MP_BC_MAP_ADD: |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 422 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 423 | // I think it's guaranteed by the compiler that sp[-unum - 1] is a map |
| 424 | rt_store_map(sp[-unum - 1], sp[0], sp[-1]); |
| 425 | sp -= 2; |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 426 | break; |
| 427 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 428 | case MP_BC_BUILD_SET: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 429 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 430 | sp -= unum - 1; |
| 431 | SET_TOP(rt_build_set(unum, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 432 | break; |
| 433 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 434 | case MP_BC_SET_ADD: |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 435 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 436 | // I think it's guaranteed by the compiler that sp[-unum] is a set |
| 437 | rt_store_set(sp[-unum], sp[0]); |
| 438 | sp--; |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 439 | break; |
| 440 | |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 441 | #if MICROPY_ENABLE_SLICE |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 442 | case MP_BC_BUILD_SLICE: |
| 443 | DECODE_UINT; |
| 444 | if (unum == 2) { |
| 445 | obj2 = POP(); |
| 446 | obj1 = TOP(); |
| 447 | SET_TOP(mp_obj_new_slice(obj1, obj2, NULL)); |
| 448 | } else { |
| 449 | printf("3-argument slice is not supported\n"); |
| 450 | assert(0); |
| 451 | } |
| 452 | break; |
Paul Sokolovsky | e606cb6 | 2014-01-04 01:34:23 +0200 | [diff] [blame] | 453 | #endif |
Paul Sokolovsky | ded0a1e | 2014-01-03 02:48:56 +0200 | [diff] [blame] | 454 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 455 | case MP_BC_UNPACK_SEQUENCE: |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 456 | DECODE_UINT; |
Damien George | 932bf1c | 2014-01-18 23:42:49 +0000 | [diff] [blame] | 457 | rt_unpack_sequence(sp[0], unum, sp); |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 458 | sp += unum - 1; |
Damien | 6f3e7fc | 2013-11-26 15:15:50 +0000 | [diff] [blame] | 459 | break; |
| 460 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 461 | case MP_BC_MAKE_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 462 | DECODE_UINT; |
| 463 | PUSH(rt_make_function_from_id(unum)); |
| 464 | break; |
| 465 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 466 | case MP_BC_MAKE_CLOSURE: |
Damien | 9ecbcff | 2013-12-11 00:41:43 +0000 | [diff] [blame] | 467 | DECODE_UINT; |
| 468 | obj1 = POP(); |
| 469 | PUSH(rt_make_closure_from_id(unum, obj1)); |
| 470 | break; |
| 471 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 472 | case MP_BC_CALL_FUNCTION: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 473 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 474 | // unum & 0xff == n_positional |
| 475 | // (unum >> 8) & 0xff == n_keyword |
| 476 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe); |
| 477 | 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] | 478 | break; |
| 479 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 480 | case MP_BC_CALL_METHOD: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 481 | DECODE_UINT; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 482 | // unum & 0xff == n_positional |
| 483 | // (unum >> 8) & 0xff == n_keyword |
| 484 | sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1; |
| 485 | SET_TOP(rt_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 486 | break; |
| 487 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 488 | case MP_BC_RETURN_VALUE: |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 489 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 490 | *sp_in_out = sp; |
Damien George | 6632700 | 2014-01-02 18:20:41 +0000 | [diff] [blame] | 491 | assert(exc_sp == &exc_stack[0] - 1); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 492 | return false; |
| 493 | |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 494 | case MP_BC_RAISE_VARARGS: |
| 495 | unum = *ip++; |
| 496 | assert(unum == 1); |
| 497 | obj1 = POP(); |
| 498 | nlr_jump(obj1); |
Paul Sokolovsky | 5388a3c | 2014-01-10 16:09:55 +0200 | [diff] [blame] | 499 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 500 | case MP_BC_YIELD_VALUE: |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 501 | nlr_pop(); |
| 502 | *ip_in_out = ip; |
| 503 | fastn[0] = fast0; |
Damien George | 20006db | 2014-01-18 14:10:48 +0000 | [diff] [blame] | 504 | fastn[-1] = fast1; |
| 505 | fastn[-2] = fast2; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 506 | *sp_in_out = sp; |
| 507 | return true; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 508 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 509 | case MP_BC_IMPORT_NAME: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 510 | DECODE_QSTR; |
| 511 | obj1 = POP(); |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 512 | SET_TOP(rt_import_name(qst, obj1, TOP())); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 513 | break; |
| 514 | |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 515 | case MP_BC_IMPORT_FROM: |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 516 | DECODE_QSTR; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 517 | obj1 = rt_import_from(TOP(), qst); |
Damien | db4c361 | 2013-12-10 17:27:24 +0000 | [diff] [blame] | 518 | PUSH(obj1); |
| 519 | break; |
| 520 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 521 | default: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame] | 522 | printf("code %p, byte code 0x%02x not implemented\n", ip, op); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 523 | assert(0); |
| 524 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 525 | return false; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 526 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 527 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 528 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 529 | } else { |
| 530 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 531 | |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 532 | // set file and line number that the exception occurred at |
| 533 | if (MP_OBJ_IS_TYPE(nlr.ret_val, &exception_type)) { |
| 534 | 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^] | 535 | qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24); |
| 536 | 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] | 537 | machine_uint_t source_line = 1; |
| 538 | machine_uint_t bc = save_ip - code_info - code_info_size; |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 539 | //printf("find %lu %d %d\n", bc, code_info[12], code_info[13]); |
| 540 | for (const byte* ci = code_info + 12; bc >= ci[0]; ci += 2) { |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 541 | bc -= ci[0]; |
| 542 | source_line += ci[1]; |
| 543 | if (ci[0] == 0 && ci[1] == 0) { |
| 544 | break; |
| 545 | } |
| 546 | } |
Damien George | cbd2f74 | 2014-01-19 11:48:48 +0000 | [diff] [blame^] | 547 | mp_obj_exception_set_source_info(nlr.ret_val, source_file, source_line, block_name); |
Damien George | 0833500 | 2014-01-18 23:24:36 +0000 | [diff] [blame] | 548 | } |
| 549 | |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 550 | while (currently_in_except_block) { |
| 551 | // nested exception |
| 552 | |
| 553 | assert(exc_sp >= &exc_stack[0]); |
| 554 | |
| 555 | // TODO make a proper message for nested exception |
| 556 | // at the moment we are just raising the very last exception (the one that caused the nested exception) |
| 557 | |
| 558 | // move up to previous exception handler |
| 559 | currently_in_except_block = (exc_sp[0] & 1); // restore previous state |
| 560 | exc_sp -= 2; // pop back to previous exception handler |
| 561 | } |
| 562 | |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 563 | if (exc_sp >= &exc_stack[0]) { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 564 | // set flag to indicate that we are now handling an exception |
| 565 | currently_in_except_block = 1; |
| 566 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 567 | // catch exception and pass to byte code |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 568 | sp = (mp_obj_t*)(exc_sp[0] & (~((machine_uint_t)1))); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 569 | ip = (const byte*)(exc_sp[-1]); |
| 570 | // push(traceback, exc-val, exc-type) |
Damien | d99b052 | 2013-12-21 18:17:45 +0000 | [diff] [blame] | 571 | PUSH(mp_const_none); |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 572 | PUSH(nlr.ret_val); |
Damien | b86e3f9 | 2013-12-29 17:17:43 +0000 | [diff] [blame] | 573 | PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think... |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 574 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 575 | } else { |
Damien | 8f9e2ee | 2013-12-29 16:54:59 +0000 | [diff] [blame] | 576 | // re-raise exception to higher level |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 577 | // TODO what to do if this is a generator?? |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 578 | nlr_jump(nlr.ret_val); |
| 579 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 580 | } |
| 581 | } |
| 582 | } |