ARM: Hook up the push/pop versions of stm/ldm in thumb.

diff --git a/src/arch/arm/isa/formats/data.isa b/src/arch/arm/isa/formats/data.isa
index f6e093b80a19134fcad7de752c24b4b227d568b1..43bd655892a06bf4217efb7c635c602193b25e23 100644 (file)
--- a/src/arch/arm/isa/formats/data.isa
+++ b/src/arch/arm/isa/formats/data.isa
@@ -531,7 +531,12 @@ def format Thumb16Misc() {{
                            (IntRegIndex)(uint32_t)bits(machInst, 2, 0));
           case 0x4:
           case 0x5:
-            return new WarnUnimplemented("push", machInst);
+            {
+                const uint32_t m = bits(machInst, 8);
+                const uint32_t regList = bits(machInst, 7, 0) | (m << 14);
+                return new LdmStm(machInst, INTREG_SP, false, false, false,
+                                  true, false, regList);
+            }
           case 0x6:
             {
                 const uint32_t opBits = bits(machInst, 7, 5);
@@ -565,7 +570,12 @@ def format Thumb16Misc() {{
                             (IntRegIndex)(uint32_t)bits(machInst, 2, 0));
           case 0xc:
           case 0xd:
-            return new WarnUnimplemented("pop", machInst);
+            {
+                const uint32_t p = bits(machInst, 8);
+                const uint32_t regList = bits(machInst, 7, 0) | (p << 15);
+                return new LdmStm(machInst, INTREG_SP, true, true, false,
+                                  true, true, regList);
+            }
           case 0xe:
             return new WarnUnimplemented("bkpt", machInst);
           case 0xf: