From e67749426054d8ddb7f11b53a89741d4808f3acb Mon Sep 17 00:00:00 2001 From: Gabor Dozsa Date: Thu, 7 Jan 2016 16:33:47 -0600 Subject: pseudo inst,util: Add optional key to initparam pseudo instruction The key parameter can be used to read out various config parameters from within the simulated software. --- src/arch/arm/isa/insts/m5ops.isa | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/arch/arm') diff --git a/src/arch/arm/isa/insts/m5ops.isa b/src/arch/arm/isa/insts/m5ops.isa index e18d0682c..efe88c73a 100644 --- a/src/arch/arm/isa/insts/m5ops.isa +++ b/src/arch/arm/isa/insts/m5ops.isa @@ -276,13 +276,14 @@ let {{ exec_output += PredOpExecute.subst(loadsymbolIop) initparamCode = ''' - uint64_t ip_val = PseudoInst::initParam(xc->tcBase()); + uint64_t ip_val = PseudoInst::initParam(xc->tcBase(), join32to64(R1, R0), + join32to64(R3, R2)); R0 = bits(ip_val, 31, 0); R1 = bits(ip_val, 63, 32); ''' initparamCode64 = ''' - X0 = PseudoInst::initParam(xc->tcBase()); + X0 = PseudoInst::initParam(xc->tcBase(), X0, X1); ''' initparamIop = InstObjParams("initparam", "Initparam", "PredOp", -- cgit v1.2.3