From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:17 +0000 (-0500)
Subject: ARM: Detect a bad offset field for the VFP Ldm/Stm instructions in the decoder.
X-Git-Tag: stable_2012_02_02~1080
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a6bf8301ad933d038f87f3030b00af1d775d5c9;p=gem5.git

ARM: Detect a bad offset field for the VFP Ldm/Stm instructions in the decoder.
---

diff --git a/src/arch/arm/isa/formats/fp.isa b/src/arch/arm/isa/formats/fp.isa
index 55668e5f6..1bb15fd5b 100644
--- a/src/arch/arm/isa/formats/fp.isa
+++ b/src/arch/arm/isa/formats/fp.isa
@@ -96,20 +96,25 @@ let {{
             }
             break;
           case 0x1:
-            switch (bits(opcode, 1, 0)) {
-              case 0x0:
-                return new VLdmStm(machInst, rn, vd, single,
-                                   true, false, false, offset);
-              case 0x1:
-                return new VLdmStm(machInst, rn, vd, single,
-                                   true, false, true, offset);
-              case 0x2:
-                return new VLdmStm(machInst, rn, vd, single,
-                                   true, true, false, offset);
-              case 0x3:
-                // If rn == sp, then this is called vpop.
-                return new VLdmStm(machInst, rn, vd, single,
-                                   true, true, true, offset);
+            {
+                if (offset == 0 || vd + offset > NumFloatArchRegs) {
+                    break;
+                }
+                switch (bits(opcode, 1, 0)) {
+                  case 0x0:
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       true, false, false, offset);
+                  case 0x1:
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       true, false, true, offset);
+                  case 0x2:
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       true, true, false, offset);
+                  case 0x3:
+                    // If rn == sp, then this is called vpop.
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       true, true, true, offset);
+                }
             }
           case 0x2:
             if (bits(opcode, 1, 0) == 0x2) {