From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 17:58:01 +0000 (-0500)
Subject: ARM: Force the condition code for 16 bit thumb instructions to be unconditional.
X-Git-Tag: stable_2012_02_02~1366
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79b288f7b5c81f37d1b33470a1144d52efafb496;p=gem5.git

ARM: Force the condition code for 16 bit thumb instructions to be unconditional.
Before, because 16 bit thumb instructions didn't set the upper 16 bits of the
ExtMachInst, that field would be interpretted as "equals".
---

diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index 2438f0378..63da78dd7 100644
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -126,6 +126,8 @@ namespace ArmISA
                         DPRINTF(Predecoder, "16 bit Thumb.\n");
                         offset += 2;
                         emi.instBits = word;
+                        // Set the condition code field artificially.
+                        emi.condCode = COND_UC;
                     }
                 }
             }