all repos — mgba @ ae1fecd4c8c02d1ddf321cad835eb9f63730f320

mGBA Game Boy Advance Emulator

ARM7: Fix decoding some more load/store instructions
Jeffrey Pfau jeffrey@endrift.com
Sat, 15 Aug 2015 18:03:49 -0700
commit

ae1fecd4c8c02d1ddf321cad835eb9f63730f320

parent

72f8657017040aad0999a9f0474332c8275e8f89

1 files changed, 1 insertions(+), 1 deletions(-)

jump to
M src/arm/decoder-thumb.csrc/arm/decoder-thumb.c

@@ -31,7 +31,7 @@ #define DEFINE_IMMEDIATE_5_DECODER_MEM_THUMB(NAME, MNEMONIC, CYCLES, WIDTH) \

DEFINE_THUMB_DECODER(NAME, MNEMONIC, \ info->op1.reg = opcode & 0x0007; \ info->memory.baseReg = (opcode >> 3) & 0x0007; \ - info->memory.offset.immediate = ((opcode >> 6) & 0x0007) * WIDTH; \ + info->memory.offset.immediate = ((opcode >> 6) & 0x001F) * WIDTH; \ info->memory.width = (enum ARMMemoryAccessType) WIDTH; \ info->operandFormat = ARM_OPERAND_REGISTER_1 | \ ARM_OPERAND_AFFECTED_1 | \