changeset 943808ead35e in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=943808ead35e
description:
arm: m5ops readfile64 args broken, offset coming through garbage
There were several sections of the m5ops code which were
essentially copy/pasted versions of the 32-bit code. The
problem is that some of these didn't account fo4 64-bit
registers leading to arguments being in the wrong registers.
This patch addresses the args for readfile64, writefile64,
and addsymbol64 -- all of which seemed to suffer from a
similar set of problems when moving to 64-bit.
diffstat:
src/arch/arm/isa/insts/m5ops.isa | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r 615962ba6d05 -r 943808ead35e src/arch/arm/isa/insts/m5ops.isa
--- a/src/arch/arm/isa/insts/m5ops.isa Sun Mar 23 11:11:32 2014 -0400
+++ b/src/arch/arm/isa/insts/m5ops.isa Sun Mar 23 11:11:34 2014 -0400
@@ -403,10 +403,10 @@
'''
m5readfileCode64 = '''
- int n = 4;
+ int n = 2;
uint64_t offset = getArgument(xc->tcBase(), n, sizeof(uint64_t), false);
- n = 6;
- X0 = PseudoInst::readfile(xc->tcBase(), (uint32_t)X0, X1, offset);
+ n = 3;
+ X0 = PseudoInst::readfile(xc->tcBase(), X0, X1, offset);
'''
m5readfileIop = InstObjParams("m5readfile", "M5readfile", "PredOp",
@@ -435,11 +435,11 @@
'''
m5writefileCode64 = '''
- int n = 4;
+ int n = 2;
uint64_t offset = getArgument(xc->tcBase(), n, sizeof(uint64_t), false);
- n = 6;
+ n = 3;
Addr filenameAddr = getArgument(xc->tcBase(), n, sizeof(Addr), false);
- X0 = PseudoInst::writefile(xc->tcBase(), (uint32_t)X0, X1, offset,
+ X0 = PseudoInst::writefile(xc->tcBase(), X0, X1, offset,
filenameAddr);
'''
@@ -479,7 +479,7 @@
PseudoInst::addsymbol(xc->tcBase(), join32to64(R1, R0), R2);
'''
m5addsymbolCode64 = '''
- PseudoInst::addsymbol(xc->tcBase(), X0, (uint32_t)X1);
+ PseudoInst::addsymbol(xc->tcBase(), X0, X1);
'''
m5addsymbolIop = InstObjParams("m5addsymbol", "M5addsymbol", "PredOp",
{ "code": m5addsymbolCode,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev