From bd9714b5405c307ae061f262ff43fedc104f5cc6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 27 Apr 2013 02:42:42 -0700 Subject: [PATCH] Implement STR(2)/STRH(2) --- src/arm/isa-thumb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arm/isa-thumb.c b/src/arm/isa-thumb.c index 64e41fd89..456e37fa7 100644 --- a/src/arm/isa-thumb.c +++ b/src/arm/isa-thumb.c @@ -335,9 +335,9 @@ DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(LDRB2, cpu->gprs[rd] = cpu->memory->loadU8 DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(LDRH2, cpu->gprs[rd] = cpu->memory->loadU16(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm])) DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(LDRSB, cpu->gprs[rd] = cpu->memory->load8(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm])) DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(LDRSH, cpu->gprs[rd] = cpu->memory->load16(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm])) -DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(STR2, ARM_STUB) +DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(STR2, cpu->memory->store32(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm], cpu->gprs[rd])) DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(STRB2, cpu->memory->store8(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm], cpu->gprs[rd])) -DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(STRH2, ARM_STUB) +DEFINE_LOAD_STORE_WITH_REGISTER_THUMB(STRH2, cpu->memory->store16(cpu->memory, cpu->gprs[rn] + cpu->gprs[rm], cpu->gprs[rd])) #define DEFINE_LOAD_STORE_MULTIPLE_EX_THUMB(NAME, RN, ADDRESS, LOOP, BODY, OP, PRE_BODY, POST_BODY, WRITEBACK) \ DEFINE_INSTRUCTION_THUMB(NAME, \