vm.c 26.4 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_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) {
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
87
88
89
90
91
92
93
94
95
96
97
98
99
    mp_vm_return_kind_t vm_return_kind = mp_execute_byte_code_2(code, &ip, &state[n_state - 1], &sp);

    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;
100
101
102
    }
}

103
104
// 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
105
106
107
108
109
// 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]
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) {
Damien's avatar
Damien committed
110
111
    // careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think)

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

119
    volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions
120
121
    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
122
    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
123

124
    // outer exception handling loop
Damien's avatar
Damien committed
125
    for (;;) {
126
127
128
        if (nlr_push(&nlr) == 0) {
            // loop to execute byte code
            for (;;) {
129
dispatch_loop:
130
                save_ip = ip;
131
132
                int op = *ip++;
                switch (op) {
133
134
                    case MP_BC_LOAD_CONST_FALSE:
                        PUSH(mp_const_false);
135
136
                        break;

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

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

                    case MP_BC_LOAD_CONST_ELLIPSIS:
                        PUSH(mp_const_ellipsis);
                        break;
148

149
                    case MP_BC_LOAD_CONST_SMALL_INT:
Damien's avatar
Damien committed
150
                        unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000;
151
                        ip += 3;
152
                        PUSH(MP_OBJ_NEW_SMALL_INT(unum));
153
154
                        break;

155
156
                    case MP_BC_LOAD_CONST_INT:
                        DECODE_QSTR;
157
                        PUSH(mp_obj_new_int_from_long_str(qstr_str(qst)));
158
159
                        break;

160
                    case MP_BC_LOAD_CONST_DEC:
Damien's avatar
Damien committed
161
                        DECODE_QSTR;
162
                        PUSH(rt_load_const_dec(qst));
Damien's avatar
Damien committed
163
164
                        break;

165
                    case MP_BC_LOAD_CONST_ID:
166
                        DECODE_QSTR;
167
                        PUSH(rt_load_const_str(qst)); // TODO
168
169
                        break;

170
171
                    case MP_BC_LOAD_CONST_BYTES:
                        DECODE_QSTR;
172
                        PUSH(rt_load_const_bytes(qst));
173
174
                        break;

175
                    case MP_BC_LOAD_CONST_STRING:
176
                        DECODE_QSTR;
177
                        PUSH(rt_load_const_str(qst));
178
179
                        break;

180
                    case MP_BC_LOAD_FAST_0:
181
                        PUSH(fastn[0]);
182
183
                        break;

184
                    case MP_BC_LOAD_FAST_1:
185
                        PUSH(fastn[-1]);
186
187
                        break;

188
                    case MP_BC_LOAD_FAST_2:
189
                        PUSH(fastn[-2]);
190
191
                        break;

192
                    case MP_BC_LOAD_FAST_N:
193
                        DECODE_UINT;
194
                        PUSH(fastn[-unum]);
195
196
                        break;

197
                    case MP_BC_LOAD_DEREF:
Damien's avatar
Damien committed
198
                        DECODE_UINT;
199
                        PUSH(rt_get_cell(fastn[-unum]));
Damien's avatar
Damien committed
200
201
                        break;

202
                    case MP_BC_LOAD_NAME:
203
                        DECODE_QSTR;
204
                        PUSH(rt_load_name(qst));
205
206
                        break;

207
                    case MP_BC_LOAD_GLOBAL:
208
                        DECODE_QSTR;
209
                        PUSH(rt_load_global(qst));
210
211
                        break;

212
                    case MP_BC_LOAD_ATTR:
213
                        DECODE_QSTR;
214
                        SET_TOP(rt_load_attr(TOP(), qst));
215
216
                        break;

217
                    case MP_BC_LOAD_METHOD:
218
                        DECODE_QSTR;
219
                        rt_load_method(*sp, qst, sp);
220
                        sp += 1;
221
222
                        break;

223
                    case MP_BC_LOAD_BUILD_CLASS:
224
225
226
                        PUSH(rt_load_build_class());
                        break;

227
                    case MP_BC_STORE_FAST_0:
228
                        fastn[0] = POP();
229
230
                        break;

231
                    case MP_BC_STORE_FAST_1:
232
                        fastn[-1] = POP();
233
234
                        break;

235
                    case MP_BC_STORE_FAST_2:
236
                        fastn[-2] = POP();
237
238
                        break;

239
                    case MP_BC_STORE_FAST_N:
240
                        DECODE_UINT;
241
                        fastn[-unum] = POP();
242
243
                        break;

244
                    case MP_BC_STORE_DEREF:
Damien's avatar
Damien committed
245
                        DECODE_UINT;
246
                        rt_set_cell(fastn[-unum], POP());
Damien's avatar
Damien committed
247
248
                        break;

249
                    case MP_BC_STORE_NAME:
250
                        DECODE_QSTR;
251
                        rt_store_name(qst, POP());
252
253
                        break;

254
                    case MP_BC_STORE_GLOBAL:
255
                        DECODE_QSTR;
256
                        rt_store_global(qst, POP());
257
258
                        break;

259
                    case MP_BC_STORE_ATTR:
260
                        DECODE_QSTR;
261
                        rt_store_attr(sp[0], qst, sp[-1]);
262
                        sp -= 2;
263
264
                        break;

265
                    case MP_BC_STORE_SUBSCR:
266
267
                        rt_store_subscr(sp[-1], sp[0], sp[-2]);
                        sp -= 3;
268
269
                        break;

270
                    case MP_BC_DUP_TOP:
271
                        obj1 = TOP();
272
273
274
                        PUSH(obj1);
                        break;

275
                    case MP_BC_DUP_TOP_TWO:
276
277
278
                        sp += 2;
                        sp[0] = sp[-2];
                        sp[-1] = sp[-3];
279
280
                        break;

281
                    case MP_BC_POP_TOP:
282
                        sp -= 1;
283
284
                        break;

285
                    case MP_BC_ROT_TWO:
286
                        obj1 = sp[0];
287
288
                        sp[0] = sp[-1];
                        sp[-1] = obj1;
289
290
                        break;

291
                    case MP_BC_ROT_THREE:
292
                        obj1 = sp[0];
293
294
295
                        sp[0] = sp[-1];
                        sp[-1] = sp[-2];
                        sp[-2] = obj1;
296
297
                        break;

298
                    case MP_BC_JUMP:
Damien's avatar
Damien committed
299
300
                        DECODE_SLABEL;
                        ip += unum;
301
302
                        break;

303
                    case MP_BC_POP_JUMP_IF_TRUE:
Damien's avatar
Damien committed
304
                        DECODE_SLABEL;
305
                        if (rt_is_true(POP())) {
Damien's avatar
Damien committed
306
                            ip += unum;
307
308
309
                        }
                        break;

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

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

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

335
                        /* we are trying to get away without using this opcode
336
                    case MP_BC_SETUP_LOOP:
337
                        DECODE_UINT;
338
                        // push_block(MP_BC_SETUP_LOOP, ip + unum, sp)
339
340
341
                        break;
                        */

342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
                    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
365
366
                        break;

Damien's avatar
Damien committed
367
                    // matched against: POP_BLOCK or POP_EXCEPT (anything else?)
368
                    case MP_BC_SETUP_EXCEPT:
369
                    case MP_BC_SETUP_FINALLY:
Damien's avatar
Damien committed
370
                        DECODE_ULABEL; // except labels are always forward
371
372
373
374
                        ++exc_sp;
                        exc_sp->opcode = op;
                        exc_sp->handler = ip + unum;
                        exc_sp->val_sp = (((machine_uint_t)sp) | currently_in_except_block);
375
                        currently_in_except_block = 0; // in a try block now
376
377
                        break;

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

405
                    case MP_BC_GET_ITER:
406
                        SET_TOP(rt_getiter(TOP()));
407
408
                        break;

409
                    case MP_BC_FOR_ITER:
Damien's avatar
Damien committed
410
                        DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
411
                        obj1 = rt_iternext(TOP());
412
                        if (obj1 == mp_const_stop_iteration) {
413
                            --sp; // pop the exhausted iterator
Damien's avatar
Damien committed
414
                            ip += unum; // jump to after for-block
415
416
417
418
419
                        } else {
                            PUSH(obj1); // push the next iteration value
                        }
                        break;

Damien's avatar
Damien committed
420
                    // matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH
421
                    case MP_BC_POP_BLOCK:
Damien's avatar
Damien committed
422
423
                        // we are exiting an exception handler, so pop the last one of the exception-stack
                        assert(exc_sp >= &exc_stack[0]);
424
425
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
426
427
                        break;

428
                    // matched against: SETUP_EXCEPT
429
                    case MP_BC_POP_EXCEPT:
Damien's avatar
Damien committed
430
                        // TODO need to work out how blocks work etc
431
                        // 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
432
                        assert(exc_sp >= &exc_stack[0]);
433
                        assert(currently_in_except_block);
434
                        //sp = (mp_obj_t*)(*exc_sp--);
Damien's avatar
Damien committed
435
                        //exc_sp--; // discard ip
436
437
                        currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                        exc_sp--; // pop back to previous exception handler
438
                        //sp -= 3; // pop 3 exception values
439
440
                        break;

441
442
443
444
445
446
447
448
                    case MP_BC_NOT:
                        if (TOP() == mp_const_true) {
                            SET_TOP(mp_const_false);
                        } else {
                            SET_TOP(mp_const_true);
                        }
                        break;

449
                    case MP_BC_UNARY_OP:
Damien's avatar
Damien committed
450
                        unum = *ip++;
451
                        SET_TOP(rt_unary_op(unum, TOP()));
Damien's avatar
Damien committed
452
453
                        break;

454
                    case MP_BC_BINARY_OP:
455
456
                        unum = *ip++;
                        obj2 = POP();
457
458
                        obj1 = TOP();
                        SET_TOP(rt_binary_op(unum, obj1, obj2));
459
460
                        break;

461
                    case MP_BC_BUILD_TUPLE:
462
                        DECODE_UINT;
463
464
                        sp -= unum - 1;
                        SET_TOP(rt_build_tuple(unum, sp));
465
466
                        break;

467
                    case MP_BC_BUILD_LIST:
468
                        DECODE_UINT;
469
470
                        sp -= unum - 1;
                        SET_TOP(rt_build_list(unum, sp));
471
472
                        break;

473
                    case MP_BC_LIST_APPEND:
474
475
                        DECODE_UINT;
                        // I think it's guaranteed by the compiler that sp[unum] is a list
476
477
                        rt_list_append(sp[-unum], sp[0]);
                        sp--;
478
479
                        break;

480
                    case MP_BC_BUILD_MAP:
481
482
483
484
                        DECODE_UINT;
                        PUSH(rt_build_map(unum));
                        break;

485
                    case MP_BC_STORE_MAP:
486
487
                        sp -= 2;
                        rt_store_map(sp[0], sp[2], sp[1]);
488
489
                        break;

490
                    case MP_BC_MAP_ADD:
Damien's avatar
Damien committed
491
                        DECODE_UINT;
492
493
494
                        // 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
495
496
                        break;

497
                    case MP_BC_BUILD_SET:
498
                        DECODE_UINT;
499
500
                        sp -= unum - 1;
                        SET_TOP(rt_build_set(unum, sp));
501
502
                        break;

503
                    case MP_BC_SET_ADD:
Damien's avatar
Damien committed
504
                        DECODE_UINT;
505
506
507
                        // 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
508
509
                        break;

510
#if MICROPY_ENABLE_SLICE
511
512
513
514
515
516
517
518
519
520
521
                    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;
522
#endif
523

524
                    case MP_BC_UNPACK_SEQUENCE:
525
                        DECODE_UINT;
526
                        rt_unpack_sequence(sp[0], unum, sp);
527
                        sp += unum - 1;
528
529
                        break;

530
                    case MP_BC_MAKE_FUNCTION:
531
                        DECODE_UINT;
532
533
534
535
536
537
                        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()));
538
539
                        break;

540
                    case MP_BC_MAKE_CLOSURE:
Damien's avatar
Damien committed
541
                        DECODE_UINT;
542
                        SET_TOP(rt_make_closure_from_id(unum, TOP()));
Damien's avatar
Damien committed
543
544
                        break;

545
                    case MP_BC_CALL_FUNCTION:
546
                        DECODE_UINT;
547
548
549
550
                        // 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));
551
552
                        break;

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

561
                    case MP_BC_RETURN_VALUE:
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
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--;
                        }
579
                        nlr_pop();
580
                        *sp_in_out = sp;
581
                        assert(exc_sp == &exc_stack[0] - 1);
582
                        return MP_VM_RETURN_NORMAL;
583

584
585
586
587
                    case MP_BC_RAISE_VARARGS:
                        unum = *ip++;
                        assert(unum == 1);
                        obj1 = POP();
588
                        nlr_jump(rt_make_raise_obj(obj1));
589

590
                    case MP_BC_YIELD_VALUE:
591
592
593
                        nlr_pop();
                        *ip_in_out = ip;
                        *sp_in_out = sp;
594
                        return MP_VM_RETURN_YIELD;
595

596
                    case MP_BC_IMPORT_NAME:
597
598
                        DECODE_QSTR;
                        obj1 = POP();
599
                        SET_TOP(rt_import_name(qst, obj1, TOP()));
600
601
                        break;

602
                    case MP_BC_IMPORT_FROM:
603
                        DECODE_QSTR;
604
                        obj1 = rt_import_from(TOP(), qst);
605
606
607
                        PUSH(obj1);
                        break;

608
                    case MP_BC_IMPORT_STAR:
609
                        rt_import_all(POP());
610
611
                        break;

612
                    default:
Damien's avatar
Damien committed
613
                        printf("code %p, byte code 0x%02x not implemented\n", ip, op);
614
615
                        assert(0);
                        nlr_pop();
616
                        return MP_VM_RETURN_NORMAL;
Damien's avatar
Damien committed
617
                }
618
619
620
621
622
            }

        } else {
            // exception occurred

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

640
641
642
643
644
645
646
647
648
            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
649
650
                currently_in_except_block = (exc_sp->val_sp & 1); // restore previous state
                exc_sp--; // pop back to previous exception handler
651
652
            }

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

657
                // catch exception and pass to byte code
658
659
                sp = (mp_obj_t*)(exc_sp->val_sp & (~((machine_uint_t)1)));
                ip = exc_sp->handler;
Damien's avatar
Damien committed
660
                // push(traceback, exc-val, exc-type)
661
                PUSH(mp_const_none);
Damien's avatar
Damien committed
662
                PUSH(nlr.ret_val);
663
                PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
664

665
            } else {
666
667
668
669
                // 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;
670
            }
Damien's avatar
Damien committed
671
672
673
        }
    }
}