summaryrefslogtreecommitdiffstatshomepage
path: root/py/showbc.c
diff options
context:
space:
mode:
Diffstat (limited to 'py/showbc.c')
-rw-r--r--py/showbc.c123
1 files changed, 61 insertions, 62 deletions
diff --git a/py/showbc.c b/py/showbc.c
index bd8a505155..fd1d512031 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -5,16 +5,15 @@
#include <assert.h>
#include "misc.h"
-#include "mpyconfig.h"
-#include "runtime.h"
-#include "bc.h"
+#include "mpconfig.h"
+#include "bc0.h"
#define DECODE_UINT do { unum = *ip++; if (unum > 127) { unum = ((unum & 0x3f) << 8) | (*ip++); } } while (0)
#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)
#define DECODE_QSTR do { qstr = *ip++; if (qstr > 127) { qstr = ((qstr & 0x3f) << 8) | (*ip++); } } while (0)
-void py_show_byte_code(const byte *ip, int len) {
+void mp_show_byte_code(const byte *ip, int len) {
const byte *ip_start = ip;
machine_uint_t unum;
qstr qstr;
@@ -22,164 +21,164 @@ void py_show_byte_code(const byte *ip, int len) {
printf("%02u ", (uint)(ip - ip_start));
int op = *ip++;
switch (op) {
- case PYBC_LOAD_CONST_FALSE:
+ case MP_BC_LOAD_CONST_FALSE:
printf("LOAD_CONST_FALSE");
break;
- case PYBC_LOAD_CONST_NONE:
+ case MP_BC_LOAD_CONST_NONE:
printf("LOAD_CONST_NONE");
break;
- case PYBC_LOAD_CONST_TRUE:
+ case MP_BC_LOAD_CONST_TRUE:
printf("LOAD_CONST_TRUE");
break;
- case PYBC_LOAD_CONST_SMALL_INT:
+ case MP_BC_LOAD_CONST_SMALL_INT:
unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000;
ip += 3;
printf("LOAD_CONST_SMALL_INT %d", (int)unum);
break;
/*
- case PYBC_LOAD_CONST_DEC:
+ case MP_BC_LOAD_CONST_DEC:
DECODE_QSTR;
PUSH(rt_load_const_dec(qstr));
break;
*/
- case PYBC_LOAD_CONST_ID:
+ case MP_BC_LOAD_CONST_ID:
DECODE_QSTR;
printf("LOAD_CONST_ID %s", qstr_str(qstr));
break;
- case PYBC_LOAD_CONST_STRING:
+ case MP_BC_LOAD_CONST_STRING:
DECODE_QSTR;
printf("LOAD_CONST_STRING %s", qstr_str(qstr));
break;
- case PYBC_LOAD_FAST_0:
+ case MP_BC_LOAD_FAST_0:
printf("LOAD_FAST_0");
break;
- case PYBC_LOAD_FAST_1:
+ case MP_BC_LOAD_FAST_1:
printf("LOAD_FAST_1");
break;
- case PYBC_LOAD_FAST_2:
+ case MP_BC_LOAD_FAST_2:
printf("LOAD_FAST_2");
break;
- case PYBC_LOAD_FAST_N:
+ case MP_BC_LOAD_FAST_N:
DECODE_UINT;
printf("LOAD_FAST_N %lu", unum);
break;
- case PYBC_LOAD_NAME:
+ case MP_BC_LOAD_NAME:
DECODE_QSTR;
printf("LOAD_NAME %s", qstr_str(qstr));
break;
- case PYBC_LOAD_GLOBAL:
+ case MP_BC_LOAD_GLOBAL:
DECODE_QSTR;
printf("LOAD_GLOBAL %s", qstr_str(qstr));
break;
- case PYBC_LOAD_ATTR:
+ case MP_BC_LOAD_ATTR:
DECODE_QSTR;
printf("LOAD_ATTR %s", qstr_str(qstr));
break;
- case PYBC_LOAD_METHOD:
+ case MP_BC_LOAD_METHOD:
DECODE_QSTR;
printf("LOAD_METHOD %s", qstr_str(qstr));
break;
- case PYBC_LOAD_BUILD_CLASS:
+ case MP_BC_LOAD_BUILD_CLASS:
printf("LOAD_BUILD_CLASS");
break;
- case PYBC_STORE_FAST_0:
+ case MP_BC_STORE_FAST_0:
printf("STORE_FAST_0");
break;
- case PYBC_STORE_FAST_1:
+ case MP_BC_STORE_FAST_1:
printf("STORE_FAST_1");
break;
- case PYBC_STORE_FAST_2:
+ case MP_BC_STORE_FAST_2:
printf("STORE_FAST_2");
break;
- case PYBC_STORE_FAST_N:
+ case MP_BC_STORE_FAST_N:
DECODE_UINT;
printf("STORE_FAST_N %lu", unum);
break;
- case PYBC_STORE_NAME:
+ case MP_BC_STORE_NAME:
DECODE_QSTR;
printf("STORE_NAME %s", qstr_str(qstr));
break;
/*
- case PYBC_STORE_GLOBAL:
+ case MP_BC_STORE_GLOBAL:
DECODE_QSTR;
rt_store_global(qstr, POP());
break;
*/
- case PYBC_STORE_ATTR:
+ case MP_BC_STORE_ATTR:
DECODE_QSTR;
printf("STORE_ATTR %s", qstr_str(qstr));
break;
- case PYBC_STORE_SUBSCR:
+ case MP_BC_STORE_SUBSCR:
printf("STORE_SUBSCR");
break;
/*
- case PYBC_DUP_TOP:
+ case MP_BC_DUP_TOP:
obj1 = *sp;
PUSH(obj1);
break;
*/
- case PYBC_DUP_TOP_TWO:
+ case MP_BC_DUP_TOP_TWO:
printf("DUP_TOP_TWO");
break;
- case PYBC_POP_TOP:
+ case MP_BC_POP_TOP:
printf("POP_TOP");
break;
/*
- case PYBC_ROT_TWO:
+ case MP_BC_ROT_TWO:
obj1 = sp[0];
sp[0] = sp[1];
sp[1] = obj1;
break;
*/
- case PYBC_ROT_THREE:
+ case MP_BC_ROT_THREE:
printf("ROT_THREE");
break;
- case PYBC_JUMP:
+ case MP_BC_JUMP:
DECODE_SLABEL;
printf("JUMP %lu", ip + unum - ip_start);
break;
- case PYBC_POP_JUMP_IF_TRUE:
+ case MP_BC_POP_JUMP_IF_TRUE:
DECODE_SLABEL;
printf("POP_JUMP_IF_TRUE %lu", ip + unum - ip_start);
break;
- case PYBC_POP_JUMP_IF_FALSE:
+ case MP_BC_POP_JUMP_IF_FALSE:
DECODE_SLABEL;
printf("POP_JUMP_IF_FALSE %lu", ip + unum - ip_start);
break;
/*
- case PYBC_JUMP_IF_TRUE_OR_POP:
+ case MP_BC_JUMP_IF_TRUE_OR_POP:
DECODE_SLABEL;
if (rt_is_true(*sp)) {
ip += unum;
@@ -188,7 +187,7 @@ void py_show_byte_code(const byte *ip, int len) {
}
break;
- case PYBC_JUMP_IF_FALSE_OR_POP:
+ case MP_BC_JUMP_IF_FALSE_OR_POP:
DECODE_SLABEL;
if (rt_is_true(*sp)) {
sp++;
@@ -197,13 +196,13 @@ void py_show_byte_code(const byte *ip, int len) {
}
break;
- case PYBC_SETUP_EXCEPT:
+ case MP_BC_SETUP_EXCEPT:
DECODE_ULABEL; // except labels are always forward
*++exc_sp = (machine_uint_t)ip + unum;
*++exc_sp = (machine_uint_t)sp;
break;
- case PYBC_END_FINALLY:
+ case MP_BC_END_FINALLY:
// not implemented
// if TOS is an exception, reraises the exception (3 values on TOS)
// if TOS is an integer, does something else
@@ -213,90 +212,90 @@ void py_show_byte_code(const byte *ip, int len) {
break;
*/
- case PYBC_GET_ITER:
+ case MP_BC_GET_ITER:
printf("GET_ITER");
break;
- case PYBC_FOR_ITER:
+ case MP_BC_FOR_ITER:
DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
printf("FOR_ITER %lu", ip + unum - ip_start);
break;
/*
- case PYBC_POP_BLOCK:
+ case MP_BC_POP_BLOCK:
// pops block and restores the stack
assert(0);
break;
- case PYBC_POP_EXCEPT:
+ case MP_BC_POP_EXCEPT:
// TODO need to work out how blocks work etc
// pops block, checks it's an exception block, and restores the stack, saving the 3 exception values to local threadstate
assert(exc_sp >= &exc_stack[0]);
- //sp = (py_obj_t*)(*exc_sp--);
+ //sp = (mp_obj_t*)(*exc_sp--);
//exc_sp--; // discard ip
exc_sp -= 2;
//sp += 3; // pop 3 exception values
break;
- case PYBC_UNARY_OP:
+ case MP_BC_UNARY_OP:
unum = *ip++;
*sp = rt_unary_op(unum, *sp);
break;
*/
- case PYBC_BINARY_OP:
+ case MP_BC_BINARY_OP:
unum = *ip++;
printf("BINARY_OP %lu", unum);
break;
- case PYBC_COMPARE_OP:
+ case MP_BC_COMPARE_OP:
unum = *ip++;
printf("COMPARE_OP %lu", unum);
break;
- case PYBC_BUILD_TUPLE:
+ case MP_BC_BUILD_TUPLE:
DECODE_UINT;
printf("BUILD_TUPLE %lu", unum);
break;
- case PYBC_BUILD_LIST:
+ case MP_BC_BUILD_LIST:
DECODE_UINT;
printf("BUILD_LIST %lu", unum);
break;
/*
- case PYBC_LIST_APPEND:
+ case MP_BC_LIST_APPEND:
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;
- case PYBC_BUILD_MAP:
+ case MP_BC_BUILD_MAP:
DECODE_UINT;
PUSH(rt_build_map(unum));
break;
- case PYBC_STORE_MAP:
+ case MP_BC_STORE_MAP:
sp += 2;
rt_store_map(sp[0], sp[-2], sp[-1]);
break;
- case PYBC_MAP_ADD:
+ case MP_BC_MAP_ADD:
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;
- case PYBC_BUILD_SET:
+ case MP_BC_BUILD_SET:
DECODE_UINT;
obj1 = rt_build_set(unum, sp);
sp += unum - 1;
*sp = obj1;
break;
- case PYBC_SET_ADD:
+ case MP_BC_SET_ADD:
DECODE_UINT;
// I think it's guaranteed by the compiler that sp[unum] is a set
rt_store_set(sp[unum], sp[0]);
@@ -304,32 +303,32 @@ void py_show_byte_code(const byte *ip, int len) {
break;
*/
- case PYBC_UNPACK_SEQUENCE:
+ case MP_BC_UNPACK_SEQUENCE:
DECODE_UINT;
printf("UNPACK_SEQUENCE %lu", unum);
break;
- case PYBC_MAKE_FUNCTION:
+ case MP_BC_MAKE_FUNCTION:
DECODE_UINT;
printf("MAKE_FUNCTION %lu", unum);
break;
- case PYBC_CALL_FUNCTION:
+ case MP_BC_CALL_FUNCTION:
DECODE_UINT;
printf("CALL_FUNCTION n=%lu nkw=%lu", unum & 0xff, (unum >> 8) & 0xff);
break;
- case PYBC_CALL_METHOD:
+ case MP_BC_CALL_METHOD:
DECODE_UINT;
printf("CALL_METHOD n=%lu nkw=%lu", unum & 0xff, (unum >> 8) & 0xff);
break;
- case PYBC_RETURN_VALUE:
+ case MP_BC_RETURN_VALUE:
printf("RETURN_VALUE");
break;
/*
- case PYBC_YIELD_VALUE:
+ case MP_BC_YIELD_VALUE:
nlr_pop();
*ip_in_out = ip;
fastn[0] = fast0;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-20 17:29:59 +0000