From 3caa75d53aa9c04b238aeae281983d8b73754e98 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:10 -0500
Subject: ARM: Squash the low order bits of the PC when performing a regular
 branch.

---
 src/arch/arm/isa/operands.isa | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/arch/arm/isa/operands.isa')

diff --git a/src/arch/arm/isa/operands.isa b/src/arch/arm/isa/operands.isa
index 1a98a9087..a8b0b197a 100644
--- a/src/arch/arm/isa/operands.isa
+++ b/src/arch/arm/isa/operands.isa
@@ -70,10 +70,11 @@ let {{
     '''
     maybeAIWPCWrite = '''
         if (%(reg_idx)s == PCReg) {
-            if (xc->readPC() & (ULL(1) << PcTBitShift)) {
-                setIWNextPC(xc, %(final_val)s);
-            } else {
+            bool thumb = THUMB;
+            if (thumb) {
                 setNextPC(xc, %(final_val)s);
+            } else {
+                setIWNextPC(xc, %(final_val)s);
             }
         } else {
             xc->%(func)s(this, %(op_idx)s, %(final_val)s);
-- 
cgit v1.2.3