From bc49381287698297446da3e6f7b43b8ef4f43b27 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Fri, 22 Oct 2010 00:22:59 -0700
Subject: [PATCH] ARM: Don't pretend to writeback registers in initiateAcc.

---
 src/arch/arm/isa/templates/mem.isa | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/arch/arm/isa/templates/mem.isa b/src/arch/arm/isa/templates/mem.isa
index 1d0e1316c..ced7a0037 100644
--- a/src/arch/arm/isa/templates/mem.isa
+++ b/src/arch/arm/isa/templates/mem.isa
@@ -131,10 +131,6 @@ def template SwapInitiateAcc {{
                 fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
                                   memAccessFlags, &memData);
             }
-
-            if (fault == NoFault) {
-                %(op_wb)s;
-            }
         } else {
             xc->setPredicate(false);
         }
@@ -393,11 +389,6 @@ def template StoreExInitiateAcc {{
                 fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
                                   memAccessFlags, NULL);
             }
-
-            // Need to write back any potential address register update
-            if (fault == NoFault) {
-                %(op_wb)s;
-            }
         } else {
             xc->setPredicate(false);
         }
@@ -431,11 +422,6 @@ def template StoreInitiateAcc {{
                 fault = xc->write((uint%(mem_acc_size)d_t&)Mem, EA,
                                   memAccessFlags, NULL);
             }
-
-            // Need to write back any potential address register update
-            if (fault == NoFault) {
-                %(op_wb)s;
-            }
         } else {
             xc->setPredicate(false);
         }
@@ -473,11 +459,6 @@ def template NeonStoreInitiateAcc {{
                 fault = xc->writeBytes(memUnion.bytes, %(size)d, EA,
                                        memAccessFlags, NULL);
             }
-
-            // Need to write back any potential address register update
-            if (fault == NoFault) {
-                %(op_wb)s;
-            }
         }
 
         if (fault == NoFault && machInst.itstateMask != 0 &&
-- 
2.30.2