2013-10-04 14:53:11 -04:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
#include "nlr.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
#include "misc.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
#include "mpconfig.h"
|
|
|
|
#include "obj.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
#include "runtime.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
#include "bc0.h"
|
2013-10-10 17:06:54 -04:00
|
|
|
#include "bc.h"
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2013-10-16 15:39:12 -04:00
|
|
|
// (value) stack grows down (to be compatible with native code when passing pointers to the stack), top element is pointed to
|
|
|
|
// exception stack grows up, top element is pointed to
|
|
|
|
|
2013-10-04 14:53:11 -04:00
|
|
|
#define DECODE_UINT do { unum = *ip++; if (unum > 127) { unum = ((unum & 0x3f) << 8) | (*ip++); } } while (0)
|
2013-11-05 17:06:08 -05:00
|
|
|
#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)
|
2013-10-04 14:53:11 -04:00
|
|
|
#define DECODE_QSTR do { qstr = *ip++; if (qstr > 127) { qstr = ((qstr & 0x3f) << 8) | (*ip++); } } while (0)
|
|
|
|
#define PUSH(val) *--sp = (val)
|
|
|
|
#define POP() (*sp++)
|
2013-12-10 12:27:24 -05:00
|
|
|
#define TOP() (*sp)
|
|
|
|
#define SET_TOP(val) *sp = (val)
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2013-10-09 18:10:10 -04:00
|
|
|
// args are in reverse order in array
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t mp_execute_byte_code(const byte *code, const mp_obj_t *args, uint n_args, uint n_state) {
|
|
|
|
mp_obj_t temp_state[10]; // TODO allocate properly
|
|
|
|
mp_obj_t *state = &temp_state[0];
|
|
|
|
mp_obj_t *sp = &state[10];
|
2013-11-05 17:16:22 -05:00
|
|
|
if (n_state > 10) {
|
2013-12-21 13:17:45 -05:00
|
|
|
state = m_new(mp_obj_t, n_state);
|
2013-11-05 17:16:22 -05:00
|
|
|
sp = &state[n_state];
|
|
|
|
}
|
2013-10-16 15:39:12 -04:00
|
|
|
// init args
|
|
|
|
for (int i = 0; i < n_args; i++) {
|
|
|
|
assert(i < 8);
|
|
|
|
state[i] = args[n_args - 1 - i];
|
|
|
|
}
|
|
|
|
const byte *ip = code;
|
2013-12-30 17:32:17 -05:00
|
|
|
|
|
|
|
// execute prelude to make any cells (closed over variables)
|
|
|
|
{
|
|
|
|
for (uint n_local = *ip++; n_local > 0; n_local--) {
|
|
|
|
uint local_num = *ip++;
|
|
|
|
if (local_num < n_args) {
|
|
|
|
state[local_num] = mp_obj_new_cell(state[local_num]);
|
|
|
|
} else {
|
|
|
|
state[local_num] = mp_obj_new_cell(MP_OBJ_NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// execute the byte code
|
2013-12-21 13:17:45 -05:00
|
|
|
if (mp_execute_byte_code_2(&ip, &state[0], &sp)) {
|
2013-10-16 15:39:12 -04:00
|
|
|
// it shouldn't yield
|
|
|
|
assert(0);
|
|
|
|
}
|
2013-12-30 17:32:17 -05:00
|
|
|
|
2013-11-02 10:33:10 -04:00
|
|
|
// TODO check fails if, eg, return from within for loop
|
|
|
|
//assert(sp == &state[17]);
|
2013-10-16 15:39:12 -04:00
|
|
|
return *sp;
|
|
|
|
}
|
|
|
|
|
|
|
|
// fastn has items in normal order
|
|
|
|
// sp points to top of stack which grows down
|
2013-12-21 13:17:45 -05:00
|
|
|
bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **sp_in_out) {
|
2013-10-15 18:46:01 -04:00
|
|
|
// careful: be sure to declare volatile any variables read in the exception handler (written is ok, I think)
|
|
|
|
|
2013-10-16 15:39:12 -04:00
|
|
|
const byte *ip = *ip_in_out;
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t *sp = *sp_in_out;
|
2013-10-04 14:53:11 -04:00
|
|
|
machine_uint_t unum;
|
|
|
|
qstr qstr;
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_t obj1, obj2;
|
|
|
|
mp_obj_t fast0 = fastn[0], fast1 = fastn[1], fast2 = fastn[2];
|
2013-10-15 17:25:17 -04:00
|
|
|
nlr_buf_t nlr;
|
2013-10-04 14:53:11 -04:00
|
|
|
|
2013-12-29 11:54:59 -05:00
|
|
|
volatile machine_uint_t currently_in_except_block = 0; // 0 or 1, to detect nested exceptions
|
|
|
|
machine_uint_t exc_stack[8]; // on the exception stack we store (ip, sp | X) for each block, X = previous value of currently_in_except_block
|
2013-10-15 18:46:01 -04:00
|
|
|
machine_uint_t *volatile exc_sp = &exc_stack[-1]; // stack grows up, exc_sp points to top of stack
|
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
// outer exception handling loop
|
2013-10-04 14:53:11 -04:00
|
|
|
for (;;) {
|
2013-10-15 17:25:17 -04:00
|
|
|
if (nlr_push(&nlr) == 0) {
|
|
|
|
// loop to execute byte code
|
|
|
|
for (;;) {
|
|
|
|
int op = *ip++;
|
|
|
|
switch (op) {
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_FALSE:
|
|
|
|
PUSH(mp_const_false);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_NONE:
|
|
|
|
PUSH(mp_const_none);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_TRUE:
|
|
|
|
PUSH(mp_const_true);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_SMALL_INT:
|
2013-11-05 17:06:08 -05:00
|
|
|
unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000;
|
2013-11-04 18:04:50 -05:00
|
|
|
ip += 3;
|
2013-12-21 13:17:45 -05:00
|
|
|
PUSH((mp_obj_t)(unum << 1 | 1));
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_DEC:
|
2013-11-02 15:47:57 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
PUSH(rt_load_const_dec(qstr));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_ID:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
PUSH(rt_load_const_str(qstr)); // TODO
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_CONST_STRING:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
PUSH(rt_load_const_str(qstr));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_FAST_0:
|
2013-10-15 17:25:17 -04:00
|
|
|
PUSH(fast0);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_FAST_1:
|
2013-10-15 17:25:17 -04:00
|
|
|
PUSH(fast1);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_FAST_2:
|
2013-10-15 17:25:17 -04:00
|
|
|
PUSH(fast2);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_FAST_N:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
2013-10-16 15:39:12 -04:00
|
|
|
PUSH(fastn[unum]);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_DEREF:
|
2013-12-10 19:41:43 -05:00
|
|
|
DECODE_UINT;
|
2013-12-17 13:27:24 -05:00
|
|
|
PUSH(rt_get_cell(fastn[unum]));
|
2013-12-10 19:41:43 -05:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_NAME:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
PUSH(rt_load_name(qstr));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_GLOBAL:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
PUSH(rt_load_global(qstr));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_ATTR:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(rt_load_attr(TOP(), qstr));
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_METHOD:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
sp -= 1;
|
|
|
|
rt_load_method(sp[1], qstr, sp);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LOAD_BUILD_CLASS:
|
2013-10-15 17:25:17 -04:00
|
|
|
PUSH(rt_load_build_class());
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_FAST_0:
|
2013-10-15 17:25:17 -04:00
|
|
|
fast0 = POP();
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_FAST_1:
|
2013-10-15 17:25:17 -04:00
|
|
|
fast1 = POP();
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_FAST_2:
|
2013-10-15 17:25:17 -04:00
|
|
|
fast2 = POP();
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_FAST_N:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
2013-10-16 15:39:12 -04:00
|
|
|
fastn[unum] = POP();
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_DEREF:
|
2013-12-10 19:41:43 -05:00
|
|
|
DECODE_UINT;
|
2013-12-17 13:27:24 -05:00
|
|
|
rt_set_cell(fastn[unum], POP());
|
2013-12-10 19:41:43 -05:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_NAME:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
rt_store_name(qstr, POP());
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_GLOBAL:
|
2013-11-04 18:04:50 -05:00
|
|
|
DECODE_QSTR;
|
|
|
|
rt_store_global(qstr, POP());
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_ATTR:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_QSTR;
|
|
|
|
rt_store_attr(sp[0], qstr, sp[1]);
|
|
|
|
sp += 2;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_SUBSCR:
|
2013-10-15 17:25:17 -04:00
|
|
|
rt_store_subscr(sp[1], sp[0], sp[2]);
|
|
|
|
sp += 3;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_DUP_TOP:
|
2013-12-10 12:27:24 -05:00
|
|
|
obj1 = TOP();
|
2013-10-15 17:25:17 -04:00
|
|
|
PUSH(obj1);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_DUP_TOP_TWO:
|
2013-10-15 17:25:17 -04:00
|
|
|
sp -= 2;
|
|
|
|
sp[0] = sp[2];
|
|
|
|
sp[1] = sp[3];
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_POP_TOP:
|
2013-10-15 17:25:17 -04:00
|
|
|
++sp;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_ROT_TWO:
|
2013-11-02 10:33:10 -04:00
|
|
|
obj1 = sp[0];
|
|
|
|
sp[0] = sp[1];
|
|
|
|
sp[1] = obj1;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_ROT_THREE:
|
2013-10-15 17:25:17 -04:00
|
|
|
obj1 = sp[0];
|
|
|
|
sp[0] = sp[1];
|
|
|
|
sp[1] = sp[2];
|
|
|
|
sp[2] = obj1;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_JUMP:
|
2013-11-05 17:06:08 -05:00
|
|
|
DECODE_SLABEL;
|
|
|
|
ip += unum;
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_POP_JUMP_IF_TRUE:
|
2013-11-05 17:06:08 -05:00
|
|
|
DECODE_SLABEL;
|
2013-10-15 17:25:17 -04:00
|
|
|
if (rt_is_true(POP())) {
|
2013-11-05 17:06:08 -05:00
|
|
|
ip += unum;
|
2013-10-15 17:25:17 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_POP_JUMP_IF_FALSE:
|
2013-11-05 17:06:08 -05:00
|
|
|
DECODE_SLABEL;
|
2013-10-15 17:25:17 -04:00
|
|
|
if (!rt_is_true(POP())) {
|
2013-11-05 17:06:08 -05:00
|
|
|
ip += unum;
|
2013-10-15 17:25:17 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_JUMP_IF_TRUE_OR_POP:
|
2013-11-09 15:12:32 -05:00
|
|
|
DECODE_SLABEL;
|
2013-12-10 12:27:24 -05:00
|
|
|
if (rt_is_true(TOP())) {
|
2013-11-09 15:12:32 -05:00
|
|
|
ip += unum;
|
|
|
|
} else {
|
|
|
|
sp++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_JUMP_IF_FALSE_OR_POP:
|
2013-11-09 15:12:32 -05:00
|
|
|
DECODE_SLABEL;
|
2013-12-10 12:27:24 -05:00
|
|
|
if (rt_is_true(TOP())) {
|
2013-11-09 15:12:32 -05:00
|
|
|
sp++;
|
|
|
|
} else {
|
|
|
|
ip += unum;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
/* we are trying to get away without using this opcode
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_SETUP_LOOP:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
2013-12-21 13:17:45 -05:00
|
|
|
// push_block(MP_BC_SETUP_LOOP, ip + unum, sp)
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
*/
|
|
|
|
|
2013-12-29 13:48:37 -05:00
|
|
|
// matched against: POP_BLOCK or POP_EXCEPT (anything else?)
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_SETUP_EXCEPT:
|
2013-11-05 17:06:08 -05:00
|
|
|
DECODE_ULABEL; // except labels are always forward
|
|
|
|
*++exc_sp = (machine_uint_t)ip + unum;
|
2013-12-29 11:54:59 -05:00
|
|
|
*++exc_sp = (((machine_uint_t)sp) | currently_in_except_block);
|
|
|
|
currently_in_except_block = 0; // in a try block now
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_END_FINALLY:
|
2013-10-15 17:25:17 -04:00
|
|
|
// not implemented
|
|
|
|
// if TOS is an exception, reraises the exception (3 values on TOS)
|
|
|
|
// if TOS is an integer, does something else
|
|
|
|
// if TOS is None, just pops it and continues
|
|
|
|
// else error
|
|
|
|
assert(0);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_GET_ITER:
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(rt_getiter(TOP()));
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_FOR_ITER:
|
2013-11-05 17:06:08 -05:00
|
|
|
DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
|
2013-12-10 12:27:24 -05:00
|
|
|
obj1 = rt_iternext(TOP());
|
2013-12-21 13:17:45 -05:00
|
|
|
if (obj1 == mp_const_stop_iteration) {
|
2013-10-15 17:25:17 -04:00
|
|
|
++sp; // pop the exhausted iterator
|
2013-11-05 17:06:08 -05:00
|
|
|
ip += unum; // jump to after for-block
|
2013-10-15 17:25:17 -04:00
|
|
|
} else {
|
|
|
|
PUSH(obj1); // push the next iteration value
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2013-12-29 13:48:37 -05:00
|
|
|
// matched against: SETUP_EXCEPT, SETUP_FINALLY, SETUP_WITH
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_POP_BLOCK:
|
2013-12-29 13:48:37 -05:00
|
|
|
// we are exiting an exception handler, so pop the last one of the exception-stack
|
|
|
|
assert(exc_sp >= &exc_stack[0]);
|
|
|
|
currently_in_except_block = (exc_sp[0] & 1); // restore previous state
|
|
|
|
exc_sp -= 2; // pop back to previous exception handler
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-29 13:48:37 -05:00
|
|
|
// matched againts: SETUP_EXCEPT
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_POP_EXCEPT:
|
2013-10-15 18:46:01 -04:00
|
|
|
// TODO need to work out how blocks work etc
|
2013-10-15 17:25:17 -04:00
|
|
|
// pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate
|
2013-10-15 18:46:01 -04:00
|
|
|
assert(exc_sp >= &exc_stack[0]);
|
2013-12-21 13:17:45 -05:00
|
|
|
//sp = (mp_obj_t*)(*exc_sp--);
|
2013-10-15 18:46:01 -04:00
|
|
|
//exc_sp--; // discard ip
|
2013-12-29 11:54:59 -05:00
|
|
|
currently_in_except_block = (exc_sp[0] & 1); // restore previous state
|
|
|
|
exc_sp -= 2; // pop back to previous exception handler
|
2013-10-15 18:46:01 -04:00
|
|
|
//sp += 3; // pop 3 exception values
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_UNARY_OP:
|
2013-11-02 15:47:57 -04:00
|
|
|
unum = *ip++;
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(rt_unary_op(unum, TOP()));
|
2013-11-02 15:47:57 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_BINARY_OP:
|
2013-10-15 17:25:17 -04:00
|
|
|
unum = *ip++;
|
|
|
|
obj2 = POP();
|
2013-12-10 12:27:24 -05:00
|
|
|
obj1 = TOP();
|
|
|
|
SET_TOP(rt_binary_op(unum, obj1, obj2));
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_COMPARE_OP:
|
2013-10-15 17:25:17 -04:00
|
|
|
unum = *ip++;
|
|
|
|
obj2 = POP();
|
2013-12-10 12:27:24 -05:00
|
|
|
obj1 = TOP();
|
|
|
|
SET_TOP(rt_compare_op(unum, obj1, obj2));
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_BUILD_TUPLE:
|
2013-10-16 11:12:52 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
obj1 = rt_build_tuple(unum, sp);
|
|
|
|
sp += unum - 1;
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(obj1);
|
2013-10-16 11:12:52 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_BUILD_LIST:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
obj1 = rt_build_list(unum, sp);
|
|
|
|
sp += unum - 1;
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(obj1);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_LIST_APPEND:
|
2013-10-16 11:12:52 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
// I think it's guaranteed by the compiler that sp[unum] is a list
|
|
|
|
rt_list_append(sp[unum], sp[0]);
|
|
|
|
sp++;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_BUILD_MAP:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
PUSH(rt_build_map(unum));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_STORE_MAP:
|
2013-10-15 17:25:17 -04:00
|
|
|
sp += 2;
|
|
|
|
rt_store_map(sp[0], sp[-2], sp[-1]);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_MAP_ADD:
|
2013-10-16 15:54:01 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
// 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;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_BUILD_SET:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
obj1 = rt_build_set(unum, sp);
|
|
|
|
sp += unum - 1;
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(obj1);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_SET_ADD:
|
2013-10-16 15:57:49 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
// I think it's guaranteed by the compiler that sp[unum] is a set
|
|
|
|
rt_store_set(sp[unum], sp[0]);
|
|
|
|
sp++;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_UNPACK_SEQUENCE:
|
2013-11-26 10:15:50 -05:00
|
|
|
DECODE_UINT;
|
|
|
|
rt_unpack_sequence(sp[0], unum, sp - unum + 1);
|
|
|
|
sp -= unum - 1;
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_MAKE_FUNCTION:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
PUSH(rt_make_function_from_id(unum));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_MAKE_CLOSURE:
|
2013-12-10 19:41:43 -05:00
|
|
|
DECODE_UINT;
|
|
|
|
obj1 = POP();
|
|
|
|
PUSH(rt_make_closure_from_id(unum, obj1));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_CALL_FUNCTION:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
|
|
|
assert((unum & 0xff00) == 0); // n_keyword
|
|
|
|
unum &= 0xff; // n_positional
|
|
|
|
sp += unum;
|
|
|
|
*sp = rt_call_function_n(*sp, unum, sp - unum);
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_CALL_METHOD:
|
2013-10-15 17:25:17 -04:00
|
|
|
DECODE_UINT;
|
2013-11-26 10:15:50 -05:00
|
|
|
if ((unum & 0xff00) == 0) {
|
|
|
|
// no keywords
|
|
|
|
unum &= 0xff;
|
|
|
|
obj1 = rt_call_method_n(unum, sp);
|
|
|
|
sp += unum + 1;
|
|
|
|
} else {
|
|
|
|
// keywords
|
|
|
|
obj1 = rt_call_method_n_kw(unum & 0xff, (unum >> 8) & 0xff, sp);
|
|
|
|
sp += (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1;
|
|
|
|
}
|
2013-12-10 12:27:24 -05:00
|
|
|
SET_TOP(obj1);
|
2013-10-15 17:25:17 -04:00
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_RETURN_VALUE:
|
2013-10-15 17:25:17 -04:00
|
|
|
nlr_pop();
|
2013-10-16 15:39:12 -04:00
|
|
|
*sp_in_out = sp;
|
2013-10-15 18:46:01 -04:00
|
|
|
assert(exc_sp == &exc_stack[-1]);
|
2013-10-16 15:39:12 -04:00
|
|
|
return false;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_YIELD_VALUE:
|
2013-10-16 15:39:12 -04:00
|
|
|
nlr_pop();
|
|
|
|
*ip_in_out = ip;
|
|
|
|
fastn[0] = fast0;
|
|
|
|
fastn[1] = fast1;
|
|
|
|
fastn[2] = fast2;
|
|
|
|
*sp_in_out = sp;
|
|
|
|
return true;
|
2013-10-15 17:25:17 -04:00
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_IMPORT_NAME:
|
2013-12-10 12:27:24 -05:00
|
|
|
DECODE_QSTR;
|
|
|
|
obj1 = POP();
|
|
|
|
SET_TOP(rt_import_name(qstr, obj1, TOP()));
|
|
|
|
break;
|
|
|
|
|
2013-12-21 13:17:45 -05:00
|
|
|
case MP_BC_IMPORT_FROM:
|
2013-12-10 12:27:24 -05:00
|
|
|
DECODE_QSTR;
|
|
|
|
obj1 = rt_import_from(TOP(), qstr);
|
|
|
|
PUSH(obj1);
|
|
|
|
break;
|
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
default:
|
2013-11-05 17:06:08 -05:00
|
|
|
printf("code %p, byte code 0x%02x not implemented\n", ip, op);
|
2013-10-15 17:25:17 -04:00
|
|
|
assert(0);
|
|
|
|
nlr_pop();
|
2013-10-16 15:39:12 -04:00
|
|
|
return false;
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
2013-10-15 17:25:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
// exception occurred
|
|
|
|
|
2013-12-29 11:54:59 -05:00
|
|
|
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
|
|
|
|
currently_in_except_block = (exc_sp[0] & 1); // restore previous state
|
|
|
|
exc_sp -= 2; // pop back to previous exception handler
|
|
|
|
}
|
|
|
|
|
2013-10-15 18:46:01 -04:00
|
|
|
if (exc_sp >= &exc_stack[0]) {
|
2013-12-29 11:54:59 -05:00
|
|
|
// set flag to indicate that we are now handling an exception
|
|
|
|
currently_in_except_block = 1;
|
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
// catch exception and pass to byte code
|
2013-12-29 11:54:59 -05:00
|
|
|
sp = (mp_obj_t*)(exc_sp[0] & (~((machine_uint_t)1)));
|
2013-10-15 18:46:01 -04:00
|
|
|
ip = (const byte*)(exc_sp[-1]);
|
|
|
|
// push(traceback, exc-val, exc-type)
|
2013-12-21 13:17:45 -05:00
|
|
|
PUSH(mp_const_none);
|
2013-10-15 18:46:01 -04:00
|
|
|
PUSH(nlr.ret_val);
|
2013-12-29 12:17:43 -05:00
|
|
|
PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
|
2013-12-29 11:54:59 -05:00
|
|
|
|
2013-10-15 17:25:17 -04:00
|
|
|
} else {
|
2013-12-29 11:54:59 -05:00
|
|
|
// re-raise exception to higher level
|
2013-10-16 15:39:12 -04:00
|
|
|
// TODO what to do if this is a generator??
|
2013-10-15 17:25:17 -04:00
|
|
|
nlr_jump(nlr.ret_val);
|
|
|
|
}
|
2013-10-04 14:53:11 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|