arm: set ldr_ret_uop as conditional or unconditional control

This patch adds a missing flag to the ldr_ret_uop microop instruction.
The flag is added 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 decd194c452c5f3ef264dcc90e091e48c9d52403..26a916fc74699ada2a2f3f3837070daa644fcd57 100644 (file)
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -110,6 +110,10 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
                     // This must be the exception return form of ldm.
                     *++uop = new MicroLdrRetUop(machInst, regIdx,
                                                INTREG_UREG0, up, addr);
+                    if (!(condCode == COND_AL || condCode == COND_UC))
+                        (*uop)->setFlag(StaticInst::IsCondControl);
+                    else
+                        (*uop)->setFlag(StaticInst::IsUncondControl);
                 } else {
                     *++uop = new MicroLdrUop(machInst, regIdx,
                                             INTREG_UREG0, up, addr);