From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:01 +0000 (-0500)
Subject: ARM: Decode 16 bit thumb PC relative memory instructions.
X-Git-Tag: stable_2012_02_02~1367
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a86491fbf27588356b8a4463d967b6e6358d83cb;p=gem5.git

ARM: Decode 16 bit thumb PC relative memory instructions.
---

diff --git a/src/arch/arm/isa/decoder/thumb.isa b/src/arch/arm/isa/decoder/thumb.isa
index 580232b1d..56dbcfe28 100644
--- a/src/arch/arm/isa/decoder/thumb.isa
+++ b/src/arch/arm/isa/decoder/thumb.isa
@@ -89,7 +89,7 @@
                 0xc, 0xd: WarnUnimpl::bx();
                 0xe, 0xf: WarnUnimpl::blx(); //register
             }
-            0x2, 0x3: WarnUnimpl::ldr();
+            0x2, 0x3: Thumb16MemLit::thumb16MemLit();
             default: Thumb16MemReg::thumb16MemReg();
         }
         0x3, 0x4: Thumb16MemImm::thumb16MemImm();
diff --git a/src/arch/arm/isa/formats/mem.isa b/src/arch/arm/isa/formats/mem.isa
index edefb3325..2935890c2 100644
--- a/src/arch/arm/isa/formats/mem.isa
+++ b/src/arch/arm/isa/formats/mem.isa
@@ -450,6 +450,16 @@ def format Thumb16MemImm() {{
     decode_block = decode % classNames
 }};
 
+def format Thumb16MemLit() {{
+    decode_block = '''
+    {
+        const uint32_t rt = bits(machInst, 10, 8);
+        const uint32_t imm8 = bits(machInst, 7, 0);
+        return new %s(machInst, rt, INTREG_PC, true, imm8 << 2);
+    }
+    ''' % loadImmClassName(False, True, False)
+}};
+
 def format ArmLoadMemory(memacc_code, ea_code = {{ EA = Rn + disp; }},
                      mem_flags = [], inst_flags = []) {{
     ea_code = ArmGenericCodeSubs(ea_code)