From f86fb9dc7491c89e6389b71c4eb120393f60920e Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 12 Apr 2013 22:06:17 -0700 Subject: [PATCH] Implement LDR(1) --- 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 4ffeadf49..d5708aa8f 100644 --- a/src/isa-thumb.c +++ b/src/isa-thumb.c @@ -101,7 +101,7 @@ DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LSL1, \ DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LSR1, ARM_STUB) DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(ASR1, ARM_STUB) -DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LDR1, ARM_STUB) +DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LDR1, cpu->gprs[rd] = cpu->memory->load32(cpu->memory, cpu->gprs[rm] + immediate * 4)) DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LDRB1, ARM_STUB) DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(LDRH1, ARM_STUB) DEFINE_IMMEDIATE_5_INSTRUCTION_THUMB(STR1, cpu->memory->store32(cpu->memory, cpu->gprs[rm] + immediate * 4, cpu->gprs[rd]))