ARM: Make sure macroops aren't interrupted midinstruction.

Do this by setting the delayed commit flag for all but the last microop.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 8e9e60f30..01ec3e1d8 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -128,6 +128,13 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
     }
 
     (*uop)->setLastMicroop();
+
+    for (StaticInstPtr *curUop = microOps;
+            !(*curUop)->isLastMicroop(); curUop++) {
+        MicroOp * uopPtr = dynamic_cast<MicroOp *>(curUop->get());
+        assert(uopPtr);
+        uopPtr->setDelayedCommit();
+    }
 }
 
 MacroVFPMemOp::MacroVFPMemOp(const char *mnem, ExtMachInst machInst,
@@ -198,6 +205,13 @@ MacroVFPMemOp::MacroVFPMemOp(const char *mnem, ExtMachInst machInst,
 
     assert(numMicroops == i);
     microOps[numMicroops - 1]->setLastMicroop();
+
+    for (StaticInstPtr *curUop = microOps;
+            !(*curUop)->isLastMicroop(); curUop++) {
+        MicroOp * uopPtr = dynamic_cast<MicroOp *>(curUop->get());
+        assert(uopPtr);
+        uopPtr->setDelayedCommit();
+    }
 }
 
 }