summaryrefslogtreecommitdiff
path: root/src/arch/arm/insts
diff options
context:
space:
mode:
authorNathanael Premillieu <nathanael.premillieu@irisa.fr>2013-04-17 16:07:10 -0500
committerNathanael Premillieu <nathanael.premillieu@irisa.fr>2013-04-17 16:07:10 -0500
commit3ff091bdf401113057c26cf1087cf0e872154265 (patch)
treeed96f70edf6d4ee4b4c9c388e5dd46d0e434e975 /src/arch/arm/insts
parent03c60f005e3241b03953b301a3b56cc58349f03b (diff)
downloadgem5-3ff091bdf401113057c26cf1087cf0e872154265.tar.xz
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>"
Diffstat (limited to 'src/arch/arm/insts')
-rw-r--r--src/arch/arm/insts/macromem.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index decd194c4..26a916fc7 100644
--- 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);