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

Byte code for SMALL_INT uses 3 bytes for integer.

This commit is contained in:
Damien 2013-11-04 23:04:50 +00:00
parent 0c70f88734
commit 6addc89e55
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/emitbc.c
View File

@ -106,11 +106,12 @@ static void emit_write_byte_1_byte(emit_t* emit, byte b1, uint b2) {
} }
static void emit_write_byte_1_int(emit_t* emit, byte b1, int num) { static void emit_write_byte_1_int(emit_t* emit, byte b1, int num) {
assert((num & (~0x7fff)) == 0 || (num & (~0x7fff)) == (~0x7fff)); assert((num & (~0x7fffff)) == 0 || (num & (~0x7fffff)) == (~0x7fffff));
byte* c = emit_get_cur_to_write_bytes(emit, 3); byte* c = emit_get_cur_to_write_bytes(emit, 4);
c[0] = b1; c[0] = b1;
c[1] = num; c[1] = num;
c[2] = num >> 8; c[2] = num >> 8;
c[3] = num >> 16;
} }
static void emit_write_byte_1_uint(emit_t* emit, byte b1, uint num) { static void emit_write_byte_1_uint(emit_t* emit, byte b1, uint num) {
@ -186,8 +187,8 @@ static void emit_bc_label_assign(emit_t *emit, int l) {
emit->label_offsets[l] = emit->code_offset; emit->label_offsets[l] = emit->code_offset;
} else if (emit->pass == PASS_3) { } else if (emit->pass == PASS_3) {
// ensure label offset has not changed from PASS_2 to PASS_3 // ensure label offset has not changed from PASS_2 to PASS_3
//printf("l%d: (at %d vs %d)\n", l, emit->code_offset, emit->label_offsets[l]);
assert(emit->label_offsets[l] == emit->code_offset); assert(emit->label_offsets[l] == emit->code_offset);
//printf("l%d: (at %d)\n", l, emit->code_offset);
} }
} }

9
py/vm.c
View File

@ -75,11 +75,11 @@ bool py_execute_byte_code_2(const byte *code, const byte **ip_in_out, py_obj_t *
break; break;
case PYBC_LOAD_CONST_SMALL_INT: case PYBC_LOAD_CONST_SMALL_INT:
snum = ip[0] | (ip[1] << 8); snum = ip[0] | (ip[1] << 8) | (ip[2] << 16);
if (snum & 0x8000) { if (snum & 0x8000) {
snum |= ~0xffff; snum |= ~0xffff;
} }
ip += 2; ip += 3;
PUSH((py_obj_t)(snum << 1 | 1)); PUSH((py_obj_t)(snum << 1 | 1));
break; break;
@ -162,6 +162,11 @@ bool py_execute_byte_code_2(const byte *code, const byte **ip_in_out, py_obj_t *
rt_store_name(qstr, POP()); rt_store_name(qstr, POP());
break; break;
case PYBC_STORE_GLOBAL:
DECODE_QSTR;
rt_store_global(qstr, POP());
break;
case PYBC_STORE_ATTR: case PYBC_STORE_ATTR:
DECODE_QSTR; DECODE_QSTR;
rt_store_attr(sp[0], qstr, sp[1]); rt_store_attr(sp[0], qstr, sp[1]);