arm: set movret_uop as conditional or unconditional control

A flag was missing for the movret_uop microop instruction. This patch adds
that flag when the instruction is used, not directly in the constructor of
the instruction.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index d05ac772844ca959c900f157e5ca10103de09890..decd194c452c5f3ef264dcc90e091e48c9d52403 100644 (file)
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -145,6 +145,10 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
         // register.
         if (load && reg == INTREG_PC && exception_ret) {
             *++uop = new MicroUopRegMovRet(machInst, 0, INTREG_UREG1);
+            if (!(condCode == COND_AL || condCode == COND_UC))
+                (*uop)->setFlag(StaticInst::IsCondControl);
+            else
+                (*uop)->setFlag(StaticInst::IsUncondControl);
         } else if (load) {
             *++uop = new MicroUopRegMov(machInst, regIdx, INTREG_UREG1);
             if (reg == INTREG_PC) {