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 | c025ebb | 2013-10-12 14:30:21 +0100 | [diff] [blame] | 9 | #include "mpyconfig.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 10 | #include "runtime.h" |
Damien | eb19efb | 2013-10-10 22:06:54 +0100 | [diff] [blame] | 11 | #include "bc.h" |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 12 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 13 | // (value) stack grows down (to be compatible with native code when passing pointers to the stack), top element is pointed to |
| 14 | // exception stack grows up, top element is pointed to |
| 15 | |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 16 | #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^] | 17 | #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0) |
| 18 | #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0) |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 19 | #define DECODE_QSTR do { qstr = *ip++; if (qstr > 127) { qstr = ((qstr & 0x3f) << 8) | (*ip++); } } while (0) |
| 20 | #define PUSH(val) *--sp = (val) |
| 21 | #define POP() (*sp++) |
| 22 | |
Damien | a397776 | 2013-10-09 23:10:10 +0100 | [diff] [blame] | 23 | // args are in reverse order in array |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 24 | py_obj_t py_execute_byte_code(const byte *code, const py_obj_t *args, uint n_args) { |
| 25 | py_obj_t state[18]; // TODO allocate properly |
| 26 | // init args |
| 27 | for (int i = 0; i < n_args; i++) { |
| 28 | assert(i < 8); |
| 29 | state[i] = args[n_args - 1 - i]; |
| 30 | } |
| 31 | py_obj_t *sp = &state[18]; |
| 32 | const byte *ip = code; |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 33 | if (py_execute_byte_code_2(&ip, &state[0], &sp)) { |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 34 | // it shouldn't yield |
| 35 | assert(0); |
| 36 | } |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 37 | // TODO check fails if, eg, return from within for loop |
| 38 | //assert(sp == &state[17]); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 39 | return *sp; |
| 40 | } |
| 41 | |
| 42 | // fastn has items in normal order |
| 43 | // sp points to top of stack which grows down |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 44 | bool py_execute_byte_code_2(const byte **ip_in_out, py_obj_t *fastn, py_obj_t **sp_in_out) { |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 45 | // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think) |
| 46 | |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 47 | const byte *ip = *ip_in_out; |
| 48 | py_obj_t *sp = *sp_in_out; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 49 | machine_uint_t unum; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 50 | qstr qstr; |
| 51 | py_obj_t obj1, obj2; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 52 | py_obj_t fast0 = fastn[0], fast1 = fastn[1], fast2 = fastn[2]; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 53 | nlr_buf_t nlr; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 54 | |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 55 | // on the exception stack we store (ip, sp) for each block |
| 56 | machine_uint_t exc_stack[8]; |
| 57 | machine_uint_t *volatile exc_sp = &exc_stack[-1]; // stack grows up, exc_sp points to top of stack |
| 58 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 59 | // outer exception handling loop |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 60 | for (;;) { |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 61 | if (nlr_push(&nlr) == 0) { |
| 62 | // loop to execute byte code |
| 63 | for (;;) { |
| 64 | int op = *ip++; |
| 65 | switch (op) { |
| 66 | case PYBC_LOAD_CONST_FALSE: |
| 67 | PUSH(py_const_false); |
| 68 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 69 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 70 | case PYBC_LOAD_CONST_NONE: |
| 71 | PUSH(py_const_none); |
| 72 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 73 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 74 | case PYBC_LOAD_CONST_TRUE: |
| 75 | PUSH(py_const_true); |
| 76 | break; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 77 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 78 | case PYBC_LOAD_CONST_SMALL_INT: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 79 | unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000; |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 80 | ip += 3; |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 81 | PUSH((py_obj_t)(unum << 1 | 1)); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 82 | break; |
| 83 | |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 84 | case PYBC_LOAD_CONST_DEC: |
| 85 | DECODE_QSTR; |
| 86 | PUSH(rt_load_const_dec(qstr)); |
| 87 | break; |
| 88 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 89 | case PYBC_LOAD_CONST_ID: |
| 90 | DECODE_QSTR; |
| 91 | PUSH(rt_load_const_str(qstr)); // TODO |
| 92 | break; |
| 93 | |
| 94 | case PYBC_LOAD_CONST_STRING: |
| 95 | DECODE_QSTR; |
| 96 | PUSH(rt_load_const_str(qstr)); |
| 97 | break; |
| 98 | |
| 99 | case PYBC_LOAD_FAST_0: |
| 100 | PUSH(fast0); |
| 101 | break; |
| 102 | |
| 103 | case PYBC_LOAD_FAST_1: |
| 104 | PUSH(fast1); |
| 105 | break; |
| 106 | |
| 107 | case PYBC_LOAD_FAST_2: |
| 108 | PUSH(fast2); |
| 109 | break; |
| 110 | |
| 111 | case PYBC_LOAD_FAST_N: |
| 112 | DECODE_UINT; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 113 | PUSH(fastn[unum]); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 114 | break; |
| 115 | |
| 116 | case PYBC_LOAD_NAME: |
| 117 | DECODE_QSTR; |
| 118 | PUSH(rt_load_name(qstr)); |
| 119 | break; |
| 120 | |
| 121 | case PYBC_LOAD_GLOBAL: |
| 122 | DECODE_QSTR; |
| 123 | PUSH(rt_load_global(qstr)); |
| 124 | break; |
| 125 | |
| 126 | case PYBC_LOAD_ATTR: |
| 127 | DECODE_QSTR; |
| 128 | *sp = rt_load_attr(*sp, qstr); |
| 129 | break; |
| 130 | |
| 131 | case PYBC_LOAD_METHOD: |
| 132 | DECODE_QSTR; |
| 133 | sp -= 1; |
| 134 | rt_load_method(sp[1], qstr, sp); |
| 135 | break; |
| 136 | |
| 137 | case PYBC_LOAD_BUILD_CLASS: |
| 138 | PUSH(rt_load_build_class()); |
| 139 | break; |
| 140 | |
| 141 | case PYBC_STORE_FAST_0: |
| 142 | fast0 = POP(); |
| 143 | break; |
| 144 | |
| 145 | case PYBC_STORE_FAST_1: |
| 146 | fast1 = POP(); |
| 147 | break; |
| 148 | |
| 149 | case PYBC_STORE_FAST_2: |
| 150 | fast2 = POP(); |
| 151 | break; |
| 152 | |
| 153 | case PYBC_STORE_FAST_N: |
| 154 | DECODE_UINT; |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 155 | fastn[unum] = POP(); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 156 | break; |
| 157 | |
| 158 | case PYBC_STORE_NAME: |
| 159 | DECODE_QSTR; |
| 160 | rt_store_name(qstr, POP()); |
| 161 | break; |
| 162 | |
Damien | 6addc89 | 2013-11-04 23:04:50 +0000 | [diff] [blame] | 163 | case PYBC_STORE_GLOBAL: |
| 164 | DECODE_QSTR; |
| 165 | rt_store_global(qstr, POP()); |
| 166 | break; |
| 167 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 168 | case PYBC_STORE_ATTR: |
| 169 | DECODE_QSTR; |
| 170 | rt_store_attr(sp[0], qstr, sp[1]); |
| 171 | sp += 2; |
| 172 | break; |
| 173 | |
| 174 | case PYBC_STORE_SUBSCR: |
| 175 | rt_store_subscr(sp[1], sp[0], sp[2]); |
| 176 | sp += 3; |
| 177 | break; |
| 178 | |
| 179 | case PYBC_DUP_TOP: |
| 180 | obj1 = *sp; |
| 181 | PUSH(obj1); |
| 182 | break; |
| 183 | |
| 184 | case PYBC_DUP_TOP_TWO: |
| 185 | sp -= 2; |
| 186 | sp[0] = sp[2]; |
| 187 | sp[1] = sp[3]; |
| 188 | break; |
| 189 | |
| 190 | case PYBC_POP_TOP: |
| 191 | ++sp; |
| 192 | break; |
| 193 | |
Damien | 4ebb32f | 2013-11-02 14:33:10 +0000 | [diff] [blame] | 194 | case PYBC_ROT_TWO: |
| 195 | obj1 = sp[0]; |
| 196 | sp[0] = sp[1]; |
| 197 | sp[1] = obj1; |
| 198 | break; |
| 199 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 200 | case PYBC_ROT_THREE: |
| 201 | obj1 = sp[0]; |
| 202 | sp[0] = sp[1]; |
| 203 | sp[1] = sp[2]; |
| 204 | sp[2] = obj1; |
| 205 | break; |
| 206 | |
| 207 | case PYBC_JUMP: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 208 | DECODE_SLABEL; |
| 209 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 210 | break; |
| 211 | |
| 212 | case PYBC_POP_JUMP_IF_TRUE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 213 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 214 | if (rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 215 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 216 | } |
| 217 | break; |
| 218 | |
| 219 | case PYBC_POP_JUMP_IF_FALSE: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 220 | DECODE_SLABEL; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 221 | if (!rt_is_true(POP())) { |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 222 | ip += unum; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 223 | } |
| 224 | break; |
| 225 | |
| 226 | /* we are trying to get away without using this opcode |
| 227 | case PYBC_SETUP_LOOP: |
| 228 | DECODE_UINT; |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 229 | // push_block(PYBC_SETUP_LOOP, ip + unum, sp) |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 230 | break; |
| 231 | */ |
| 232 | |
| 233 | case PYBC_SETUP_EXCEPT: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 234 | DECODE_ULABEL; // except labels are always forward |
| 235 | *++exc_sp = (machine_uint_t)ip + unum; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 236 | *++exc_sp = (machine_uint_t)sp; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 237 | break; |
| 238 | |
| 239 | case PYBC_END_FINALLY: |
| 240 | // not implemented |
| 241 | // if TOS is an exception, reraises the exception (3 values on TOS) |
| 242 | // if TOS is an integer, does something else |
| 243 | // if TOS is None, just pops it and continues |
| 244 | // else error |
| 245 | assert(0); |
| 246 | break; |
| 247 | |
| 248 | case PYBC_GET_ITER: |
| 249 | *sp = rt_getiter(*sp); |
| 250 | break; |
| 251 | |
| 252 | case PYBC_FOR_ITER: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 253 | DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 254 | obj1 = rt_iternext(*sp); |
| 255 | if (obj1 == py_const_stop_iteration) { |
| 256 | ++sp; // pop the exhausted iterator |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 257 | ip += unum; // jump to after for-block |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 258 | } else { |
| 259 | PUSH(obj1); // push the next iteration value |
| 260 | } |
| 261 | break; |
| 262 | |
| 263 | case PYBC_POP_BLOCK: |
| 264 | // pops block and restores the stack |
| 265 | assert(0); |
| 266 | break; |
| 267 | |
| 268 | case PYBC_POP_EXCEPT: |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 269 | // TODO need to work out how blocks work etc |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 270 | // 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] | 271 | assert(exc_sp >= &exc_stack[0]); |
| 272 | //sp = (py_obj_t*)(*exc_sp--); |
| 273 | //exc_sp--; // discard ip |
| 274 | exc_sp -= 2; |
| 275 | //sp += 3; // pop 3 exception values |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 276 | break; |
| 277 | |
Damien | 7410e44 | 2013-11-02 19:47:57 +0000 | [diff] [blame] | 278 | case PYBC_UNARY_OP: |
| 279 | unum = *ip++; |
| 280 | *sp = rt_unary_op(unum, *sp); |
| 281 | break; |
| 282 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 283 | case PYBC_BINARY_OP: |
| 284 | unum = *ip++; |
| 285 | obj2 = POP(); |
| 286 | obj1 = *sp; |
| 287 | *sp = rt_binary_op(unum, obj1, obj2); |
| 288 | break; |
| 289 | |
| 290 | case PYBC_COMPARE_OP: |
| 291 | unum = *ip++; |
| 292 | obj2 = POP(); |
| 293 | obj1 = *sp; |
| 294 | *sp = rt_compare_op(unum, obj1, obj2); |
| 295 | break; |
| 296 | |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 297 | case PYBC_BUILD_TUPLE: |
| 298 | DECODE_UINT; |
| 299 | obj1 = rt_build_tuple(unum, sp); |
| 300 | sp += unum - 1; |
| 301 | *sp = obj1; |
| 302 | break; |
| 303 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 304 | case PYBC_BUILD_LIST: |
| 305 | DECODE_UINT; |
| 306 | obj1 = rt_build_list(unum, sp); |
| 307 | sp += unum - 1; |
| 308 | *sp = obj1; |
| 309 | break; |
| 310 | |
Damien | c226dca | 2013-10-16 16:12:52 +0100 | [diff] [blame] | 311 | case PYBC_LIST_APPEND: |
| 312 | DECODE_UINT; |
| 313 | // I think it's guaranteed by the compiler that sp[unum] is a list |
| 314 | rt_list_append(sp[unum], sp[0]); |
| 315 | sp++; |
| 316 | break; |
| 317 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 318 | case PYBC_BUILD_MAP: |
| 319 | DECODE_UINT; |
| 320 | PUSH(rt_build_map(unum)); |
| 321 | break; |
| 322 | |
| 323 | case PYBC_STORE_MAP: |
| 324 | sp += 2; |
| 325 | rt_store_map(sp[0], sp[-2], sp[-1]); |
| 326 | break; |
| 327 | |
Damien | 5fd0966 | 2013-10-16 20:54:01 +0100 | [diff] [blame] | 328 | case PYBC_MAP_ADD: |
| 329 | DECODE_UINT; |
| 330 | // I think it's guaranteed by the compiler that sp[unum + 1] is a map |
| 331 | rt_store_map(sp[unum + 1], sp[0], sp[1]); |
| 332 | sp += 2; |
| 333 | break; |
| 334 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 335 | case PYBC_BUILD_SET: |
| 336 | DECODE_UINT; |
| 337 | obj1 = rt_build_set(unum, sp); |
| 338 | sp += unum - 1; |
| 339 | *sp = obj1; |
| 340 | break; |
| 341 | |
Damien | c12aa46 | 2013-10-16 20:57:49 +0100 | [diff] [blame] | 342 | case PYBC_SET_ADD: |
| 343 | DECODE_UINT; |
| 344 | // I think it's guaranteed by the compiler that sp[unum] is a set |
| 345 | rt_store_set(sp[unum], sp[0]); |
| 346 | sp++; |
| 347 | break; |
| 348 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 349 | case PYBC_MAKE_FUNCTION: |
| 350 | DECODE_UINT; |
| 351 | PUSH(rt_make_function_from_id(unum)); |
| 352 | break; |
| 353 | |
| 354 | case PYBC_CALL_FUNCTION: |
| 355 | DECODE_UINT; |
| 356 | assert((unum & 0xff00) == 0); // n_keyword |
| 357 | unum &= 0xff; // n_positional |
| 358 | sp += unum; |
| 359 | *sp = rt_call_function_n(*sp, unum, sp - unum); |
| 360 | break; |
| 361 | |
| 362 | case PYBC_CALL_METHOD: |
| 363 | DECODE_UINT; |
| 364 | assert((unum & 0xff00) == 0); // n_keyword |
| 365 | unum &= 0xff; |
| 366 | obj1 = rt_call_method_n(unum, sp); |
| 367 | sp += unum + 1; |
| 368 | *sp = obj1; |
| 369 | break; |
| 370 | |
| 371 | case PYBC_RETURN_VALUE: |
| 372 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 373 | *sp_in_out = sp; |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 374 | assert(exc_sp == &exc_stack[-1]); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 375 | return false; |
| 376 | |
| 377 | case PYBC_YIELD_VALUE: |
| 378 | nlr_pop(); |
| 379 | *ip_in_out = ip; |
| 380 | fastn[0] = fast0; |
| 381 | fastn[1] = fast1; |
| 382 | fastn[2] = fast2; |
| 383 | *sp_in_out = sp; |
| 384 | return true; |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 385 | |
| 386 | default: |
Damien | 03c9cfb | 2013-11-05 22:06:08 +0000 | [diff] [blame^] | 387 | printf("code %p, byte code 0x%02x not implemented\n", ip, op); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 388 | assert(0); |
| 389 | nlr_pop(); |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 390 | return false; |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 391 | } |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 392 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 393 | |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 394 | } else { |
| 395 | // exception occurred |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 396 | |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 397 | if (exc_sp >= &exc_stack[0]) { |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 398 | // catch exception and pass to byte code |
Damien | c9f9197 | 2013-10-15 23:46:01 +0100 | [diff] [blame] | 399 | sp = (py_obj_t*)(exc_sp[0]); |
| 400 | ip = (const byte*)(exc_sp[-1]); |
| 401 | // push(traceback, exc-val, exc-type) |
| 402 | PUSH(py_const_none); |
| 403 | PUSH(nlr.ret_val); |
| 404 | PUSH(py_const_none); |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 405 | } else { |
| 406 | // re-raise exception |
Damien | bd25445 | 2013-10-16 20:39:12 +0100 | [diff] [blame] | 407 | // TODO what to do if this is a generator?? |
Damien | ce89a21 | 2013-10-15 22:25:17 +0100 | [diff] [blame] | 408 | nlr_jump(nlr.ret_val); |
| 409 | } |
Damien | 429d719 | 2013-10-04 19:53:11 +0100 | [diff] [blame] | 410 | } |
| 411 | } |
| 412 | } |