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/mips/isa/formats/mem.isa | 29 ----------------------------- src/arch/mips/isa/formats/util.isa | 1 - 2 files changed, 30 deletions(-) (limited to 'src/arch/mips/isa') diff --git a/src/arch/mips/isa/formats/mem.isa b/src/arch/mips/isa/formats/mem.isa index 671c7643d..4e1009e9c 100644 --- a/src/arch/mips/isa/formats/mem.isa +++ b/src/arch/mips/isa/formats/mem.isa @@ -143,7 +143,6 @@ def template LoadStoreDeclare {{ %(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(Packet *, ExecContext *, Trace::InstRecord *) const; }; @@ -158,34 +157,6 @@ def template LoadStoreConstructor {{ } }}; - -def template EACompExecute {{ - Fault - %(class_name)s::eaComp(ExecContext *xc, Trace::InstRecord *traceData) const - { - Addr EA; - Fault fault = NoFault; - - if (this->isFloating()) { - %(fp_enable_check)s; - - if(fault != NoFault) - return fault; - } - - %(op_decl)s; - %(op_rd)s; - %(ea_code)s; - - // NOTE: Trace Data is written using execute or completeAcc templates - if (fault == NoFault) { - xc->setEA(EA); - } - - return fault; - } -}}; - def template LoadExecute {{ Fault %(class_name)s::execute(ExecContext *xc, Trace::InstRecord *traceData) const diff --git a/src/arch/mips/isa/formats/util.isa b/src/arch/mips/isa/formats/util.isa index 708338074..a79f20572 100644 --- a/src/arch/mips/isa/formats/util.isa +++ b/src/arch/mips/isa/formats/util.isa @@ -71,7 +71,6 @@ def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags, LoadStoreConstructor.subst(iop), decode_template.subst(iop), fullExecTemplate.subst(iop) - + EACompExecute.subst(iop) + initiateAccTemplate.subst(iop) + completeAccTemplate.subst(iop)) }}; -- cgit v1.2.3