From f926fa77112c53ef8444657e89d4f00f559fd61c Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Mon, 4 Apr 2011 11:42:28 -0500
Subject: [PATCH] ARM: Fix bug in MicroLdrNeon templates for initiateAcc().

---
 src/arch/arm/isa/templates/mem.isa | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/arch/arm/isa/templates/mem.isa b/src/arch/arm/isa/templates/mem.isa
index 43a742242..cb255feda 100644
--- a/src/arch/arm/isa/templates/mem.isa
+++ b/src/arch/arm/isa/templates/mem.isa
@@ -455,14 +455,18 @@ def template NeonLoadInitiateAcc {{
         Addr EA;
         Fault fault = NoFault;
 
-        %(op_src_decl)s;
+        %(op_decl)s;
+        %(mem_decl)s;
         %(op_rd)s;
         %(ea_code)s;
 
+        MemUnion memUnion;
+        uint8_t *dataPtr = memUnion.bytes;
+
         if (%(predicate_test)s)
         {
             if (fault == NoFault) {
-                fault = xc->readBytes(EA, NULL, %(size)d, memAccessFlags);
+                fault = xc->readBytes(EA, dataPtr, %(size)d, memAccessFlags);
             }
         } else {
             xc->setPredicate(false);