From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Wed, 23 Feb 2011 21:10:50 +0000 (-0600)
Subject: ARM: This panic can be hit during misspeculation so it can't exist.
X-Git-Tag: stable_2012_02_02~531
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=916c7f162da6fe638cd6a78d40ac64a83cf54e5f;p=gem5.git

ARM: This panic can be hit during misspeculation so it can't exist.
---

diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 494e49f1f..e6865e280 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -350,10 +350,9 @@ namespace ArmISA
             if (thumbEE) {
                 if (bits(newPC, 0)) {
                     newPC = newPC & ~mask(1);
-                } else {
-                    panic("Bad thumbEE interworking branch address %#x.\n",
-                            newPC);
-                }
+                }  // else we have a bad interworking address; do not call
+                   // panic() since the instruction could be executed
+                   // speculatively
             } else {
                 if (bits(newPC, 0)) {
                     nextThumb(true);