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 2438f0378585671b055d91e58db41653659bc8d8..63da78dd7cad1a7ae404f137fbf4203e08403ac3 100644 (file)
--- 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;
                     }
                 }
             }