vm.c 26.6 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);
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
110
111
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,
                                           mp_exc_stack *exc_stack,
                                           mp_exc_stack **exc_sp_in_out) {
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
    volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions
122
    mp_exc_stack *volatile exc_sp = *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
128
129
        if (nlr_push(&nlr) == 0) {
            // loop to execute byte code
            for (;;) {
130
dispatch_loop:
131
                save_ip = ip;
132
133
                int op = *ip++;
                switch (op) {
134
135
                    case MP_BC_LOAD_CONST_FALSE:
                        PUSH(mp_const_false);
136
137
                        break;

138
139
                    case MP_BC_LOAD_CONST_NONE:
                        PUSH(mp_const_none);
140
141
                        break;

142
143
                    case MP_BC_LOAD_CONST_TRUE:
                        PUSH(mp_const_true);
144
                        break;
Damien George's avatar
Damien George committed
145
146
147
148

                    case MP_BC_LOAD_CONST_ELLIPSIS:
                        PUSH(mp_const_ellipsis);
                        break;
149

150
                    case MP_BC_LOAD_CONST_SMALL_INT: {
151
                        machine_int_t num = 0;
152
153
154
155
156
157
158
159
                        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));
160
                        break;
161
                    }
162

163
164
                    case MP_BC_LOAD_CONST_INT:
                        DECODE_QSTR;
165
                        PUSH(mp_obj_new_int_from_long_str(qstr_str(qst)));
166
167
                        break;

168
                    case MP_BC_LOAD_CONST_DEC:
Damien's avatar
Damien committed
169
                        DECODE_QSTR;
170
                        PUSH(rt_load_const_dec(qst));
Damien's avatar
Damien committed
171
172
                        break;

173
                    case MP_BC_LOAD_CONST_ID:
174
                        DECODE_QSTR;
175
                        PUSH(rt_load_const_str(qst)); // TODO
176
177
                        break;

178
179
                    case MP_BC_LOAD_CONST_BYTES:
                        DECODE_QSTR;
180
                        PUSH(rt_load_const_bytes(qst));
181
182
                        break;

183
                    case MP_BC_LOAD_CONST_STRING:
184
                        DECODE_QSTR;
185
                        PUSH(rt_load_const_str(qst));
186
187
                        break;

188
                    case MP_BC_LOAD_FAST_0:
189
                        PUSH(fastn[0]);
190
191
                        break;

192
                    case MP_BC_LOAD_FAST_1:
193
                        PUSH(fastn[-1]);
194
195
                        break;

196
                    case MP_BC_LOAD_FAST_2:
197
                        PUSH(fastn[-2]);
198
199
                        break;

200
                    case MP_BC_LOAD_FAST_N:
201
                        DECODE_UINT;
202
                        PUSH(fastn[-unum]);
203
204
                        break;

205
                    case MP_BC_LOAD_DEREF:
Damien's avatar
Damien committed
206
                        DECODE_UINT;
207
                        PUSH(rt_get_cell(fastn[-unum]));
Damien's avatar
Damien committed
208
209
                        break;

210
                    case MP_BC_LOAD_NAME:
211
                        DECODE_QSTR;
212
                        PUSH(rt_load_name(qst));
213
214
                        break;

215
                    case MP_BC_LOAD_GLOBAL:
216
                        DECODE_QSTR;
217
                        PUSH(rt_load_global(qst));
218
219
                        break;

220
                    case MP_BC_LOAD_ATTR:
221
                        DECODE_QSTR;
222
                        SET_TOP(rt_load_attr(TOP(), qst));
223
224
                        break;

225
                    case MP_BC_LOAD_METHOD:
226
                        DECODE_QSTR;
227
                        rt_load_method(*sp, qst, sp);
228
                        sp += 1;
229
230
                        break;

231
                    case MP_BC_LOAD_BUILD_CLASS:
232
233
234
                        PUSH(rt_load_build_class());
                        break;

235
                    case MP_BC_STORE_FAST_0:
236
                        fastn[0] = POP();
237
238
                        break;

239
                    case MP_BC_STORE_FAST_1:
240
                        fastn[-1] = POP();
241
242
                        break;

243
                    case MP_BC_STORE_FAST_2:
244
                        fastn[-2] = POP();
245
246
                        break;

247
                    case MP_BC_STORE_FAST_N:
248
                        DECODE_UINT;
249
                        fastn[-unum] = POP();
250
251
                        break;

252
                    case MP_BC_STORE_DEREF:
Damien's avatar
Damien committed
253
                        DECODE_UINT;
254
                        rt_set_cell(fastn[-unum], POP());
Damien's avatar
Damien committed
255
256
                        break;

257
                    case MP_BC_STORE_NAME:
258
                        DECODE_QSTR;
259
                        rt_store_name(qst, POP());
260
261
                        break;

262
                    case MP_BC_STORE_GLOBAL:
263
                        DECODE_QSTR;
264
                        rt_store_global(qst, POP());
265
266
                        break;

267
                    case MP_BC_STORE_ATTR:
268
                        DECODE_QSTR;
269
                        rt_store_attr(sp[0], qst, sp[-1]);
270
                        sp -= 2;
271
272
                        break;

273
                    case MP_BC_STORE_SUBSCR:
274
275
                        rt_store_subscr(sp[-1], sp[0], sp[-2]);
                        sp -= 3;
276
277
                        break;

278
                    case MP_BC_DUP_TOP:
279
                        obj1 = TOP();
280
281
282
                        PUSH(obj1);
                        break;

283
                    case MP_BC_DUP_TOP_TWO:
284
285
286
                        sp += 2;
                        sp[0] = sp[-2];
                        sp[-1] = sp[-3];
287
288
                        break;

289
                    case MP_BC_POP_TOP:
290
                        sp -= 1;
291
292
                        break;

293
                    case MP_BC_ROT_TWO:
294
                        obj1 = sp[0];
295
296
                        sp[0] = sp[-1];
                        sp[-1] = obj1;
297
298
                        break;

299
                    case MP_BC_ROT_THREE:
300
                        obj1 = sp[0];
301
302
303
                        sp[0] = sp[-1];
                        sp[-1] = sp[-2];
                        sp[-2] = obj1;
304
305
                        break;

306
                    case MP_BC_JUMP:
Damien's avatar
Damien committed
307
308
                        DECODE_SLABEL;
                        ip += unum;
309
310
                        break;

311
                    case MP_BC_POP_JUMP_IF_TRUE:
Damien's avatar
Damien committed
312
                        DECODE_SLABEL;
313
                        if (rt_is_true(POP())) {
Damien's avatar
Damien committed
314
                            ip += unum;
315
316
317
                        }
                        break;

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

325
                    case MP_BC_JUMP_IF_TRUE_OR_POP:
Damien's avatar
Damien committed
326
                        DECODE_SLABEL;
327
                        if (rt_is_true(TOP())) {
Damien's avatar
Damien committed
328
329
                            ip += unum;
                        } else {
330
                            sp--;
Damien's avatar
Damien committed
331
332
333
                        }
                        break;

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

343
                        /* we are trying to get away without using this opcode
344
                    case MP_BC_SETUP_LOOP:
345
                        DECODE_UINT;
346
                        // push_block(MP_BC_SETUP_LOOP, ip + unum, sp)
347
348
349
                        break;
                        */

350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
                    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
373
374
                        break;

Damien's avatar
Damien committed
375
                    // matched against: POP_BLOCK or POP_EXCEPT (anything else?)
376
                    case MP_BC_SETUP_EXCEPT:
377
                    case MP_BC_SETUP_FINALLY:
Damien's avatar
Damien committed
378
                        DECODE_ULABEL; // except labels are always forward
379
380
381
382
                        ++exc_sp;
                        exc_sp->opcode = op;
                        exc_sp->handler = ip + unum;
                        exc_sp->val_sp = (((machine_uint_t)sp) | currently_in_except_block);
383
                        currently_in_except_block = 0; // in a try block now
384
385
                        break;

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

413
                    case MP_BC_GET_ITER:
414
                        SET_TOP(rt_getiter(TOP()));
415
416
                        break;

417
                    case MP_BC_FOR_ITER:
Damien's avatar
Damien committed
418
                        DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
419
                        obj1 = rt_iternext(TOP());
420
                        if (obj1 == mp_const_stop_iteration) {
421
                            --sp; // pop the exhausted iterator
Damien's avatar
Damien committed
422
                            ip += unum; // jump to after for-block
423
424
425
426
427
                        } else {
                            PUSH(obj1); // push the next iteration value
                        }
                        break;

Damien's avatar
Damien committed
428
                    // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH
429
                    case MP_BC_POP_BLOCK:
Damien's avatar
Damien committed
430
                        // we are exiting an exception handler, so pop the last one of the exception-stack
431
                        assert(exc_sp >= exc_stack);
432
433
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
434
435
                        break;

436
                    // matched against: SETUP_EXCEPT
437
                    case MP_BC_POP_EXCEPT:
Damien's avatar
Damien committed
438
                        // TODO need to work out how blocks work etc
439
                        // pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate
440
                        assert(exc_sp >= exc_stack);
441
                        assert(currently_in_except_block);
442
                        //sp = (mp_obj_t*)(*exc_sp--);
Damien's avatar
Damien committed
443
                        //exc_sp--; // discard ip
444
445
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
446
                        //sp -= 3; // pop 3 exception values
447
448
                        break;

449
450
451
452
453
454
455
456
                    case MP_BC_NOT:
                        if (TOP() == mp_const_true) {
                            SET_TOP(mp_const_false);
                        } else {
                            SET_TOP(mp_const_true);
                        }
                        break;

457
                    case MP_BC_UNARY_OP:
Damien's avatar
Damien committed
458
                        unum = *ip++;
459
                        SET_TOP(rt_unary_op(unum, TOP()));
Damien's avatar
Damien committed
460
461
                        break;

462
                    case MP_BC_BINARY_OP:
463
464
                        unum = *ip++;
                        obj2 = POP();
465
466
                        obj1 = TOP();
                        SET_TOP(rt_binary_op(unum, obj1, obj2));
467
468
                        break;

469
                    case MP_BC_BUILD_TUPLE:
470
                        DECODE_UINT;
471
472
                        sp -= unum - 1;
                        SET_TOP(rt_build_tuple(unum, sp));
473
474
                        break;

475
                    case MP_BC_BUILD_LIST:
476
                        DECODE_UINT;
477
478
                        sp -= unum - 1;
                        SET_TOP(rt_build_list(unum, sp));
479
480
                        break;

481
                    case MP_BC_LIST_APPEND:
482
483
                        DECODE_UINT;
                        // I think it's guaranteed by the compiler that sp[unum] is a list
484
485
                        rt_list_append(sp[-unum], sp[0]);
                        sp--;
486
487
                        break;

488
                    case MP_BC_BUILD_MAP:
489
490
491
492
                        DECODE_UINT;
                        PUSH(rt_build_map(unum));
                        break;

493
                    case MP_BC_STORE_MAP:
494
495
                        sp -= 2;
                        rt_store_map(sp[0], sp[2], sp[1]);
496
497
                        break;

498
                    case MP_BC_MAP_ADD:
Damien's avatar
Damien committed
499
                        DECODE_UINT;
500
501
502
                        // 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
503
504
                        break;

505
                    case MP_BC_BUILD_SET:
506
                        DECODE_UINT;
507
508
                        sp -= unum - 1;
                        SET_TOP(rt_build_set(unum, sp));
509
510
                        break;

511
                    case MP_BC_SET_ADD:
Damien's avatar
Damien committed
512
                        DECODE_UINT;
513
514
515
                        // 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
516
517
                        break;

518
#if MICROPY_ENABLE_SLICE
519
520
521
522
523
524
525
526
527
528
529
                    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;
530
#endif
531

532
                    case MP_BC_UNPACK_SEQUENCE:
533
                        DECODE_UINT;
534
                        rt_unpack_sequence(sp[0], unum, sp);
535
                        sp += unum - 1;
536
537
                        break;

538
                    case MP_BC_MAKE_FUNCTION:
539
                        DECODE_UINT;
540
541
542
543
544
545
                        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()));
546
547
                        break;

548
                    case MP_BC_MAKE_CLOSURE:
Damien's avatar
Damien committed
549
                        DECODE_UINT;
550
                        SET_TOP(rt_make_closure_from_id(unum, TOP()));
Damien's avatar
Damien committed
551
552
                        break;

553
                    case MP_BC_CALL_FUNCTION:
554
                        DECODE_UINT;
555
556
557
558
                        // 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));
559
560
                        break;

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

569
                    case MP_BC_RETURN_VALUE:
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
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--;
                        }
587
                        nlr_pop();
588
                        *sp_in_out = sp;
589
                        assert(exc_sp == exc_stack - 1);
590
                        return MP_VM_RETURN_NORMAL;
591

592
593
594
595
                    case MP_BC_RAISE_VARARGS:
                        unum = *ip++;
                        assert(unum == 1);
                        obj1 = POP();
596
                        nlr_jump(rt_make_raise_obj(obj1));
597

598
                    case MP_BC_YIELD_VALUE:
599
600
601
                        nlr_pop();
                        *ip_in_out = ip;
                        *sp_in_out = sp;
602
                        *exc_sp_in_out = exc_sp;
603
                        return MP_VM_RETURN_YIELD;
604

605
                    case MP_BC_IMPORT_NAME:
606
607
                        DECODE_QSTR;
                        obj1 = POP();
608
                        SET_TOP(rt_import_name(qst, obj1, TOP()));
609
610
                        break;

611
                    case MP_BC_IMPORT_FROM:
612
                        DECODE_QSTR;
613
                        obj1 = rt_import_from(TOP(), qst);
614
615
616
                        PUSH(obj1);
                        break;

617
                    case MP_BC_IMPORT_STAR:
618
                        rt_import_all(POP());
619
620
                        break;

621
                    default:
Damien's avatar
Damien committed
622
                        printf("code %p, byte code 0x%02x not implemented\n", ip, op);
623
624
                        assert(0);
                        nlr_pop();
625
                        return MP_VM_RETURN_NORMAL;
Damien's avatar
Damien committed
626
                }
627
628
629
630
631
            }

        } else {
            // exception occurred

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

649
650
651
            while (currently_in_except_block) {
                // nested exception

652
                assert(exc_sp >= exc_stack);
653
654
655
656
657

                // 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
658
659
                currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                exc_sp--; // pop back to previous exception handler
660
661
            }

662
            if (exc_sp >= exc_stack) {
663
664
665
                // set flag to indicate that we are now handling an exception
                currently_in_except_block = 1;

666
                // catch exception and pass to byte code
667
668
                sp = (mp_obj_t*)(exc_sp->val_sp & (~((machine_uint_t)1)));
                ip = exc_sp->handler;
Damien's avatar
Damien committed
669
                // push(traceback, exc-val, exc-type)
670
                PUSH(mp_const_none);
Damien's avatar
Damien committed
671
                PUSH(nlr.ret_val);
672
                PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
673

674
            } else {
675
676
677
678
                // 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;
679
            }
Damien's avatar
Damien committed
680
681
682
        }
    }
}