From 28ecc976717895734c095ec508019973dd07db99 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 9 Apr 2013 23:37:28 -0700 Subject: [PATCH] Stub out LDR/STR from SP --- src/isa-thumb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/isa-thumb.c b/src/isa-thumb.c index e751cb64b..ac5ab8b3b 100644 --- a/src/isa-thumb.c +++ b/src/isa-thumb.c @@ -160,9 +160,11 @@ DEFINE_INSTRUCTION_WITH_HIGH_THUMB(MOV3, ) BODY;) #define DEFINE_LOAD_WITH_IMMEDIATE_THUMB(NAME, BODY) \ - COUNT_3(DEFINE_LOAD_WITH_IMMEDIATE_EX_THUMB, NAME ## 3_R, BODY) + COUNT_3(DEFINE_LOAD_WITH_IMMEDIATE_EX_THUMB, NAME ## _R, BODY) -DEFINE_LOAD_WITH_IMMEDIATE_THUMB(LDR, ) +DEFINE_LOAD_WITH_IMMEDIATE_THUMB(LDR3, ) +DEFINE_LOAD_WITH_IMMEDIATE_THUMB(LDR4, ) +DEFINE_LOAD_WITH_IMMEDIATE_THUMB(STR3, ) #define DEFINE_LOAD_STORE_WITH_REGISTER_EX_THUMB(NAME, RM, BODY) \ DEFINE_INSTRUCTION_THUMB(NAME, \ @@ -250,6 +252,8 @@ DEFINE_INSTRUCTION_THUMB(BX, ) APPLY(COUNT_5, DUMMY, DECLARE_INSTRUCTION_THUMB(EMITTER, LDRB1_)) \ APPLY(COUNT_5, DUMMY, DECLARE_INSTRUCTION_THUMB(EMITTER, STRH1_)) \ APPLY(COUNT_5, DUMMY, DECLARE_INSTRUCTION_THUMB(EMITTER, LDRH1_)) \ + APPLY(COUNT_3, DUMMY_4, DECLARE_INSTRUCTION_THUMB(EMITTER, STR3_R)) \ + APPLY(COUNT_3, DUMMY_4, DECLARE_INSTRUCTION_THUMB(EMITTER, LDR4_R)) \ static const ThumbInstruction _thumbTable[0x400] = { DECLARE_THUMB_EMITTER_BLOCK(_ThumbInstruction)