commit 3ff091bdf401113057c26cf1087cf0e872154265
author Nathanael Premillieu <nathanael.premillieu@irisa.fr> Wed Apr 17 16:07:10 2013 -0500
committer Nathanael Premillieu <nathanael.premillieu@irisa.fr> Wed Apr 17 16:07:10 2013 -0500
tree ed96f70edf6d4ee4b4c9c388e5dd46d0e434e975
parent 03c60f005e3241b03953b301a3b56cc58349f03b

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>"

src/arch/arm/insts/macromem.cc

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index decd194..26a916f 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -110,6 +110,10 @@
                     // 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);