summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-04-04 11:42:28 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2011-04-04 11:42:28 -0500
commitf926fa77112c53ef8444657e89d4f00f559fd61c (patch)
treef880e23c60c41c1c5da0ce864faf57678a157c66 /src/arch
parent16fcad3907f439b8cdbaad638a8618ee7ad6a9da (diff)
downloadgem5-f926fa77112c53ef8444657e89d4f00f559fd61c.tar.xz
ARM: Fix bug in MicroLdrNeon templates for initiateAcc().
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/isa/templates/mem.isa8
1 files 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);