From 41928dac800bd917798e320bb0a65eee71d8d8a6 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Thu, 18 Feb 2021 11:13:45 +0000 Subject: [PATCH] misc: Remove unused params() definitions Lots of times the params() helper has been defined but not used Change-Id: Id71829aca71341d46964d8f071099342b946b62f Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41613 Tested-by: kokoro --- src/arch/arm/fastmodel/iris/interrupts.hh | 2 +- src/arch/arm/freebsd/se_workload.hh | 2 +- src/arch/arm/interrupts.hh | 3 +-- src/arch/arm/linux/se_workload.hh | 3 ++- src/arch/arm/nativetrace.hh | 2 +- src/arch/arm/se_workload.hh | 3 ++- src/arch/arm/tlb.hh | 2 +- src/arch/generic/interrupts.hh | 2 +- src/arch/mips/interrupts.hh | 2 +- src/arch/mips/isa.hh | 2 +- src/arch/mips/linux/se_workload.hh | 2 +- src/arch/mips/se_workload.hh | 2 +- src/arch/power/interrupts.hh | 2 +- src/arch/power/isa.hh | 4 ++-- src/arch/power/linux/se_workload.hh | 2 +- src/arch/power/se_workload.hh | 2 +- src/arch/riscv/interrupts.hh | 2 +- src/arch/riscv/isa.hh | 2 +- src/arch/riscv/linux/se_workload.hh | 2 +- src/arch/riscv/pagetable_walker.hh | 2 +- src/arch/riscv/se_workload.hh | 2 +- src/arch/sparc/interrupts.hh | 2 +- src/arch/sparc/isa.hh | 2 +- src/arch/sparc/linux/se_workload.hh | 2 +- src/arch/x86/fs_workload.hh | 2 +- src/arch/x86/interrupts.hh | 2 +- src/arch/x86/isa.hh | 2 +- src/arch/x86/linux/se_workload.hh | 2 +- src/arch/x86/pagetable_walker.hh | 2 +- src/dev/arm/gic_v2.hh | 2 +- src/dev/arm/pl111.hh | 2 +- src/dev/arm/realview.hh | 2 +- src/dev/arm/rtc_pl031.hh | 2 +- src/dev/arm/timer_a9global.hh | 2 +- src/dev/arm/timer_sp804.hh | 2 +- src/dev/arm/vgic.hh | 2 +- src/dev/baddev.hh | 2 +- src/dev/io_device.hh | 2 +- src/dev/mips/malta_cchip.hh | 2 +- src/dev/net/dist_etherlink.hh | 2 +- src/dev/net/etherbus.hh | 2 +- src/dev/net/etherdevice.hh | 4 ++-- src/dev/net/etherlink.hh | 2 +- src/dev/net/etherswitch.hh | 2 +- src/dev/net/ethertap.hh | 6 +++--- src/dev/serial/uart.hh | 2 +- src/dev/serial/uart8250.hh | 2 +- src/dev/sparc/dtod.hh | 2 +- src/dev/sparc/mm_disk.hh | 2 +- src/dev/x86/i8042.hh | 2 +- src/dev/x86/i82094aa.hh | 2 +- src/dev/x86/i8237.hh | 2 +- src/dev/x86/i8254.hh | 2 +- src/dev/x86/i8259.hh | 2 +- src/dev/x86/south_bridge.hh | 2 +- src/dev/x86/speaker.hh | 2 +- src/gpu-compute/lds_state.hh | 2 +- src/mem/comm_monitor.hh | 2 +- src/mem/mem_checker_monitor.hh | 2 +- src/mem/qos/policy_pf.hh | 2 +- src/mem/ruby/network/fault_model/FaultModel.hh | 2 +- src/sim/clocked_object.hh | 2 +- src/sim/se_workload.hh | 2 +- 63 files changed, 69 insertions(+), 68 deletions(-) diff --git a/src/arch/arm/fastmodel/iris/interrupts.hh b/src/arch/arm/fastmodel/iris/interrupts.hh index 344d9c52ec..c73a628c64 100644 --- a/src/arch/arm/fastmodel/iris/interrupts.hh +++ b/src/arch/arm/fastmodel/iris/interrupts.hh @@ -38,7 +38,7 @@ namespace Iris class Interrupts : public BaseInterrupts { public: - PARAMS(IrisInterrupts); + using Params = IrisInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p) {} diff --git a/src/arch/arm/freebsd/se_workload.hh b/src/arch/arm/freebsd/se_workload.hh index 82d36594bf..a228ee0187 100644 --- a/src/arch/arm/freebsd/se_workload.hh +++ b/src/arch/arm/freebsd/se_workload.hh @@ -46,7 +46,7 @@ namespace ArmISA class EmuFreebsd : public SEWorkload { public: - PARAMS(ArmEmuFreebsd); + using Params = ArmEmuFreebsdParams; EmuFreebsd(const Params &p) : SEWorkload(p) {} diff --git a/src/arch/arm/interrupts.hh b/src/arch/arm/interrupts.hh index ce288794db..aba39cd660 100644 --- a/src/arch/arm/interrupts.hh +++ b/src/arch/arm/interrupts.hh @@ -73,8 +73,7 @@ class Interrupts : public BaseInterrupts uint64_t intStatus; public: - - PARAMS(ArmInterrupts); + using Params = ArmInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p) { diff --git a/src/arch/arm/linux/se_workload.hh b/src/arch/arm/linux/se_workload.hh index 1473803983..615666159f 100644 --- a/src/arch/arm/linux/se_workload.hh +++ b/src/arch/arm/linux/se_workload.hh @@ -40,7 +40,8 @@ namespace ArmISA class EmuLinux : public SEWorkload { public: - PARAMS(ArmEmuLinux); + using Params = ArmEmuLinuxParams; + EmuLinux(const Params &p) : SEWorkload(p) {} struct BaseSyscallABI {}; diff --git a/src/arch/arm/nativetrace.hh b/src/arch/arm/nativetrace.hh index 84d835d504..14ab30331c 100644 --- a/src/arch/arm/nativetrace.hh +++ b/src/arch/arm/nativetrace.hh @@ -96,7 +96,7 @@ class ArmNativeTrace : public NativeTrace bool stopOnPCError; public: - PARAMS(ArmNativeTrace); + using Params = ArmNativeTraceParams; ArmNativeTrace(const Params &p) : NativeTrace(p), stopOnPCError(p.stop_on_pc_error) diff --git a/src/arch/arm/se_workload.hh b/src/arch/arm/se_workload.hh index 8f6b639c67..70a85b0936 100644 --- a/src/arch/arm/se_workload.hh +++ b/src/arch/arm/se_workload.hh @@ -38,7 +38,8 @@ namespace ArmISA class SEWorkload : public ::SEWorkload { public: - PARAMS(ArmSEWorkload); + using Params = ArmSEWorkloadParams; + SEWorkload(const Params &p) : ::SEWorkload(p) {} ::Loader::Arch getArch() const override { return ::Loader::Arm64; } diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh index d71df7e397..e06939e3a4 100644 --- a/src/arch/arm/tlb.hh +++ b/src/arch/arm/tlb.hh @@ -204,7 +204,7 @@ class TLB : public BaseTLB int rangeMRU; //On lookup, only move entries ahead when outside rangeMRU public: - PARAMS(ArmTLB); + using Params = ArmTLBParams; TLB(const Params &p); TLB(const Params &p, int _size, TableWalker *_walker); diff --git a/src/arch/generic/interrupts.hh b/src/arch/generic/interrupts.hh index e1eab1b335..a4c640f113 100644 --- a/src/arch/generic/interrupts.hh +++ b/src/arch/generic/interrupts.hh @@ -41,7 +41,7 @@ class BaseInterrupts : public SimObject ThreadContext *tc = nullptr; public: - PARAMS(BaseInterrupts); + using Params = BaseInterruptsParams; BaseInterrupts(const Params &p) : SimObject(p) {} diff --git a/src/arch/mips/interrupts.hh b/src/arch/mips/interrupts.hh index 418ec42902..ebfc420a15 100644 --- a/src/arch/mips/interrupts.hh +++ b/src/arch/mips/interrupts.hh @@ -47,7 +47,7 @@ namespace MipsISA class Interrupts : public BaseInterrupts { public: - PARAMS(MipsInterrupts); + using Params = MipsInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p) {} diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh index 7ab1fa1a86..1e94a98e6b 100644 --- a/src/arch/mips/isa.hh +++ b/src/arch/mips/isa.hh @@ -54,7 +54,7 @@ namespace MipsISA // The MIPS name for this file is CP0 or Coprocessor 0 typedef ISA CP0; - PARAMS(MipsISA); + using Params = MipsISAParams; protected: // Number of threads and vpes an individual ISA state can handle diff --git a/src/arch/mips/linux/se_workload.hh b/src/arch/mips/linux/se_workload.hh index 2a21c7c1d7..13e2110529 100644 --- a/src/arch/mips/linux/se_workload.hh +++ b/src/arch/mips/linux/se_workload.hh @@ -44,7 +44,7 @@ class EmuLinux : public SEWorkload static SyscallDescTable syscallDescs; public: - PARAMS(MipsEmuLinux); + using Params = MipsEmuLinuxParams; EmuLinux(const Params &p) : SEWorkload(p) {} diff --git a/src/arch/mips/se_workload.hh b/src/arch/mips/se_workload.hh index 18e054bafe..55c605d52f 100644 --- a/src/arch/mips/se_workload.hh +++ b/src/arch/mips/se_workload.hh @@ -40,7 +40,7 @@ namespace MipsISA class SEWorkload : public ::SEWorkload { public: - PARAMS(MipsSEWorkload); + using Params = MipsSEWorkloadParams; SEWorkload(const Params &p) : ::SEWorkload(p) {} diff --git a/src/arch/power/interrupts.hh b/src/arch/power/interrupts.hh index 91f2dc37a5..f5d571d376 100644 --- a/src/arch/power/interrupts.hh +++ b/src/arch/power/interrupts.hh @@ -41,7 +41,7 @@ namespace PowerISA { class Interrupts : public BaseInterrupts { public: - PARAMS(PowerInterrupts); + using Params = PowerInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p) {} diff --git a/src/arch/power/isa.hh b/src/arch/power/isa.hh index ce98b560e2..076cbc855d 100644 --- a/src/arch/power/isa.hh +++ b/src/arch/power/isa.hh @@ -52,8 +52,6 @@ class ISA : public BaseISA RegVal miscRegs[NumMiscRegs]; public: - PARAMS(PowerISA); - void clear() {} public: @@ -128,6 +126,8 @@ class ISA : public BaseISA return reg; } + using Params = PowerISAParams; + ISA(const Params &p); }; diff --git a/src/arch/power/linux/se_workload.hh b/src/arch/power/linux/se_workload.hh index 1886f7cc33..d8012ff8bd 100644 --- a/src/arch/power/linux/se_workload.hh +++ b/src/arch/power/linux/se_workload.hh @@ -45,7 +45,7 @@ class EmuLinux : public SEWorkload static SyscallDescTable syscallDescs; public: - PARAMS(PowerEmuLinux); + using Params = PowerEmuLinuxParams; EmuLinux(const Params &p) : SEWorkload(p) {} diff --git a/src/arch/power/se_workload.hh b/src/arch/power/se_workload.hh index 60938233df..9bdd0cc23c 100644 --- a/src/arch/power/se_workload.hh +++ b/src/arch/power/se_workload.hh @@ -40,7 +40,7 @@ namespace PowerISA class SEWorkload : public ::SEWorkload { public: - PARAMS(PowerSEWorkload); + using Params = PowerSEWorkloadParams; SEWorkload(const Params &p) : ::SEWorkload(p) {} ::Loader::Arch getArch() const override { return ::Loader::Power; } diff --git a/src/arch/riscv/interrupts.hh b/src/arch/riscv/interrupts.hh index 375c549e9d..f07e7d7a7b 100644 --- a/src/arch/riscv/interrupts.hh +++ b/src/arch/riscv/interrupts.hh @@ -57,7 +57,7 @@ class Interrupts : public BaseInterrupts std::bitset ie; public: - PARAMS(RiscvInterrupts); + using Params = RiscvInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p), ip(0), ie(0) {} diff --git a/src/arch/riscv/isa.hh b/src/arch/riscv/isa.hh index 1bd64d6477..dbcb206202 100644 --- a/src/arch/riscv/isa.hh +++ b/src/arch/riscv/isa.hh @@ -76,7 +76,7 @@ class ISA : public BaseISA bool hpmCounterEnabled(int counter) const; public: - PARAMS(RiscvISA); + using Params = RiscvISAParams; void clear(); diff --git a/src/arch/riscv/linux/se_workload.hh b/src/arch/riscv/linux/se_workload.hh index e6110bb17c..862d33abe7 100644 --- a/src/arch/riscv/linux/se_workload.hh +++ b/src/arch/riscv/linux/se_workload.hh @@ -49,7 +49,7 @@ class EmuLinux : public SEWorkload static SyscallDescTable syscallDescs32; public: - PARAMS(RiscvEmuLinux); + using Params = RiscvEmuLinuxParams; EmuLinux(const Params &p) : SEWorkload(p) {} diff --git a/src/arch/riscv/pagetable_walker.hh b/src/arch/riscv/pagetable_walker.hh index 514ea3b5b8..1291284ac5 100644 --- a/src/arch/riscv/pagetable_walker.hh +++ b/src/arch/riscv/pagetable_walker.hh @@ -191,7 +191,7 @@ namespace RiscvISA tlb = _tlb; } - PARAMS(RiscvPagetableWalker); + using Params = RiscvPagetableWalkerParams; Walker(const Params ¶ms) : ClockedObject(params), port(name() + ".port", this), diff --git a/src/arch/riscv/se_workload.hh b/src/arch/riscv/se_workload.hh index 20f108f3fe..fcb79e8c11 100644 --- a/src/arch/riscv/se_workload.hh +++ b/src/arch/riscv/se_workload.hh @@ -40,7 +40,7 @@ namespace RiscvISA class SEWorkload : public ::SEWorkload { public: - PARAMS(RiscvSEWorkload); + using Params = RiscvSEWorkloadParams; SEWorkload(const Params &p) : ::SEWorkload(p) {} diff --git a/src/arch/sparc/interrupts.hh b/src/arch/sparc/interrupts.hh index 7011e84d8c..02708b8298 100644 --- a/src/arch/sparc/interrupts.hh +++ b/src/arch/sparc/interrupts.hh @@ -61,7 +61,7 @@ class Interrupts : public BaseInterrupts public: - PARAMS(SparcInterrupts); + using Params = SparcInterruptsParams; Interrupts(const Params &p) : BaseInterrupts(p) { diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh index 88e28374c4..077c649a52 100644 --- a/src/arch/sparc/isa.hh +++ b/src/arch/sparc/isa.hh @@ -221,7 +221,7 @@ class ISA : public BaseISA return readMiscRegNoEffect(MISCREG_MMU_P_CONTEXT); } - PARAMS(SparcISA); + using Params = SparcISAParams; ISA(const Params &p); }; diff --git a/src/arch/sparc/linux/se_workload.hh b/src/arch/sparc/linux/se_workload.hh index 5e10b4fc25..1a0afef8c2 100644 --- a/src/arch/sparc/linux/se_workload.hh +++ b/src/arch/sparc/linux/se_workload.hh @@ -50,7 +50,7 @@ class EmuLinux : public SEWorkload void syscall32(ThreadContext *tc); public: - PARAMS(SparcEmuLinux); + using Params = SparcEmuLinuxParams; EmuLinux(const Params &p); diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh index 4cb996d10e..f926dce32a 100644 --- a/src/arch/x86/fs_workload.hh +++ b/src/arch/x86/fs_workload.hh @@ -71,7 +71,7 @@ void installSegDesc(ThreadContext *tc, SegmentRegIndex seg, class FsWorkload : public KernelWorkload { public: - PARAMS(X86FsWorkload); + using Params = X86FsWorkloadParams; FsWorkload(const Params &p); public: diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh index b5cfc414b2..79a959a59a 100644 --- a/src/arch/x86/interrupts.hh +++ b/src/arch/x86/interrupts.hh @@ -190,7 +190,7 @@ class Interrupts : public BaseInterrupts /* * Params stuff. */ - PARAMS(X86LocalApic); + using Params = X86LocalApicParams; void setThreadContext(ThreadContext *_tc) override; diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh index 7e72781044..8bd3072dc4 100644 --- a/src/arch/x86/isa.hh +++ b/src/arch/x86/isa.hh @@ -57,7 +57,7 @@ namespace X86ISA public: void clear(); - PARAMS(X86ISA); + using Params = X86ISAParams; ISA(const Params &p); diff --git a/src/arch/x86/linux/se_workload.hh b/src/arch/x86/linux/se_workload.hh index f2f02f248d..b8d1774532 100644 --- a/src/arch/x86/linux/se_workload.hh +++ b/src/arch/x86/linux/se_workload.hh @@ -52,7 +52,7 @@ namespace X86ISA class EmuLinux : public SEWorkload { public: - PARAMS(X86EmuLinux); + using Params = X86EmuLinuxParams; EmuLinux(const Params &p); diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh index 6a96e58ac3..f66e147d8a 100644 --- a/src/arch/x86/pagetable_walker.hh +++ b/src/arch/x86/pagetable_walker.hh @@ -193,7 +193,7 @@ namespace X86ISA tlb = _tlb; } - PARAMS(X86PagetableWalker); + using Params = X86PagetableWalkerParams; Walker(const Params ¶ms) : ClockedObject(params), port(name() + ".port", this), diff --git a/src/dev/arm/gic_v2.hh b/src/dev/arm/gic_v2.hh index 9e671be2be..ef8fd636bd 100644 --- a/src/dev/arm/gic_v2.hh +++ b/src/dev/arm/gic_v2.hh @@ -475,7 +475,7 @@ class GicV2 : public BaseGic, public BaseGicRegisters int pendingDelayedInterrupts; public: - PARAMS(GicV2); + using Params = GicV2Params; GicV2(const Params &p); ~GicV2(); diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh index afa11e9185..2a9b93c29e 100644 --- a/src/dev/arm/pl111.hh +++ b/src/dev/arm/pl111.hh @@ -356,7 +356,7 @@ class Pl111: public AmbaDmaDevice bool enableCapture; public: - PARAMS(Pl111); + using Params = Pl111Params; Pl111(const Params &p); ~Pl111(); diff --git a/src/dev/arm/realview.hh b/src/dev/arm/realview.hh index e51cf6fa59..75def2f464 100644 --- a/src/dev/arm/realview.hh +++ b/src/dev/arm/realview.hh @@ -63,7 +63,7 @@ class RealView : public Platform BaseGic *gic; public: - PARAMS(RealView); + using Params = RealViewParams; /** * Constructor for the Tsunami Class. diff --git a/src/dev/arm/rtc_pl031.hh b/src/dev/arm/rtc_pl031.hh index 3cc1fafb89..0ca6701a26 100644 --- a/src/dev/arm/rtc_pl031.hh +++ b/src/dev/arm/rtc_pl031.hh @@ -97,7 +97,7 @@ class PL031 : public AmbaIntDevice void resyncMatch(); public: - PARAMS(PL031); + using Params = PL031Params; /** * The constructor for RealView just registers itself with the MMU. diff --git a/src/dev/arm/timer_a9global.hh b/src/dev/arm/timer_a9global.hh index 03ef1a849b..c56a291b35 100644 --- a/src/dev/arm/timer_a9global.hh +++ b/src/dev/arm/timer_a9global.hh @@ -149,7 +149,7 @@ class A9GlobalTimer : public BasicPioDevice Timer global_timer; public: - PARAMS(A9GlobalTimer); + using Params = A9GlobalTimerParams; /** * The constructor for RealView just registers itself with the MMU. diff --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh index c19d165cd6..065846790b 100644 --- a/src/dev/arm/timer_sp804.hh +++ b/src/dev/arm/timer_sp804.hh @@ -135,7 +135,7 @@ class Sp804 : public AmbaPioDevice Timer timer1; public: - PARAMS(Sp804); + using Params = Sp804Params; /** * The constructor for RealView just registers itself with the MMU. diff --git a/src/dev/arm/vgic.hh b/src/dev/arm/vgic.hh index 29a6b8ea34..b3af9bb379 100644 --- a/src/dev/arm/vgic.hh +++ b/src/dev/arm/vgic.hh @@ -186,7 +186,7 @@ class VGic : public PioDevice struct std::array vcpuData; public: - PARAMS(VGic); + using Params = VGicParams; VGic(const Params &p); ~VGic(); diff --git a/src/dev/baddev.hh b/src/dev/baddev.hh index 0f1a65dfa1..835a34efdb 100644 --- a/src/dev/baddev.hh +++ b/src/dev/baddev.hh @@ -49,7 +49,7 @@ class BadDevice : public BasicPioDevice std::string devname; public: - PARAMS(BadDevice); + using Params = BadDeviceParams; /** * Constructor for the Baddev Class. diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index f86289b6f1..834b505e05 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -128,7 +128,7 @@ class PioDevice : public ClockedObject virtual Tick write(PacketPtr pkt) = 0; public: - PARAMS(PioDevice); + using Params = PioDeviceParams; PioDevice(const Params &p); virtual ~PioDevice(); diff --git a/src/dev/mips/malta_cchip.hh b/src/dev/mips/malta_cchip.hh index 711663de67..82dcad23fa 100644 --- a/src/dev/mips/malta_cchip.hh +++ b/src/dev/mips/malta_cchip.hh @@ -76,7 +76,7 @@ class MaltaCChip : public BasicPioDevice //uint64_t itint; public: - PARAMS(MaltaCChip); + using Params = MaltaCChipParams; /** * Initialize the Malta CChip by setting all of the diff --git a/src/dev/net/dist_etherlink.hh b/src/dev/net/dist_etherlink.hh index c82b0ab6cb..a3f32d39ac 100644 --- a/src/dev/net/dist_etherlink.hh +++ b/src/dev/net/dist_etherlink.hh @@ -215,7 +215,7 @@ class DistEtherLink : public SimObject Tick linkDelay; public: - PARAMS(DistEtherLink); + using Params = DistEtherLinkParams; DistEtherLink(const Params &p); ~DistEtherLink(); diff --git a/src/dev/net/etherbus.hh b/src/dev/net/etherbus.hh index 49998ed844..e280f2b7cb 100644 --- a/src/dev/net/etherbus.hh +++ b/src/dev/net/etherbus.hh @@ -55,7 +55,7 @@ class EtherBus : public SimObject EtherDump *dump; public: - PARAMS(EtherBus); + using Params = EtherBusParams; EtherBus(const Params &p); virtual ~EtherBus() {} diff --git a/src/dev/net/etherdevice.hh b/src/dev/net/etherdevice.hh index d9b60e5cf4..2126afb022 100644 --- a/src/dev/net/etherdevice.hh +++ b/src/dev/net/etherdevice.hh @@ -45,7 +45,7 @@ class EtherInt; class EtherDevice : public PciDevice { public: - PARAMS(EtherDevice); + using Params = EtherDeviceParams; EtherDevice(const Params ¶ms) : PciDevice(params), etherDeviceStats(this) @@ -140,7 +140,7 @@ class EtherDevice : public PciDevice class EtherDevBase : public EtherDevice { public: - PARAMS(EtherDevBase); + using Params = EtherDevBaseParams; EtherDevBase(const Params ¶ms) : EtherDevice(params) {} diff --git a/src/dev/net/etherlink.hh b/src/dev/net/etherlink.hh index a15877c980..f2753668b4 100644 --- a/src/dev/net/etherlink.hh +++ b/src/dev/net/etherlink.hh @@ -140,7 +140,7 @@ class EtherLink : public SimObject Interface *interface[2]; public: - PARAMS(EtherLink); + using Params = EtherLinkParams; EtherLink(const Params &p); virtual ~EtherLink(); diff --git a/src/dev/net/etherswitch.hh b/src/dev/net/etherswitch.hh index 9b46f1d95c..78bcb66864 100644 --- a/src/dev/net/etherswitch.hh +++ b/src/dev/net/etherswitch.hh @@ -51,7 +51,7 @@ class EtherSwitch : public SimObject { public: - PARAMS(EtherSwitch); + using Params = EtherSwitchParams; EtherSwitch(const Params &p); ~EtherSwitch(); diff --git a/src/dev/net/ethertap.hh b/src/dev/net/ethertap.hh index eb4b4be358..eb67fa3302 100644 --- a/src/dev/net/ethertap.hh +++ b/src/dev/net/ethertap.hh @@ -56,7 +56,7 @@ class EtherTapInt; class EtherTapBase : public SimObject { public: - PARAMS(EtherTapBase); + using Params = EtherTapBaseParams; EtherTapBase(const Params &p); virtual ~EtherTapBase(); @@ -130,7 +130,7 @@ class TapListener; class EtherTapStub : public EtherTapBase { public: - PARAMS(EtherTapStub); + using Params = EtherTapStubParams; EtherTapStub(const Params &p); ~EtherTapStub(); @@ -159,7 +159,7 @@ class EtherTapStub : public EtherTapBase class EtherTap : public EtherTapBase { public: - PARAMS(EtherTap); + using Params = EtherTapParams; EtherTap(const Params &p); ~EtherTap(); diff --git a/src/dev/serial/uart.hh b/src/dev/serial/uart.hh index 97f0250caf..770e7a088b 100644 --- a/src/dev/serial/uart.hh +++ b/src/dev/serial/uart.hh @@ -51,7 +51,7 @@ class Uart : public BasicPioDevice SerialDevice *device; public: - PARAMS(Uart); + using Params = UartParams; Uart(const Params &p, Addr pio_size); /** diff --git a/src/dev/serial/uart8250.hh b/src/dev/serial/uart8250.hh index 2525eaa30a..328924b3d4 100644 --- a/src/dev/serial/uart8250.hh +++ b/src/dev/serial/uart8250.hh @@ -209,7 +209,7 @@ class Uart8250 : public Uart EventFunctionWrapper rxIntrEvent; public: - PARAMS(Uart8250); + using Params = Uart8250Params; Uart8250(const Params &p); Tick read(PacketPtr pkt) override; diff --git a/src/dev/sparc/dtod.hh b/src/dev/sparc/dtod.hh index defe4a0c81..deb39f1515 100644 --- a/src/dev/sparc/dtod.hh +++ b/src/dev/sparc/dtod.hh @@ -49,7 +49,7 @@ class DumbTOD : public BasicPioDevice uint64_t todTime; public: - PARAMS(DumbTOD); + using Params = DumbTODParams; DumbTOD(const Params &p); Tick read(PacketPtr pkt) override; diff --git a/src/dev/sparc/mm_disk.hh b/src/dev/sparc/mm_disk.hh index 0e111c6ed4..645f346b38 100644 --- a/src/dev/sparc/mm_disk.hh +++ b/src/dev/sparc/mm_disk.hh @@ -47,7 +47,7 @@ class MmDisk : public BasicPioDevice uint8_t diskData[SectorSize]; public: - PARAMS(MmDisk); + using Params = MmDiskParams; MmDisk(const Params &p); Tick read(PacketPtr pkt) override; diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh index f70755814e..1cde2cd7a2 100644 --- a/src/dev/x86/i8042.hh +++ b/src/dev/x86/i8042.hh @@ -117,7 +117,7 @@ class I8042 : public BasicPioDevice uint8_t readDataOut(); public: - PARAMS(I8042); + using Params = I8042Params; I8042(const Params &p); diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh index f8036f7ade..1b8a25f928 100644 --- a/src/dev/x86/i82094aa.hh +++ b/src/dev/x86/i82094aa.hh @@ -85,7 +85,7 @@ class I82094AA : public BasicPioDevice IntRequestPort intRequestPort; public: - PARAMS(I82094AA); + using Params = I82094AAParams; I82094AA(const Params &p); diff --git a/src/dev/x86/i8237.hh b/src/dev/x86/i8237.hh index 3aecd92e1b..fbc30f765a 100644 --- a/src/dev/x86/i8237.hh +++ b/src/dev/x86/i8237.hh @@ -92,7 +92,7 @@ class I8237 : public BasicPioDevice void setMaskBit(Register ®, const uint8_t &command); public: - PARAMS(I8237); + using Params = I8237Params; I8237(const Params &p); diff --git a/src/dev/x86/i8254.hh b/src/dev/x86/i8254.hh index f99ab6dfb4..79e701ff53 100644 --- a/src/dev/x86/i8254.hh +++ b/src/dev/x86/i8254.hh @@ -66,7 +66,7 @@ class I8254 : public BasicPioDevice void counterInterrupt(unsigned int num); public: - PARAMS(I8254); + using Params = I8254Params; Port & getPort(const std::string &if_name, PortID idx=InvalidPortID) override diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh index 0accf3fc07..8b024ba2d3 100644 --- a/src/dev/x86/i8259.hh +++ b/src/dev/x86/i8259.hh @@ -81,7 +81,7 @@ class I8259 : public BasicPioDevice void handleEOI(int line); public: - PARAMS(I8259); + using Params = I8259Params; I8259(const Params &p); diff --git a/src/dev/x86/south_bridge.hh b/src/dev/x86/south_bridge.hh index 921760e377..99d8f35e20 100644 --- a/src/dev/x86/south_bridge.hh +++ b/src/dev/x86/south_bridge.hh @@ -55,7 +55,7 @@ class SouthBridge : public SimObject X86ISA::I82094AA * ioApic; public: - PARAMS(SouthBridge); + using Params = SouthBridgeParams; SouthBridge(const Params &p); }; diff --git a/src/dev/x86/speaker.hh b/src/dev/x86/speaker.hh index 047856e273..7189359298 100644 --- a/src/dev/x86/speaker.hh +++ b/src/dev/x86/speaker.hh @@ -54,7 +54,7 @@ class Speaker : public BasicPioDevice I8254 * timer; public: - PARAMS(PcSpeaker); + using Params = PcSpeakerParams; Speaker(const Params &p) : BasicPioDevice(p, 1), latency(p.pio_latency), controlVal(0), timer(p.i8254) diff --git a/src/gpu-compute/lds_state.hh b/src/gpu-compute/lds_state.hh index de29654422..0daa840faa 100644 --- a/src/gpu-compute/lds_state.hh +++ b/src/gpu-compute/lds_state.hh @@ -259,7 +259,7 @@ class LdsState: public ClockedObject unsigned *numBankAccesses); public: - PARAMS(LdsState); + using Params = LdsStateParams; LdsState(const Params ¶ms); diff --git a/src/mem/comm_monitor.hh b/src/mem/comm_monitor.hh index 557b1df6fd..03f6590152 100644 --- a/src/mem/comm_monitor.hh +++ b/src/mem/comm_monitor.hh @@ -63,7 +63,7 @@ class CommMonitor : public SimObject public: // Construction & SimObject interfaces /** Parameters of communication monitor */ - PARAMS(CommMonitor); + using Params = CommMonitorParams; /** * Constructor based on the Python params diff --git a/src/mem/mem_checker_monitor.hh b/src/mem/mem_checker_monitor.hh index 9ff14c7621..a1d5fd3a90 100644 --- a/src/mem/mem_checker_monitor.hh +++ b/src/mem/mem_checker_monitor.hh @@ -52,7 +52,7 @@ class MemCheckerMonitor : public SimObject public: /** Parameters of memchecker monitor */ - PARAMS(MemCheckerMonitor); + using Params = MemCheckerMonitorParams; /** * Constructor based on the Python params diff --git a/src/mem/qos/policy_pf.hh b/src/mem/qos/policy_pf.hh index d922792473..230a3c9c55 100644 --- a/src/mem/qos/policy_pf.hh +++ b/src/mem/qos/policy_pf.hh @@ -58,7 +58,7 @@ namespace QoS { */ class PropFairPolicy : public Policy { - PARAMS(QoSPropFairPolicy); + using Params = QoSPropFairPolicyParams; public: PropFairPolicy(const Params &); diff --git a/src/mem/ruby/network/fault_model/FaultModel.hh b/src/mem/ruby/network/fault_model/FaultModel.hh index 1de869f5c8..42759adc0b 100644 --- a/src/mem/ruby/network/fault_model/FaultModel.hh +++ b/src/mem/ruby/network/fault_model/FaultModel.hh @@ -53,7 +53,7 @@ class FaultModel : public SimObject { public: - PARAMS(FaultModel); + using Params = FaultModelParams; FaultModel(const Params &p); /************************************************************************/ diff --git a/src/sim/clocked_object.hh b/src/sim/clocked_object.hh index 12204c3027..23ace92e3d 100644 --- a/src/sim/clocked_object.hh +++ b/src/sim/clocked_object.hh @@ -234,7 +234,7 @@ class ClockedObject : public SimObject, public Clocked ClockedObject(const ClockedObjectParams &p); /** Parameters of ClockedObject */ - PARAMS(ClockedObject); + using Params = ClockedObjectParams; void serialize(CheckpointOut &cp) const override; void unserialize(CheckpointIn &cp) override; diff --git a/src/sim/se_workload.hh b/src/sim/se_workload.hh index dc3a3d39b1..50c35ddbd4 100644 --- a/src/sim/se_workload.hh +++ b/src/sim/se_workload.hh @@ -34,7 +34,7 @@ class SEWorkload : public Workload { public: - PARAMS(SEWorkload); + using Params = SEWorkloadParams; SEWorkload(const Params &p);