From 951650156c50058ffc44dc62c5abaec24b79ccde Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 27 Dec 2019 14:09:17 -0800 Subject: [PATCH] arm: Demote PCEvent subclass pointers to PCEvent pointers. Nothing is actually accessed through these pointers. This simplifies their declration, and gives more flexibility when setting up those events. Change-Id: If857de5c8df37b6ead7eae53e3c0c6c3103938c0 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24112 Tested-by: kokoro Maintainer: Giacomo Travaglini Reviewed-by: Bobby R. Bruce --- src/arch/arm/freebsd/fs_workload.hh | 2 +- src/arch/arm/linux/fs_workload.hh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/arch/arm/freebsd/fs_workload.hh b/src/arch/arm/freebsd/fs_workload.hh index b7d8e26e4..eed1d09b5 100644 --- a/src/arch/arm/freebsd/fs_workload.hh +++ b/src/arch/arm/freebsd/fs_workload.hh @@ -88,7 +88,7 @@ class FsFreebsd : public ArmISA::FsWorkload * processor for the appropriate amount of time. This is not functionally * required but does speed up simulation. */ - FreeBSD::SkipUDelay *skipUDelay = nullptr; + PCEvent *skipUDelay = nullptr; /** These variables store addresses of important data structures * that are normaly kept coherent at boot with cache mainetence operations. diff --git a/src/arch/arm/linux/fs_workload.hh b/src/arch/arm/linux/fs_workload.hh index 67f70bc31..73a006b34 100644 --- a/src/arch/arm/linux/fs_workload.hh +++ b/src/arch/arm/linux/fs_workload.hh @@ -63,9 +63,9 @@ class FsLinux : public ArmISA::FsWorkload * PC based event to skip the dprink() call and emulate its * functionality */ - Linux::DebugPrintk *debugPrintk = nullptr; + PCEvent *debugPrintk = nullptr; - DumpStats *dumpStats = nullptr; + PCEvent *dumpStats = nullptr; public: /** Boilerplate params code */ @@ -119,14 +119,14 @@ class FsLinux : public ArmISA::FsWorkload * processor for the appropriate amount of time. This is not functionally * required but does speed up simulation. */ - Linux::SkipUDelay *skipUDelay = nullptr; + PCEvent *skipUDelay = nullptr; /** Another PC based skip event for const_udelay(). Similar to the udelay * skip, but this function precomputes the first multiply that is done * in the generic case since the parameter is known at compile time. * Thus we need to do some division to get back to us. */ - Linux::SkipUDelay *skipConstUDelay = nullptr; + PCEvent *skipConstUDelay = nullptr; }; class DumpStats : public PCEvent -- 2.30.2