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

py/emitbc: Produce correct line number info for large bytecode chunks. 

Previous to this patch, for large chunks of bytecode that originated from
a single source-code line, the bytecode-line mapping would generate
something like (for 42 bytecode bytes and 1 line):

  BC_SKIP=31  LINE_SKIP=1
  BC_SKIP=11  LINE_SKIP=0

This would mean that any errors in the last 11 bytecode bytes would be
reported on the following line.  This patch fixes it to generate instead:

  BC_SKIP=31  LINE_SKIP=0
  BC_SKIP=11  LINE_SKIP=1
This commit is contained in:
Damien George 2017-02-10 11:58:10 +11:00
parent 8f1c6d952a
commit cc2dbdd1fe
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/emitbc.c
View File

@ -144,10 +144,15 @@ STATIC void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_sk
//printf(" %d %d\n", bytes_to_skip, lines_to_skip); //printf(" %d %d\n", bytes_to_skip, lines_to_skip);
while (bytes_to_skip > 0 || lines_to_skip > 0) { while (bytes_to_skip > 0 || lines_to_skip > 0) {
mp_uint_t b, l; mp_uint_t b, l;
if (lines_to_skip <= 6) { if (lines_to_skip <= 6 || bytes_to_skip > 0xf) {
// use 0b0LLBBBBB encoding // use 0b0LLBBBBB encoding
b = MIN(bytes_to_skip, 0x1f); b = MIN(bytes_to_skip, 0x1f);
l = MIN(lines_to_skip, 0x3); if (b < bytes_to_skip) {
// we can't skip any lines until we skip all the bytes
l = 0;
} else {
l = MIN(lines_to_skip, 0x3);
}
*emit_get_cur_to_write_code_info(emit, 1) = b | (l << 5); *emit_get_cur_to_write_code_info(emit, 1) = b | (l << 5);
} else { } else {
// use 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte) // use 0b1LLLBBBB 0bLLLLLLLL encoding (l's LSB in second byte)