vm.c 27.1 KB
Newer Older
Damien's avatar
Damien committed
1
2
3
#include <stdio.h>
#include <assert.h>

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

Paul Sokolovsky's avatar
Paul Sokolovsky committed
13
14
15
16
17
18
19
// 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.

20
// Exception stack unwind reasons (WHY_* in CPython-speak)
21
22
// TODO perhaps compress this to RETURN=0, JUMP>0, with number of unwinds
// left to do encoded in the JUMP number
23
24
typedef enum {
    UNWIND_RETURN = 1,
25
    UNWIND_JUMP,
26
27
} mp_unwind_reason_t;

28
29
30
31
32
33
#define DECODE_UINT { \
    unum = 0; \
    do { \
        unum = (unum << 7) + (*ip & 0x7f); \
    } while ((*ip++ & 0x80) != 0); \
}
Damien's avatar
Damien committed
34
35
#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)
36
37
38
39
40
41
#define DECODE_QSTR { \
    qst = 0; \
    do { \
        qst = (qst << 7) + (*ip & 0x7f); \
    } while ((*ip++ & 0x80) != 0); \
}
42
43
#define PUSH(val) *++sp = (val)
#define POP() (*sp--)
44
45
#define TOP() (*sp)
#define SET_TOP(val) *sp = (val)
Damien's avatar
Damien committed
46

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

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

64
    const byte *ip = code;
Damien George's avatar
Damien George committed
65

66
67
68
69
    // 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
70
71
72
73
    // execute prelude to make any cells (closed over variables)
    {
        for (uint n_local = *ip++; n_local > 0; n_local--) {
            uint local_num = *ip++;
74
            if (local_num < n_args + n_args2) {
75
                state[n_state - 1 - local_num] = mp_obj_new_cell(state[n_state - 1 - local_num]);
Damien George's avatar
Damien George committed
76
            } else {
77
                state[n_state - 1 - local_num] = mp_obj_new_cell(MP_OBJ_NULL);
Damien George's avatar
Damien George committed
78
79
80
81
            }
        }
    }

82
83
    mp_exc_stack exc_stack[4];
    mp_exc_stack *exc_sp = &exc_stack[0] - 1;
Damien George's avatar
Damien George committed
84
    // execute the byte code
85
    mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp, exc_stack, &exc_sp, MP_OBJ_NULL);
86
87
88
89
90
91
92
93
94
95
96
97
98

    switch (vm_return_kind) {
        case MP_VM_RETURN_NORMAL:
            *ret = *sp;
            return MP_VM_RETURN_NORMAL;
        case MP_VM_RETURN_EXCEPTION:
            *ret = state[n_state - 1];
            return MP_VM_RETURN_EXCEPTION;
        case MP_VM_RETURN_YIELD: // byte-code shouldn't yield
        default:
            assert(0);
            *ret = mp_const_none;
            return MP_VM_RETURN_NORMAL;
99
100
101
    }
}

102
103
// 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
104
105
106
107
// returns:
//  MP_VM_RETURN_NORMAL, sp valid, return value in *sp
//  MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp
//  MP_VM_RETURN_EXCEPTION, exception in fastn[0]
108
109
mp_vm_return_kind_t mp_execute_byte_code_2(const byte *code_info, const byte **ip_in_out,
                                           mp_obj_t *fastn, mp_obj_t **sp_in_out,
110
111
                                           mp_exc_stack *exc_stack, mp_exc_stack **exc_sp_in_out,
                                           volatile mp_obj_t inject_exc) {
Damien's avatar
Damien committed
112
113
    // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think)

114
    const byte *ip = *ip_in_out;
115
    mp_obj_t *sp = *sp_in_out;
Damien's avatar
Damien committed
116
    machine_uint_t unum;
117
    qstr qst;
118
    mp_obj_t obj1, obj2;
119
    nlr_buf_t nlr;
Damien's avatar
Damien committed
120

121
122
    volatile bool currently_in_except_block = MP_TAGPTR_TAG(*exc_sp_in_out); // 0 or 1, to detect nested exceptions
    mp_exc_stack *volatile exc_sp = MP_TAGPTR_PTR(*exc_sp_in_out); // stack grows up, exc_sp points to top of stack
123
    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
124

125
    // outer exception handling loop
Damien's avatar
Damien committed
126
    for (;;) {
127
        if (nlr_push(&nlr) == 0) {
128
129
130
131
132
133
134
135
            // If we have exception to inject, now that we finish setting up
            // execution context, raise it. This works as if RAISE_VARARGS
            // bytecode was executed.
            if (inject_exc != MP_OBJ_NULL) {
                mp_obj_t t = inject_exc;
                inject_exc = MP_OBJ_NULL;
                nlr_jump(rt_make_raise_obj(t));
            }
136
137
            // loop to execute byte code
            for (;;) {
138
dispatch_loop:
139
                save_ip = ip;
140
141
                int op = *ip++;
                switch (op) {
142
143
                    case MP_BC_LOAD_CONST_FALSE:
                        PUSH(mp_const_false);
144
145
                        break;

146
147
                    case MP_BC_LOAD_CONST_NONE:
                        PUSH(mp_const_none);
148
149
                        break;

150
151
                    case MP_BC_LOAD_CONST_TRUE:
                        PUSH(mp_const_true);
152
                        break;
Damien George's avatar
Damien George committed
153
154
155
156

                    case MP_BC_LOAD_CONST_ELLIPSIS:
                        PUSH(mp_const_ellipsis);
                        break;
157

158
                    case MP_BC_LOAD_CONST_SMALL_INT: {
159
                        machine_int_t num = 0;
160
161
162
163
164
165
166
167
                        if ((ip[0] & 0x40) != 0) {
                            // Number is negative
                            num--;
                        }
                        do {
                            num = (num << 7) | (*ip & 0x7f);
                        } while ((*ip++ & 0x80) != 0);
                        PUSH(MP_OBJ_NEW_SMALL_INT(num));
168
                        break;
169
                    }
170

171
172
                    case MP_BC_LOAD_CONST_INT:
                        DECODE_QSTR;
173
                        PUSH(mp_obj_new_int_from_long_str(qstr_str(qst)));
174
175
                        break;

176
                    case MP_BC_LOAD_CONST_DEC:
Damien's avatar
Damien committed
177
                        DECODE_QSTR;
178
                        PUSH(rt_load_const_dec(qst));
Damien's avatar
Damien committed
179
180
                        break;

181
                    case MP_BC_LOAD_CONST_ID:
182
                        DECODE_QSTR;
183
                        PUSH(rt_load_const_str(qst)); // TODO
184
185
                        break;

186
187
                    case MP_BC_LOAD_CONST_BYTES:
                        DECODE_QSTR;
188
                        PUSH(rt_load_const_bytes(qst));
189
190
                        break;

191
                    case MP_BC_LOAD_CONST_STRING:
192
                        DECODE_QSTR;
193
                        PUSH(rt_load_const_str(qst));
194
195
                        break;

196
                    case MP_BC_LOAD_FAST_0:
197
                        PUSH(fastn[0]);
198
199
                        break;

200
                    case MP_BC_LOAD_FAST_1:
201
                        PUSH(fastn[-1]);
202
203
                        break;

204
                    case MP_BC_LOAD_FAST_2:
205
                        PUSH(fastn[-2]);
206
207
                        break;

208
                    case MP_BC_LOAD_FAST_N:
209
                        DECODE_UINT;
210
                        PUSH(fastn[-unum]);
211
212
                        break;

213
                    case MP_BC_LOAD_DEREF:
Damien's avatar
Damien committed
214
                        DECODE_UINT;
215
                        PUSH(rt_get_cell(fastn[-unum]));
Damien's avatar
Damien committed
216
217
                        break;

218
                    case MP_BC_LOAD_NAME:
219
                        DECODE_QSTR;
220
                        PUSH(rt_load_name(qst));
221
222
                        break;

223
                    case MP_BC_LOAD_GLOBAL:
224
                        DECODE_QSTR;
225
                        PUSH(rt_load_global(qst));
226
227
                        break;

228
                    case MP_BC_LOAD_ATTR:
229
                        DECODE_QSTR;
230
                        SET_TOP(rt_load_attr(TOP(), qst));
231
232
                        break;

233
                    case MP_BC_LOAD_METHOD:
234
                        DECODE_QSTR;
235
                        rt_load_method(*sp, qst, sp);
236
                        sp += 1;
237
238
                        break;

239
                    case MP_BC_LOAD_BUILD_CLASS:
240
241
242
                        PUSH(rt_load_build_class());
                        break;

243
                    case MP_BC_STORE_FAST_0:
244
                        fastn[0] = POP();
245
246
                        break;

247
                    case MP_BC_STORE_FAST_1:
248
                        fastn[-1] = POP();
249
250
                        break;

251
                    case MP_BC_STORE_FAST_2:
252
                        fastn[-2] = POP();
253
254
                        break;

255
                    case MP_BC_STORE_FAST_N:
256
                        DECODE_UINT;
257
                        fastn[-unum] = POP();
258
259
                        break;

260
                    case MP_BC_STORE_DEREF:
Damien's avatar
Damien committed
261
                        DECODE_UINT;
262
                        rt_set_cell(fastn[-unum], POP());
Damien's avatar
Damien committed
263
264
                        break;

265
                    case MP_BC_STORE_NAME:
266
                        DECODE_QSTR;
267
                        rt_store_name(qst, POP());
268
269
                        break;

270
                    case MP_BC_STORE_GLOBAL:
271
                        DECODE_QSTR;
272
                        rt_store_global(qst, POP());
273
274
                        break;

275
                    case MP_BC_STORE_ATTR:
276
                        DECODE_QSTR;
277
                        rt_store_attr(sp[0], qst, sp[-1]);
278
                        sp -= 2;
279
280
                        break;

281
                    case MP_BC_STORE_SUBSCR:
282
283
                        rt_store_subscr(sp[-1], sp[0], sp[-2]);
                        sp -= 3;
284
285
                        break;

286
                    case MP_BC_DUP_TOP:
287
                        obj1 = TOP();
288
289
290
                        PUSH(obj1);
                        break;

291
                    case MP_BC_DUP_TOP_TWO:
292
293
294
                        sp += 2;
                        sp[0] = sp[-2];
                        sp[-1] = sp[-3];
295
296
                        break;

297
                    case MP_BC_POP_TOP:
298
                        sp -= 1;
299
300
                        break;

301
                    case MP_BC_ROT_TWO:
302
                        obj1 = sp[0];
303
304
                        sp[0] = sp[-1];
                        sp[-1] = obj1;
305
306
                        break;

307
                    case MP_BC_ROT_THREE:
308
                        obj1 = sp[0];
309
310
311
                        sp[0] = sp[-1];
                        sp[-1] = sp[-2];
                        sp[-2] = obj1;
312
313
                        break;

314
                    case MP_BC_JUMP:
Damien's avatar
Damien committed
315
316
                        DECODE_SLABEL;
                        ip += unum;
317
318
                        break;

319
                    case MP_BC_POP_JUMP_IF_TRUE:
Damien's avatar
Damien committed
320
                        DECODE_SLABEL;
321
                        if (rt_is_true(POP())) {
Damien's avatar
Damien committed
322
                            ip += unum;
323
324
325
                        }
                        break;

326
                    case MP_BC_POP_JUMP_IF_FALSE:
Damien's avatar
Damien committed
327
                        DECODE_SLABEL;
328
                        if (!rt_is_true(POP())) {
Damien's avatar
Damien committed
329
                            ip += unum;
330
331
332
                        }
                        break;

333
                    case MP_BC_JUMP_IF_TRUE_OR_POP:
Damien's avatar
Damien committed
334
                        DECODE_SLABEL;
335
                        if (rt_is_true(TOP())) {
Damien's avatar
Damien committed
336
337
                            ip += unum;
                        } else {
338
                            sp--;
Damien's avatar
Damien committed
339
340
341
                        }
                        break;

342
                    case MP_BC_JUMP_IF_FALSE_OR_POP:
Damien's avatar
Damien committed
343
                        DECODE_SLABEL;
344
                        if (rt_is_true(TOP())) {
345
                            sp--;
Damien's avatar
Damien committed
346
347
348
349
350
                        } else {
                            ip += unum;
                        }
                        break;

351
                        /* we are trying to get away without using this opcode
352
                    case MP_BC_SETUP_LOOP:
353
                        DECODE_UINT;
354
                        // push_block(MP_BC_SETUP_LOOP, ip + unum, sp)
355
356
357
                        break;
                        */

358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
                    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
381
382
                        break;

Damien's avatar
Damien committed
383
                    // matched against: POP_BLOCK or POP_EXCEPT (anything else?)
384
                    case MP_BC_SETUP_EXCEPT:
385
                    case MP_BC_SETUP_FINALLY:
Damien's avatar
Damien committed
386
                        DECODE_ULABEL; // except labels are always forward
387
388
389
                        ++exc_sp;
                        exc_sp->opcode = op;
                        exc_sp->handler = ip + unum;
390
                        exc_sp->val_sp = MP_TAGPTR_MAKE(sp, currently_in_except_block);
391
                        currently_in_except_block = 0; // in a try block now
392
393
                        break;

394
                    case MP_BC_END_FINALLY:
395
                        // not fully implemented
396
397
                        // if TOS is an exception, reraises the exception (3 values on TOS)
                        // if TOS is None, just pops it and continues
398
                        // if TOS is an integer, does something else
399
                        // else error
400
                        if (mp_obj_is_exception_instance(TOP())) {
401
402
403
404
                            nlr_jump(TOP());
                        }
                        if (TOP() == mp_const_none) {
                            sp--;
405
406
407
408
409
410
411
                        } 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;
412
413
                                case UNWIND_JUMP:
                                    goto unwind_jump;
414
415
                            }
                            assert(0);
416
417
418
                        } else {
                            assert(0);
                        }
419
420
                        break;

421
                    case MP_BC_GET_ITER:
422
                        SET_TOP(rt_getiter(TOP()));
423
424
                        break;

425
                    case MP_BC_FOR_ITER:
Damien's avatar
Damien committed
426
                        DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
427
                        obj1 = rt_iternext(TOP());
428
                        if (obj1 == mp_const_stop_iteration) {
429
                            --sp; // pop the exhausted iterator
Damien's avatar
Damien committed
430
                            ip += unum; // jump to after for-block
431
432
433
434
435
                        } else {
                            PUSH(obj1); // push the next iteration value
                        }
                        break;

Damien's avatar
Damien committed
436
                    // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH
437
                    case MP_BC_POP_BLOCK:
Damien's avatar
Damien committed
438
                        // we are exiting an exception handler, so pop the last one of the exception-stack
439
                        assert(exc_sp >= exc_stack);
440
                        currently_in_except_block = MP_TAGPTR_TAG(exc_sp->val_sp); // restore previous state
441
                        exc_sp--; // pop back to previous exception handler
442
443
                        break;

444
                    // matched against: SETUP_EXCEPT
445
                    case MP_BC_POP_EXCEPT:
Damien's avatar
Damien committed
446
                        // TODO need to work out how blocks work etc
447
                        // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate
448
                        assert(exc_sp >= exc_stack);
449
                        assert(currently_in_except_block);
450
                        //sp = (mp_obj_t*)(*exc_sp--);
Damien's avatar
Damien committed
451
                        //exc_sp--; // discard ip
452
                        currently_in_except_block = MP_TAGPTR_TAG(exc_sp->val_sp); // restore previous state
453
                        exc_sp--; // pop back to previous exception handler
454
                        //sp -= 3; // pop 3 exception values
455
456
                        break;

457
458
459
460
461
462
463
464
                    case MP_BC_NOT:
                        if (TOP() == mp_const_true) {
                            SET_TOP(mp_const_false);
                        } else {
                            SET_TOP(mp_const_true);
                        }
                        break;

465
                    case MP_BC_UNARY_OP:
Damien's avatar
Damien committed
466
                        unum = *ip++;
467
                        SET_TOP(rt_unary_op(unum, TOP()));
Damien's avatar
Damien committed
468
469
                        break;

470
                    case MP_BC_BINARY_OP:
471
472
                        unum = *ip++;
                        obj2 = POP();
473
474
                        obj1 = TOP();
                        SET_TOP(rt_binary_op(unum, obj1, obj2));
475
476
                        break;

477
                    case MP_BC_BUILD_TUPLE:
478
                        DECODE_UINT;
479
480
                        sp -= unum - 1;
                        SET_TOP(rt_build_tuple(unum, sp));
481
482
                        break;

483
                    case MP_BC_BUILD_LIST:
484
                        DECODE_UINT;
485
486
                        sp -= unum - 1;
                        SET_TOP(rt_build_list(unum, sp));
487
488
                        break;

489
                    case MP_BC_LIST_APPEND:
490
491
                        DECODE_UINT;
                        // I think it's guaranteed by the compiler that sp[unum] is a list
492
493
                        rt_list_append(sp[-unum], sp[0]);
                        sp--;
494
495
                        break;

496
                    case MP_BC_BUILD_MAP:
497
498
499
500
                        DECODE_UINT;
                        PUSH(rt_build_map(unum));
                        break;

501
                    case MP_BC_STORE_MAP:
502
503
                        sp -= 2;
                        rt_store_map(sp[0], sp[2], sp[1]);
504
505
                        break;

506
                    case MP_BC_MAP_ADD:
Damien's avatar
Damien committed
507
                        DECODE_UINT;
508
509
510
                        // 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
511
512
                        break;

513
                    case MP_BC_BUILD_SET:
514
                        DECODE_UINT;
515
516
                        sp -= unum - 1;
                        SET_TOP(rt_build_set(unum, sp));
517
518
                        break;

519
                    case MP_BC_SET_ADD:
Damien's avatar
Damien committed
520
                        DECODE_UINT;
521
522
523
                        // 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
524
525
                        break;

526
#if MICROPY_ENABLE_SLICE
527
528
529
530
531
532
533
534
535
536
537
                    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;
538
#endif
539

540
                    case MP_BC_UNPACK_SEQUENCE:
541
                        DECODE_UINT;
542
                        rt_unpack_sequence(sp[0], unum, sp);
543
                        sp += unum - 1;
544
545
                        break;

546
                    case MP_BC_MAKE_FUNCTION:
547
                        DECODE_UINT;
548
549
550
551
552
553
                        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()));
554
555
                        break;

556
                    case MP_BC_MAKE_CLOSURE:
Damien's avatar
Damien committed
557
                        DECODE_UINT;
558
                        SET_TOP(rt_make_closure_from_id(unum, TOP()));
Damien's avatar
Damien committed
559
560
                        break;

561
                    case MP_BC_CALL_FUNCTION:
562
                        DECODE_UINT;
563
564
565
566
                        // 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));
567
568
                        break;

569
                    case MP_BC_CALL_METHOD:
570
                        DECODE_UINT;
571
572
573
574
                        // 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));
575
576
                        break;

577
                    case MP_BC_RETURN_VALUE:
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
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--;
                        }
595
                        nlr_pop();
596
                        *sp_in_out = sp;
597
                        assert(exc_sp == exc_stack - 1);
598
                        return MP_VM_RETURN_NORMAL;
599

600
601
602
603
                    case MP_BC_RAISE_VARARGS:
                        unum = *ip++;
                        assert(unum == 1);
                        obj1 = POP();
604
                        nlr_jump(rt_make_raise_obj(obj1));
605

606
                    case MP_BC_YIELD_VALUE:
607
608
609
                        nlr_pop();
                        *ip_in_out = ip;
                        *sp_in_out = sp;
610
                        *exc_sp_in_out = MP_TAGPTR_MAKE(exc_sp, currently_in_except_block);
611
                        return MP_VM_RETURN_YIELD;
612

613
                    case MP_BC_IMPORT_NAME:
614
615
                        DECODE_QSTR;
                        obj1 = POP();
616
                        SET_TOP(rt_import_name(qst, obj1, TOP()));
617
618
                        break;

619
                    case MP_BC_IMPORT_FROM:
620
                        DECODE_QSTR;
621
                        obj1 = rt_import_from(TOP(), qst);
622
623
624
                        PUSH(obj1);
                        break;

625
                    case MP_BC_IMPORT_STAR:
626
                        rt_import_all(POP());
627
628
                        break;

629
                    default:
Damien's avatar
Damien committed
630
                        printf("code %p, byte code 0x%02x not implemented\n", ip, op);
631
632
                        assert(0);
                        nlr_pop();
633
                        return MP_VM_RETURN_NORMAL;
Damien's avatar
Damien committed
634
                }
635
636
637
638
639
            }

        } else {
            // exception occurred

640
            // set file and line number that the exception occurred at
641
642
            // TODO: don't set traceback for exceptions re-raised by END_FINALLY.
            // But consider how to handle nested exceptions.
643
            if (mp_obj_is_exception_instance(nlr.ret_val)) {
644
                machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24);
645
646
                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);
647
648
                machine_uint_t source_line = 1;
                machine_uint_t bc = save_ip - code_info - code_info_size;
649
                //printf("find %lu %d %d\n", bc, code_info[12], code_info[13]);
650
651
652
                for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) {
                    bc -= *ci & 31;
                    source_line += *ci >> 5;
653
                }
654
                mp_obj_exception_add_traceback(nlr.ret_val, source_file, source_line, block_name);
655
656
            }

657
658
659
            while (currently_in_except_block) {
                // nested exception

660
                assert(exc_sp >= exc_stack);
661
662
663
664
665

                // 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
666
                currently_in_except_block = MP_TAGPTR_TAG(exc_sp->val_sp); // restore previous state
667
                exc_sp--; // pop back to previous exception handler
668
669
            }

670
            if (exc_sp >= exc_stack) {
671
672
673
                // set flag to indicate that we are now handling an exception
                currently_in_except_block = 1;

674
                // catch exception and pass to byte code
675
                sp = MP_TAGPTR_PTR(exc_sp->val_sp);
676
                ip = exc_sp->handler;
Damien's avatar
Damien committed
677
                // push(traceback, exc-val, exc-type)
678
                PUSH(mp_const_none);
Damien's avatar
Damien committed
679
                PUSH(nlr.ret_val);
680
                PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
681

682
            } else {
683
684
685
686
                // propagate exception to higher level
                // TODO what to do about ip and sp? they don't really make sense at this point
                fastn[0] = nlr.ret_val; // must put exception here because sp is invalid
                return MP_VM_RETURN_EXCEPTION;
687
            }
Damien's avatar
Damien committed
688
689
690
        }
    }
}