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

py/asmxtensa: Use proper calculation for const table offset.

Browse Source 
Instead of hard-coding it to 4 bytes.  This allows for there to be other
data stored at the very start of the emitted native code.
This commit is contained in:
Damien George 2018-10-01 12:34:58 +10:00
parent 5b19916d6e
commit 4fc437f1ef
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/asmxtensa.c
View File

@ -161,7 +161,8 @@ void asm_xtensa_mov_reg_i32(asm_xtensa_t *as, uint reg_dest, uint32_t i32) {
asm_xtensa_op_movi(as, reg_dest, i32); asm_xtensa_op_movi(as, reg_dest, i32);
} else { } else {
// load the constant // load the constant
asm_xtensa_op_l32r(as, reg_dest, as->base.code_offset, 4 + as->cur_const * WORD_SIZE); uint32_t const_table_offset = (uint8_t*)as->const_table - as->base.code_base;
asm_xtensa_op_l32r(as, reg_dest, as->base.code_offset, const_table_offset + as->cur_const * WORD_SIZE);
// store the constant in the table // store the constant in the table
if (as->const_table != NULL) { if (as->const_table != NULL) {
as->const_table[as->cur_const] = i32; as->const_table[as->cur_const] = i32;