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