From adbd84ab9fffdcdce18f564acffa508c10164c9f Mon Sep 17 00:00:00 2001
From: Matt Horsnell <Matt.Horsnell@ARM.com>
Date: Tue, 18 Jan 2011 16:30:05 -0600
Subject: ARM: The ARM decoder should not panic when decoding undefined holes
 is arch.

This can abort simulations when the fetch unit runs ahead and speculatively
decodes instructions that are off the execution path.
---
 src/arch/arm/insts/pred_inst.hh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/arch/arm/insts/pred_inst.hh')

diff --git a/src/arch/arm/insts/pred_inst.hh b/src/arch/arm/insts/pred_inst.hh
index f779b46f5..c441d1f32 100644
--- a/src/arch/arm/insts/pred_inst.hh
+++ b/src/arch/arm/insts/pred_inst.hh
@@ -78,9 +78,10 @@ modified_imm(uint8_t ctrlImm, uint8_t dataImm)
 }
 
 static inline uint64_t
-simd_modified_imm(bool op, uint8_t cmode, uint8_t data)
+simd_modified_imm(bool op, uint8_t cmode, uint8_t data, bool &immValid)
 {
     uint64_t bigData = data;
+    immValid = true;
     switch (cmode) {
       case 0x0:
       case 0x1:
@@ -139,9 +140,10 @@ simd_modified_imm(bool op, uint8_t cmode, uint8_t data)
             bigData |= (bigData << 32);
             break;
         }
-        // Fall through
+        // Fall through, immediate encoding is invalid.
       default:
-        panic("Illegal modified SIMD immediate parameters.\n");
+        immValid = false;
+        break;
     }
     return bigData;
 }
-- 
cgit v1.2.3