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 <noreply+kokoro@google.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>

diff --git a/src/arch/arm/freebsd/fs_workload.hh b/src/arch/arm/freebsd/fs_workload.hh
index b7d8e26e4b902ac0b78c0cac17c1c890753c8e3f..eed1d09b5dabc09804bbe00a0344abdf61739688 100644 (file)
--- 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<SkipFunc> *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 67f70bc31750a2fea6a924bab343f148e4b5e28f..73a006b3490f101bff446df6f2764771584a2861 100644 (file)
--- 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<SkipFunc> *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<SkipFunc> *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<SkipFunc> *skipConstUDelay = nullptr;
+    PCEvent *skipConstUDelay = nullptr;
 };
 
 class DumpStats : public PCEvent