djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Fix debug-printing of bytecode line numbers. 

Also move the raw bytecode printing code from emitglue to mp_bytecode_print.
This commit is contained in:
Damien George 2014-10-24 14:42:50 +00:00
parent d00d8ac95c
commit 564963a170
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/emitglue.c
View File

@ -74,13 +74,6 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, byte *code, mp_uint_t len,
#endif #endif
#if MICROPY_DEBUG_PRINTERS #if MICROPY_DEBUG_PRINTERS
if (mp_verbose_flag > 0) { if (mp_verbose_flag > 0) {
for (mp_uint_t i = 0; i < len; i++) {
if (i > 0 && i % 16 == 0) {
printf("\n");
}
printf(" %02x", code[i]);
}
printf("\n");
mp_bytecode_print(rc, code, len); mp_bytecode_print(rc, code, len);
} }
#endif #endif

2
py/emitglue.h
View File

@ -35,7 +35,7 @@ typedef enum {
MP_CODE_NATIVE_ASM, MP_CODE_NATIVE_ASM,
} mp_raw_code_kind_t; } mp_raw_code_kind_t;
typedef struct _mp_code_t { typedef struct _mp_raw_code_t {
mp_raw_code_kind_t kind : 3; mp_raw_code_kind_t kind : 3;
mp_uint_t scope_flags : 7; mp_uint_t scope_flags : 7;
mp_uint_t n_pos_args : 11; mp_uint_t n_pos_args : 11;

15
py/showbc.c
View File

@ -70,6 +70,16 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len) {
printf("File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n", printf("File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",
qstr_str(source_file), qstr_str(block_name), descr, code_info, len); qstr_str(source_file), qstr_str(block_name), descr, code_info, len);
// raw bytecode dump
printf("Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n", code_info_size, len - code_info_size);
for (mp_uint_t i = 0; i < len; i++) {
if (i > 0 && i % 16 == 0) {
printf("\n");
}
printf(" %02x", ip_start[i]);
}
printf("\n");
// bytecode prelude: state size and exception stack size; 16 bit uints // bytecode prelude: state size and exception stack size; 16 bit uints
{ {
uint n_state = mp_decode_uint(&ip); uint n_state = mp_decode_uint(&ip);
@ -87,15 +97,14 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len) {
printf("(INIT_CELL %u)\n", local_num); printf("(INIT_CELL %u)\n", local_num);
} }
len -= ip - ip_start; len -= ip - ip_start;
ip_start = ip;
} }
// print out line number info // print out line number info
{ {
mp_int_t bc = (code_info + code_info_size) - ip; mp_int_t bc = (ip_start + code_info_size) - ip; // start counting from the prelude
mp_uint_t source_line = 1; mp_uint_t source_line = 1;
printf(" bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line); printf(" bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
for (const byte* ci = code_info + 12; *ci;) { for (const byte* ci = code_info; *ci;) {
if ((ci[0] & 0x80) == 0) { if ((ci[0] & 0x80) == 0) {
// 0b0LLBBBBB encoding // 0b0LLBBBBB encoding
bc += ci[0] & 0x1f; bc += ci[0] & 0x1f;