From 56208521d6280222ca42ecfa16a9e11c9d0c5592 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 13 Jul 2015 01:15:59 -0700 Subject: [PATCH] ARM7: Fix decoding LDR3 --- src/arm/decoder-thumb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arm/decoder-thumb.c b/src/arm/decoder-thumb.c index d1eac9c7d..626004f2c 100644 --- a/src/arm/decoder-thumb.c +++ b/src/arm/decoder-thumb.c @@ -153,7 +153,7 @@ DEFINE_DECODER_WITH_HIGH_THUMB(MOV3, MOV, ARM_OPERAND_AFFECTED_1, 0) #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; \