summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-02-23 15:10:50 -0600
committerAli Saidi <Ali.Saidi@ARM.com>2011-02-23 15:10:50 -0600
commit916c7f162da6fe638cd6a78d40ac64a83cf54e5f (patch)
treebfaef83755c6c36a811ce4a3c33867a3011a637b /src/arch
parent1201c5a134c3ac149e1e6df929f8040409a31147 (diff)
downloadgem5-916c7f162da6fe638cd6a78d40ac64a83cf54e5f.tar.xz
ARM: This panic can be hit during misspeculation so it can't exist.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/types.hh7
1 files changed, 3 insertions, 4 deletions
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);