From f7d80348fa6c764da5ec75fb6ed4796d4e88aa0a Mon Sep 17 00:00:00 2001
From: Andrew Bardsley <Andrew.Bardsley@arm.com>
Date: Fri, 9 May 2014 18:58:47 -0400
Subject: arm: Add branch flags onto macroops

Mark branch flags onto macroops to allow branch prediction before
microop decomposition
---
 src/arch/arm/insts/macromem.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/arch/arm/insts/macromem.cc')

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index cd77d6d5f..2ada29539 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -171,6 +171,16 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
 
     (*uop)->setLastMicroop();
 
+    /* Take the control flags from the last microop for the macroop */
+    if ((*uop)->isControl())
+        setFlag(StaticInst::IsControl);
+    if ((*uop)->isCondCtrl())
+        setFlag(StaticInst::IsCondControl);
+    if ((*uop)->isIndirectCtrl())
+        setFlag(StaticInst::IsIndirectControl);
+    if ((*uop)->isReturn())
+        setFlag(StaticInst::IsReturn);
+
     for (StaticInstPtr *curUop = microOps;
             !(*curUop)->isLastMicroop(); curUop++) {
         MicroOp * uopPtr = dynamic_cast<MicroOp *>(curUop->get());
-- 
cgit v1.2.3