From eb0823c4f2666e6b3de441fa661e9e17ef908d8f Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:09 -0500
Subject: ARM: Fix the implementation of BX to work in thumbEE mode.

---
 src/arch/arm/insts/static_inst.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/arch/arm/insts')

diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh
index 2c83ee79c..23c04306d 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -238,9 +238,9 @@ class ArmStaticInst : public StaticInst
         Addr newPc = (val & ~PcModeMask);
         if (thumbEE) {
             if (bits(newPc, 0)) {
-                warn("Bad thumbEE interworking branch address %#x.\n", newPc);
-            } else {
                 newPc = newPc & ~mask(1);
+            } else {
+                panic("Bad thumbEE interworking branch address %#x.\n", newPc);
             }
         } else {
             if (bits(newPc, 0)) {
-- 
cgit v1.2.3