vm.c 25.8 KB
Newer Older
Damien's avatar
Damien committed
1
2
3
4
5
6
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>

7
#include "nlr.h"
Damien's avatar
Damien committed
8
#include "misc.h"
9
#include "mpconfig.h"
10
#include "qstr.h"
11
#include "obj.h"
Damien's avatar
Damien committed
12
#include "runtime.h"
13
#include "bc0.h"
14
#include "bc.h"
Damien's avatar
Damien committed
15

Paul Sokolovsky's avatar
Paul Sokolovsky committed
16
17
18
19
20
21
22
// Value stack grows up (this makes it incompatible with native C stack, but
// makes sure that arguments to functions are in natural order arg1..argN
// (Python semantics mandates left-to-right evaluation order, including for
// function arguments). Stack pointer is pre-incremented and points at the
// top element.
// Exception stack also grows up, top element is also pointed at.

23
24
25
26
27
28
29
30
31
32
// Exception stack entry
typedef struct _mp_exc_stack {
    const byte *handler;
    // bit 0 is saved currently_in_except_block value
    machine_uint_t val_sp;
    // We might only have 2 interesting cases here: SETUP_EXCEPT & SETUP_FINALLY,
    // consider storing it in bit 1 of val_sp. TODO: SETUP_WITH?
    byte opcode;
} mp_exc_stack;

33
// Exception stack unwind reasons (WHY_* in CPython-speak)
34
35
// TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds
// left to do encoded in the JUMP number
36
37
typedef enum {
    UNWIND_RETURN = 1,
38
    UNWIND_JUMP,
39
40
} mp_unwind_reason_t;

Damien's avatar
Damien committed
41
#define DECODE_UINT do { unum = *ip++; if (unum > 127) { unum = ((unum & 0x3f) << 8) | (*ip++); } } while (0)
Damien's avatar
Damien committed
42
43
#define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0)
#define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0)
44
#define DECODE_QSTR do { qst = *ip++; if (qst > 127) { qst = ((qst & 0x3f) << 8) | (*ip++); } } while (0)
45
46
#define PUSH(val) *++sp = (val)
#define POP() (*sp--)
47
48
#define TOP() (*sp)
#define SET_TOP(val) *sp = (val)
Damien's avatar
Damien committed
49

50
mp_obj_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, const mp_obj_t *args2, uint n_args2, uint n_state) {
51
52
    // allocate state for locals and stack
    mp_obj_t temp_state[10];
53
    mp_obj_t *state = &temp_state[0];
54
    if (n_state > 10) {
55
        state = m_new(mp_obj_t, n_state);
56
    }
57
58
    mp_obj_t *sp = &state[0] - 1;

59
    // init args
60
    for (uint i = 0; i < n_args; i++) {
61
        state[n_state - 1 - i] = args[i];
62
    }
63
64
65
    for (uint i = 0; i < n_args2; i++) {
        state[n_state - 1 - n_args - i] = args2[i];
    }
66

67
    const byte *ip = code;
Damien George's avatar
Damien George committed
68

69
70
71
72
    // get code info size
    machine_uint_t code_info_size = ip[0] | (ip[1] << 8) | (ip[2] << 16) | (ip[3] << 24);
    ip += code_info_size;

Damien George's avatar
Damien George committed
73
74
75
76
    // execute prelude to make any cells (closed over variables)
    {
        for (uint n_local = *ip++; n_local > 0; n_local--) {
            uint local_num = *ip++;
77
            if (local_num < n_args + n_args2) {
78
                state[n_state - 1 - local_num] = mp_obj_new_cell(state[n_state - 1 - local_num]);
Damien George's avatar
Damien George committed
79
            } else {
80
                state[n_state - 1 - local_num] = mp_obj_new_cell(MP_OBJ_NULL);
Damien George's avatar
Damien George committed
81
82
83
84
85
            }
        }
    }

    // execute the byte code
86
    if (mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp)) {
87
88
89
        // it shouldn't yield
        assert(0);
    }
Damien George's avatar
Damien George committed
90

91
92
    // TODO check fails if, eg, return from within for loop
    //assert(sp == &state[17]);
93
94
95
    return *sp;
}

96
97
// fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc)
// sp points to bottom of stack which grows up
98
// returns true if bytecode yielded
99
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's avatar
Damien committed
100
101
    // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think)

102
    const byte *ip = *ip_in_out;
103
    mp_obj_t *sp = *sp_in_out;
Damien's avatar
Damien committed
104
    machine_uint_t unum;
105
    qstr qst;
106
    mp_obj_t obj1, obj2;
107
    nlr_buf_t nlr;
Damien's avatar
Damien committed
108

109
    volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions
110
111
    mp_exc_stack exc_stack[4];
    mp_exc_stack *volatile exc_sp = &exc_stack[0] - 1; // stack grows up, exc_sp points to top of stack
112
    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's avatar
Damien committed
113

114
    // outer exception handling loop
Damien's avatar
Damien committed
115
    for (;;) {
116
117
118
        if (nlr_push(&nlr) == 0) {
            // loop to execute byte code
            for (;;) {
119
dispatch_loop:
120
                save_ip = ip;
121
122
                int op = *ip++;
                switch (op) {
123
124
                    case MP_BC_LOAD_CONST_FALSE:
                        PUSH(mp_const_false);
125
126
                        break;

127
128
                    case MP_BC_LOAD_CONST_NONE:
                        PUSH(mp_const_none);
129
130
                        break;

131
132
                    case MP_BC_LOAD_CONST_TRUE:
                        PUSH(mp_const_true);
133
                        break;
Damien George's avatar
Damien George committed
134
135
136
137

                    case MP_BC_LOAD_CONST_ELLIPSIS:
                        PUSH(mp_const_ellipsis);
                        break;
138

139
                    case MP_BC_LOAD_CONST_SMALL_INT:
Damien's avatar
Damien committed
140
                        unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000;
141
                        ip += 3;
142
                        PUSH(MP_OBJ_NEW_SMALL_INT(unum));
143
144
                        break;

145
146
                    case MP_BC_LOAD_CONST_INT:
                        DECODE_QSTR;
147
                        PUSH(mp_obj_new_int_from_long_str(qstr_str(qst)));
148
149
                        break;

150
                    case MP_BC_LOAD_CONST_DEC:
Damien's avatar
Damien committed
151
                        DECODE_QSTR;
152
                        PUSH(rt_load_const_dec(qst));
Damien's avatar
Damien committed
153
154
                        break;

155
                    case MP_BC_LOAD_CONST_ID:
156
                        DECODE_QSTR;
157
                        PUSH(rt_load_const_str(qst)); // TODO
158
159
                        break;

160
161
                    case MP_BC_LOAD_CONST_BYTES:
                        DECODE_QSTR;
162
                        PUSH(rt_load_const_bytes(qst));
163
164
                        break;

165
                    case MP_BC_LOAD_CONST_STRING:
166
                        DECODE_QSTR;
167
                        PUSH(rt_load_const_str(qst));
168
169
                        break;

170
                    case MP_BC_LOAD_FAST_0:
171
                        PUSH(fastn[0]);
172
173
                        break;

174
                    case MP_BC_LOAD_FAST_1:
175
                        PUSH(fastn[-1]);
176
177
                        break;

178
                    case MP_BC_LOAD_FAST_2:
179
                        PUSH(fastn[-2]);
180
181
                        break;

182
                    case MP_BC_LOAD_FAST_N:
183
                        DECODE_UINT;
184
                        PUSH(fastn[-unum]);
185
186
                        break;

187
                    case MP_BC_LOAD_DEREF:
Damien's avatar
Damien committed
188
                        DECODE_UINT;
189
                        PUSH(rt_get_cell(fastn[-unum]));
Damien's avatar
Damien committed
190
191
                        break;

192
                    case MP_BC_LOAD_NAME:
193
                        DECODE_QSTR;
194
                        PUSH(rt_load_name(qst));
195
196
                        break;

197
                    case MP_BC_LOAD_GLOBAL:
198
                        DECODE_QSTR;
199
                        PUSH(rt_load_global(qst));
200
201
                        break;

202
                    case MP_BC_LOAD_ATTR:
203
                        DECODE_QSTR;
204
                        SET_TOP(rt_load_attr(TOP(), qst));
205
206
                        break;

207
                    case MP_BC_LOAD_METHOD:
208
                        DECODE_QSTR;
209
                        rt_load_method(*sp, qst, sp);
210
                        sp += 1;
211
212
                        break;

213
                    case MP_BC_LOAD_BUILD_CLASS:
214
215
216
                        PUSH(rt_load_build_class());
                        break;

217
                    case MP_BC_STORE_FAST_0:
218
                        fastn[0] = POP();
219
220
                        break;

221
                    case MP_BC_STORE_FAST_1:
222
                        fastn[-1] = POP();
223
224
                        break;

225
                    case MP_BC_STORE_FAST_2:
226
                        fastn[-2] = POP();
227
228
                        break;

229
                    case MP_BC_STORE_FAST_N:
230
                        DECODE_UINT;
231
                        fastn[-unum] = POP();
232
233
                        break;

234
                    case MP_BC_STORE_DEREF:
Damien's avatar
Damien committed
235
                        DECODE_UINT;
236
                        rt_set_cell(fastn[-unum], POP());
Damien's avatar
Damien committed
237
238
                        break;

239
                    case MP_BC_STORE_NAME:
240
                        DECODE_QSTR;
241
                        rt_store_name(qst, POP());
242
243
                        break;

244
                    case MP_BC_STORE_GLOBAL:
245
                        DECODE_QSTR;
246
                        rt_store_global(qst, POP());
247
248
                        break;

249
                    case MP_BC_STORE_ATTR:
250
                        DECODE_QSTR;
251
                        rt_store_attr(sp[0], qst, sp[-1]);
252
                        sp -= 2;
253
254
                        break;

255
                    case MP_BC_STORE_SUBSCR:
256
257
                        rt_store_subscr(sp[-1], sp[0], sp[-2]);
                        sp -= 3;
258
259
                        break;

260
                    case MP_BC_DUP_TOP:
261
                        obj1 = TOP();
262
263
264
                        PUSH(obj1);
                        break;

265
                    case MP_BC_DUP_TOP_TWO:
266
267
268
                        sp += 2;
                        sp[0] = sp[-2];
                        sp[-1] = sp[-3];
269
270
                        break;

271
                    case MP_BC_POP_TOP:
272
                        sp -= 1;
273
274
                        break;

275
                    case MP_BC_ROT_TWO:
276
                        obj1 = sp[0];
277
278
                        sp[0] = sp[-1];
                        sp[-1] = obj1;
279
280
                        break;

281
                    case MP_BC_ROT_THREE:
282
                        obj1 = sp[0];
283
284
285
                        sp[0] = sp[-1];
                        sp[-1] = sp[-2];
                        sp[-2] = obj1;
286
287
                        break;

288
                    case MP_BC_JUMP:
Damien's avatar
Damien committed
289
290
                        DECODE_SLABEL;
                        ip += unum;
291
292
                        break;

293
                    case MP_BC_POP_JUMP_IF_TRUE:
Damien's avatar
Damien committed
294
                        DECODE_SLABEL;
295
                        if (rt_is_true(POP())) {
Damien's avatar
Damien committed
296
                            ip += unum;
297
298
299
                        }
                        break;

300
                    case MP_BC_POP_JUMP_IF_FALSE:
Damien's avatar
Damien committed
301
                        DECODE_SLABEL;
302
                        if (!rt_is_true(POP())) {
Damien's avatar
Damien committed
303
                            ip += unum;
304
305
306
                        }
                        break;

307
                    case MP_BC_JUMP_IF_TRUE_OR_POP:
Damien's avatar
Damien committed
308
                        DECODE_SLABEL;
309
                        if (rt_is_true(TOP())) {
Damien's avatar
Damien committed
310
311
                            ip += unum;
                        } else {
312
                            sp--;
Damien's avatar
Damien committed
313
314
315
                        }
                        break;

316
                    case MP_BC_JUMP_IF_FALSE_OR_POP:
Damien's avatar
Damien committed
317
                        DECODE_SLABEL;
318
                        if (rt_is_true(TOP())) {
319
                            sp--;
Damien's avatar
Damien committed
320
321
322
323
324
                        } else {
                            ip += unum;
                        }
                        break;

325
                        /* we are trying to get away without using this opcode
326
                    case MP_BC_SETUP_LOOP:
327
                        DECODE_UINT;
328
                        // push_block(MP_BC_SETUP_LOOP, ip + unum, sp)
329
330
331
                        break;
                        */

332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
                    case MP_BC_UNWIND_JUMP:
                        DECODE_SLABEL;
                        PUSH((void*)(ip + unum)); // push destination ip for jump
                        PUSH((void*)(machine_uint_t)(*ip)); // push number of exception handlers to unwind
unwind_jump:
                        unum = (machine_uint_t)POP(); // get number of exception handlers to unwind
                        while (unum > 0) {
                            unum -= 1;
                            assert(exc_sp >= exc_stack);
                            if (exc_sp->opcode == MP_BC_SETUP_FINALLY) {
                                // We're going to run "finally" code as a coroutine
                                // (not calling it recursively). Set up a sentinel
                                // on a stack so it can return back to us when it is
                                // done (when END_FINALLY reached).
                                PUSH((void*)unum); // push number of exception handlers left to unwind
                                PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_JUMP)); // push sentinel
                                ip = exc_sp->handler; // get exception handler byte code address
                                exc_sp--; // pop exception handler
                                goto dispatch_loop; // run the exception handler
                            }
                            exc_sp--;
                        }
                        ip = (const byte*)POP(); // pop destination ip for jump
355
356
                        break;

Damien's avatar
Damien committed
357
                    // matched against: POP_BLOCK or POP_EXCEPT (anything else?)
358
                    case MP_BC_SETUP_EXCEPT:
359
                    case MP_BC_SETUP_FINALLY:
Damien's avatar
Damien committed
360
                        DECODE_ULABEL; // except labels are always forward
361
362
363
364
                        ++exc_sp;
                        exc_sp->opcode = op;
                        exc_sp->handler = ip + unum;
                        exc_sp->val_sp = (((machine_uint_t)sp) | currently_in_except_block);
365
                        currently_in_except_block = 0; // in a try block now
366
367
                        break;

368
                    case MP_BC_END_FINALLY:
369
                        // not fully implemented
370
371
                        // if TOS is an exception, reraises the exception (3 values on TOS)
                        // if TOS is None, just pops it and continues
372
                        // if TOS is an integer, does something else
373
                        // else error
374
375
376
377
378
                        if (MP_OBJ_IS_TYPE(TOP(), &exception_type)) {
                            nlr_jump(TOP());
                        }
                        if (TOP() == mp_const_none) {
                            sp--;
379
380
381
382
383
384
385
                        } else if (MP_OBJ_IS_SMALL_INT(TOP())) {
                            // We finished "finally" coroutine and now dispatch back
                            // to our caller, based on TOS value
                            mp_unwind_reason_t reason = MP_OBJ_SMALL_INT_VALUE(POP());
                            switch (reason) {
                                case UNWIND_RETURN:
                                    goto unwind_return;
386
387
                                case UNWIND_JUMP:
                                    goto unwind_jump;
388
389
                            }
                            assert(0);
390
391
392
                        } else {
                            assert(0);
                        }
393
394
                        break;

395
                    case MP_BC_GET_ITER:
396
                        SET_TOP(rt_getiter(TOP()));
397
398
                        break;

399
                    case MP_BC_FOR_ITER:
Damien's avatar
Damien committed
400
                        DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
401
                        obj1 = rt_iternext(TOP());
402
                        if (obj1 == mp_const_stop_iteration) {
403
                            --sp; // pop the exhausted iterator
Damien's avatar
Damien committed
404
                            ip += unum; // jump to after for-block
405
406
407
408
409
                        } else {
                            PUSH(obj1); // push the next iteration value
                        }
                        break;

Damien's avatar
Damien committed
410
                    // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH
411
                    case MP_BC_POP_BLOCK:
Damien's avatar
Damien committed
412
413
                        // we are exiting an exception handler, so pop the last one of the exception-stack
                        assert(exc_sp >= &exc_stack[0]);
414
415
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
416
417
                        break;

418
                    // matched against: SETUP_EXCEPT
419
                    case MP_BC_POP_EXCEPT:
Damien's avatar
Damien committed
420
                        // TODO need to work out how blocks work etc
421
                        // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate
Damien's avatar
Damien committed
422
                        assert(exc_sp >= &exc_stack[0]);
423
                        assert(currently_in_except_block);
424
                        //sp = (mp_obj_t*)(*exc_sp--);
Damien's avatar
Damien committed
425
                        //exc_sp--; // discard ip
426
427
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
428
                        //sp -= 3; // pop 3 exception values
429
430
                        break;

431
432
433
434
435
436
437
438
                    case MP_BC_NOT:
                        if (TOP() == mp_const_true) {
                            SET_TOP(mp_const_false);
                        } else {
                            SET_TOP(mp_const_true);
                        }
                        break;

439
                    case MP_BC_UNARY_OP:
Damien's avatar
Damien committed
440
                        unum = *ip++;
441
                        SET_TOP(rt_unary_op(unum, TOP()));
Damien's avatar
Damien committed
442
443
                        break;

444
                    case MP_BC_BINARY_OP:
445
446
                        unum = *ip++;
                        obj2 = POP();
447
448
                        obj1 = TOP();
                        SET_TOP(rt_binary_op(unum, obj1, obj2));
449
450
                        break;

451
                    case MP_BC_BUILD_TUPLE:
452
                        DECODE_UINT;
453
454
                        sp -= unum - 1;
                        SET_TOP(rt_build_tuple(unum, sp));
455
456
                        break;

457
                    case MP_BC_BUILD_LIST:
458
                        DECODE_UINT;
459
460
                        sp -= unum - 1;
                        SET_TOP(rt_build_list(unum, sp));
461
462
                        break;

463
                    case MP_BC_LIST_APPEND:
464
465
                        DECODE_UINT;
                        // I think it's guaranteed by the compiler that sp[unum] is a list
466
467
                        rt_list_append(sp[-unum], sp[0]);
                        sp--;
468
469
                        break;

470
                    case MP_BC_BUILD_MAP:
471
472
473
474
                        DECODE_UINT;
                        PUSH(rt_build_map(unum));
                        break;

475
                    case MP_BC_STORE_MAP:
476
477
                        sp -= 2;
                        rt_store_map(sp[0], sp[2], sp[1]);
478
479
                        break;

480
                    case MP_BC_MAP_ADD:
Damien's avatar
Damien committed
481
                        DECODE_UINT;
482
483
484
                        // I think it's guaranteed by the compiler that sp[-unum - 1] is a map
                        rt_store_map(sp[-unum - 1], sp[0], sp[-1]);
                        sp -= 2;
Damien's avatar
Damien committed
485
486
                        break;

487
                    case MP_BC_BUILD_SET:
488
                        DECODE_UINT;
489
490
                        sp -= unum - 1;
                        SET_TOP(rt_build_set(unum, sp));
491
492
                        break;

493
                    case MP_BC_SET_ADD:
Damien's avatar
Damien committed
494
                        DECODE_UINT;
495
496
497
                        // I think it's guaranteed by the compiler that sp[-unum] is a set
                        rt_store_set(sp[-unum], sp[0]);
                        sp--;
Damien's avatar
Damien committed
498
499
                        break;

500
#if MICROPY_ENABLE_SLICE
501
502
503
504
505
506
507
508
509
510
511
                    case MP_BC_BUILD_SLICE:
                        DECODE_UINT;
                        if (unum == 2) {
                            obj2 = POP();
                            obj1 = TOP();
                            SET_TOP(mp_obj_new_slice(obj1, obj2, NULL));
                        } else {
                            printf("3-argument slice is not supported\n");
                            assert(0);
                        }
                        break;
512
#endif
513

514
                    case MP_BC_UNPACK_SEQUENCE:
515
                        DECODE_UINT;
516
                        rt_unpack_sequence(sp[0], unum, sp);
517
                        sp += unum - 1;
518
519
                        break;

520
                    case MP_BC_MAKE_FUNCTION:
521
                        DECODE_UINT;
522
523
524
525
526
527
                        PUSH(rt_make_function_from_id(unum, MP_OBJ_NULL));
                        break;

                    case MP_BC_MAKE_FUNCTION_DEFARGS:
                        DECODE_UINT;
                        SET_TOP(rt_make_function_from_id(unum, TOP()));
528
529
                        break;

530
                    case MP_BC_MAKE_CLOSURE:
Damien's avatar
Damien committed
531
                        DECODE_UINT;
532
                        SET_TOP(rt_make_closure_from_id(unum, TOP()));
Damien's avatar
Damien committed
533
534
                        break;

535
                    case MP_BC_CALL_FUNCTION:
536
                        DECODE_UINT;
537
538
539
540
                        // unum & 0xff == n_positional
                        // (unum >> 8) & 0xff == n_keyword
                        sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe);
                        SET_TOP(rt_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp + 1));
541
542
                        break;

543
                    case MP_BC_CALL_METHOD:
544
                        DECODE_UINT;
545
546
547
548
                        // unum & 0xff == n_positional
                        // (unum >> 8) & 0xff == n_keyword
                        sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1;
                        SET_TOP(rt_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp));
549
550
                        break;

551
                    case MP_BC_RETURN_VALUE:
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
unwind_return:
                        while (exc_sp >= exc_stack) {
                            if (exc_sp->opcode == MP_BC_SETUP_FINALLY) {
                                // We're going to run "finally" code as a coroutine
                                // (not calling it recursively). Set up a sentinel
                                // on a stack so it can return back to us when it is
                                // done (when END_FINALLY reached).
                                PUSH(MP_OBJ_NEW_SMALL_INT(UNWIND_RETURN));
                                ip = exc_sp->handler;
                                // We don't need to do anything with sp, finally is just
                                // syntactic sugar for sequential execution??
                                // sp =
                                exc_sp--;
                                goto dispatch_loop;
                            }
                            exc_sp--;
                        }
569
                        nlr_pop();
570
                        *sp_in_out = sp;
571
                        assert(exc_sp == &exc_stack[0] - 1);
572
573
                        return false;

574
575
576
577
578
579
                    case MP_BC_RAISE_VARARGS:
                        unum = *ip++;
                        assert(unum == 1);
                        obj1 = POP();
                        nlr_jump(obj1);

580
                    case MP_BC_YIELD_VALUE:
581
582
583
584
                        nlr_pop();
                        *ip_in_out = ip;
                        *sp_in_out = sp;
                        return true;
585

586
                    case MP_BC_IMPORT_NAME:
587
588
                        DECODE_QSTR;
                        obj1 = POP();
589
                        SET_TOP(rt_import_name(qst, obj1, TOP()));
590
591
                        break;

592
                    case MP_BC_IMPORT_FROM:
593
                        DECODE_QSTR;
594
                        obj1 = rt_import_from(TOP(), qst);
595
596
597
                        PUSH(obj1);
                        break;

598
599
600
601
                    case MP_BC_IMPORT_STAR:
                        rt_import_all(TOP());
                        break;

602
                    default:
Damien's avatar
Damien committed
603
                        printf("code %p, byte code 0x%02x not implemented\n", ip, op);
604
605
                        assert(0);
                        nlr_pop();
606
                        return false;
Damien's avatar
Damien committed
607
                }
608
609
610
611
612
            }

        } else {
            // exception occurred

613
            // set file and line number that the exception occurred at
614
615
            // TODO: don't set traceback for exceptions re-raised by END_FINALLY.
            // But consider how to handle nested exceptions.
616
617
            if (MP_OBJ_IS_TYPE(nlr.ret_val, &exception_type)) {
                machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24);
618
619
                qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24);
                qstr block_name = code_info[8] | (code_info[9] << 8) | (code_info[10] << 16) | (code_info[11] << 24);
620
621
                machine_uint_t source_line = 1;
                machine_uint_t bc = save_ip - code_info - code_info_size;
622
                //printf("find %lu %d %d\n", bc, code_info[12], code_info[13]);
623
624
625
                for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) {
                    bc -= *ci & 31;
                    source_line += *ci >> 5;
626
                }
627
                mp_obj_exception_add_traceback(nlr.ret_val, source_file, source_line, block_name);
628
629
            }

630
631
632
633
634
635
636
637
638
            while (currently_in_except_block) {
                // nested exception

                assert(exc_sp >= &exc_stack[0]);

                // TODO make a proper message for nested exception
                // at the moment we are just raising the very last exception (the one that caused the nested exception)

                // move up to previous exception handler
639
640
                currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                exc_sp--; // pop back to previous exception handler
641
642
            }

Damien's avatar
Damien committed
643
            if (exc_sp >= &exc_stack[0]) {
644
645
646
                // set flag to indicate that we are now handling an exception
                currently_in_except_block = 1;

647
                // catch exception and pass to byte code
648
649
                sp = (mp_obj_t*)(exc_sp->val_sp & (~((machine_uint_t)1)));
                ip = exc_sp->handler;
Damien's avatar
Damien committed
650
                // push(traceback, exc-val, exc-type)
651
                PUSH(mp_const_none);
Damien's avatar
Damien committed
652
                PUSH(nlr.ret_val);
653
                PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
654

655
            } else {
656
                // re-raise exception to higher level
657
                // TODO what to do if this is a generator??
658
659
                nlr_jump(nlr.ret_val);
            }
Damien's avatar
Damien committed
660
661
662
        }
    }
}