From a7bc99c84610f578e41613bf05a2042b3f42775d Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 12 Apr 2013 20:09:27 -0700 Subject: [PATCH] Implement LDR(3) --- src/isa-thumb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/isa-thumb.c b/src/isa-thumb.c index 1a808707a..abaaecf24 100644 --- a/src/isa-thumb.c +++ b/src/isa-thumb.c @@ -186,7 +186,7 @@ DEFINE_INSTRUCTION_WITH_HIGH_THUMB(MOV3, cpu->gprs[rd] = cpu->gprs[rm]) #define DEFINE_IMMEDIATE_WITH_REGISTER_THUMB(NAME, BODY) \ COUNT_3(DEFINE_IMMEDIATE_WITH_REGISTER_EX_THUMB, NAME ## _R, BODY) -DEFINE_IMMEDIATE_WITH_REGISTER_THUMB(LDR3, ARM_STUB) +DEFINE_IMMEDIATE_WITH_REGISTER_THUMB(LDR3, cpu->gprs[rd] = cpu->memory->load32(cpu->memory, cpu->gprs[ARM_PC] + immediate)) DEFINE_IMMEDIATE_WITH_REGISTER_THUMB(LDR4, ARM_STUB) DEFINE_IMMEDIATE_WITH_REGISTER_THUMB(STR3, ARM_STUB)