Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-10-05 05:07:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

arch/xtensa/src/esp32/esp32_user.c: Fix S16I/L16LU emulation

Browse source 
I misunderstood how imm8 is used to calculate the address.
This commit is contained in:
YAMAMOTO Takashi 2021-04-15 12:51:52 +09:00 • committed by Abdelatif Guettouche
parent dd86fe5ca5
commit a28de1d681
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
arch/xtensa/src/esp32/esp32_user.c
View file

@ -343,11 +343,10 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
(unsigned int)t,
(void *)regs[REG_A0 + t]);
DEBUGASSERT(regs[REG_A0 + s] + imm8 == regs[REG_EXCVADDR]);
store_uint8(((uint8_t *)regs[REG_A0 + s]) + imm8,
regs[REG_A0 + t]);
store_uint8(((uint8_t *)regs[REG_A0 + s]) + imm8 + 1,
regs[REG_A0 + t] >> 8);
uintptr_t va = regs[REG_A0 + s] + (imm8 << 1);
DEBUGASSERT(va == regs[REG_EXCVADDR]);
store_uint8((uint8_t *)va, regs[REG_A0 + t]);
store_uint8((uint8_t *)va + 1, regs[REG_A0 + t] >> 8);
advance_pc(regs, 3);
return regs;
}
@ -375,9 +374,10 @@ uint32_t *xtensa_user(int exccause, uint32_t *regs)
(unsigned int)t,
(void *)regs[REG_A0 + t]);
DEBUGASSERT(regs[REG_A0 + s] + imm8 == regs[REG_EXCVADDR]);
uint8_t lo = load_uint8(((uint8_t *)regs[REG_A0 + s]) + imm8);
uint8_t hi = load_uint8(((uint8_t *)regs[REG_A0 + s]) + imm8 + 1);
uintptr_t va = regs[REG_A0 + s] + (imm8 << 1);
DEBUGASSERT(va == regs[REG_EXCVADDR]);
uint8_t lo = load_uint8((uint8_t *)va);
uint8_t hi = load_uint8((uint8_t *)va + 1);
regs[REG_A0 + t] = (hi << 8) | lo;
advance_pc(regs, 3);
return regs;