From 93a168c25e5bb396ee749d25a2ab80ce7bec1764 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 12 Dec 2017 23:12:30 -0800 Subject: cpu,alpha,mips,power,riscv,sparc: Get rid of eaComp and memAccInst. Neither of these were used, particularly memAccInst. Change-Id: I4ac9e44cf624e5de42519d586d7b699f08a2cdfc Reviewed-on: https://gem5-review.googlesource.com/6601 Maintainer: Gabe Black Reviewed-by: Andreas Sandberg --- src/arch/sparc/isa/formats/mem/basicmem.isa | 3 --- src/arch/sparc/isa/formats/mem/swap.isa | 2 +- src/arch/sparc/isa/formats/mem/util.isa | 22 ---------------------- 3 files changed, 1 insertion(+), 26 deletions(-) (limited to 'src/arch/sparc') diff --git a/src/arch/sparc/isa/formats/mem/basicmem.isa b/src/arch/sparc/isa/formats/mem/basicmem.isa index 391063cf8..bc7d033b6 100644 --- a/src/arch/sparc/isa/formats/mem/basicmem.isa +++ b/src/arch/sparc/isa/formats/mem/basicmem.isa @@ -46,7 +46,6 @@ def template MemDeclare {{ %(class_name)s(ExtMachInst machInst); Fault execute(ExecContext *, Trace::InstRecord *) const; - Fault eaComp(ExecContext *, Trace::InstRecord *) const; Fault initiateAcc(ExecContext *, Trace::InstRecord *) const; Fault completeAcc(PacketPtr, ExecContext *, Trace::InstRecord *) const; @@ -71,8 +70,6 @@ let {{ exec_output = doDualSplitExecute(code, postacc_code, addrCalcReg, addrCalcImm, execute, faultCode, name, name + "Imm", Name, Name + "Imm", asi, opt_flags) - exec_output += EACompExecute.subst(iop); - exec_output += EACompExecute.subst(iop_imm); return (header_output, decoder_output, exec_output, decode_block) }}; diff --git a/src/arch/sparc/isa/formats/mem/swap.isa b/src/arch/sparc/isa/formats/mem/swap.isa index c35fffd97..fcabc33e4 100644 --- a/src/arch/sparc/isa/formats/mem/swap.isa +++ b/src/arch/sparc/isa/formats/mem/swap.isa @@ -164,7 +164,7 @@ let {{ "EA_trunc" : TruncateEA} exec_output = doSplitExecute(execute, name, Name, mem_flags, ["IsStoreConditional"], microParams); - return (header_output, decoder_output, exec_output + EACompExecute.subst(iop), decode_block) + return (header_output, decoder_output, exec_output, decode_block) }}; diff --git a/src/arch/sparc/isa/formats/mem/util.isa b/src/arch/sparc/isa/formats/mem/util.isa index ad43a6810..8711cb812 100644 --- a/src/arch/sparc/isa/formats/mem/util.isa +++ b/src/arch/sparc/isa/formats/mem/util.isa @@ -163,28 +163,6 @@ def template StoreCompleteAcc {{ } }}; -def template EACompExecute {{ - Fault - %(class_name)s::eaComp(ExecContext *xc, - Trace::InstRecord *traceData) const - { - Addr EA; - Fault fault = NoFault; - %(op_decl)s; - %(op_rd)s; - %(ea_code)s; - %(fault_check)s; - - // NOTE: Trace Data is written using execute or completeAcc templates - if (fault == NoFault) { - %(EA_trunc)s - xc->setEA(EA); - } - - return fault; - } -}}; - // Here are some code snippets which check for various fault conditions let {{ LoadFuncs = [LoadExecute, LoadInitiateAcc, LoadCompleteAcc] -- cgit v1.2.3