all repos — mgba @ 56208521d6280222ca42ecfa16a9e11c9d0c5592

mGBA Game Boy Advance Emulator

ARM7: Fix decoding LDR3
Jeffrey Pfau jeffrey@endrift.com
Mon, 13 Jul 2015 01:15:59 -0700
commit

56208521d6280222ca42ecfa16a9e11c9d0c5592

parent

4d5c1f98497b90e5abb79bdaf7af0c0ad5b606bf

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

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

@@ -153,7 +153,7 @@ ARM_OPERAND_IMMEDIATE_3;)

#define DEFINE_IMMEDIATE_WITH_REGISTER_MEM_THUMB(NAME, MNEMONIC, REG, CYCLES) \ DEFINE_THUMB_DECODER(NAME, MNEMONIC, \ - info->op1.reg = (opcode >> 6) & 0x0007; \ + info->op1.reg = (opcode >> 8) & 0x0007; \ info->memory.baseReg = REG; \ info->memory.offset.immediate = (opcode & 0x00FF) << 2; \ info->memory.width = ARM_ACCESS_WORD; \