From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:07 +0000 (-0500)
Subject: ARM: Decode pkh instructions.
X-Git-Tag: stable_2012_02_02~1256
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f581fd3f899648f8699f53ecdc913e7d50c26f8f;p=gem5.git

ARM: Decode pkh instructions.
---

diff --git a/src/arch/arm/isa/formats/data.isa b/src/arch/arm/isa/formats/data.isa
index c1057caeb..d313f0f01 100644
--- a/src/arch/arm/isa/formats/data.isa
+++ b/src/arch/arm/isa/formats/data.isa
@@ -140,7 +140,13 @@ def format ArmPackUnpackSatReverse() {{
             const ArmShiftType type =
                 (ArmShiftType)(uint32_t)bits(machInst, 6, 5);
             if (op1 == 0) {
-                return new WarnUnimplemented("pkh", machInst);
+                if (type) {
+                    return new PkhtbReg(machInst, rd, (IntRegIndex)a,
+                                        rn, imm, type);
+                } else {
+                    return new PkhbtReg(machInst, rd, (IntRegIndex)a,
+                                        rn, imm, type);
+                }
             } else if (bits(op1, 2, 1) == 1) {
                 return new Ssat(machInst, rd, satImm + 1, rn, imm, type);
             } else if (bits(op1, 2, 1) == 3) {
@@ -1284,7 +1290,11 @@ def format Thumb32DataProcShiftReg() {{
                 %(eor)s
             }
           case 0x6:
-            return new WarnUnimplemented("pkh", machInst);
+            if (type) {
+                return new PkhtbReg(machInst, rd, rn, rm, amt, type);
+            } else {
+                return new PkhbtReg(machInst, rd, rn, rm, amt, type);
+            }
           case 0x8:
             if (rd == INTREG_PC) {
                 %(cmn)s