From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Tue, 14 Jul 2020 11:36:56 +0000 (+0100)
Subject: dev-arm: A SystemCounterListener doesn't have to be Serializable
X-Git-Tag: develop-gem5-snapshot~216
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b621de5cd6ca6d925ac70d540223130d3b522947;p=gem5.git

dev-arm: A SystemCounterListener doesn't have to be Serializable

The class is not making use of any Serializable utility.
By removing this dependency we can extend it more easilly

Change-Id: Ia321b8f0deeb92adde008551eb921dcfd365e675
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39698
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index 16d2ce31b..9a6663cd1 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -71,7 +71,7 @@ class GenericTimerMemParams;
 
 /// Abstract class for elements whose events depend on the counting speed
 /// of the System Counter
-class SystemCounterListener : public Serializable
+class SystemCounterListener
 {
   public:
     /// Called from the SystemCounter when a change in counting speed occurred
@@ -174,7 +174,8 @@ class SystemCounter : public SimObject
 };
 
 /// Per-CPU architected timer.
-class ArchTimer : public SystemCounterListener, public Drainable
+class ArchTimer : public SystemCounterListener, public Drainable,
+                  public Serializable
 {
   protected:
     /// Control register.
@@ -297,7 +298,7 @@ class GenericTimer : public SimObject
     RegVal readMiscReg(int misc_reg, unsigned cpu);
 
   protected:
-    class CoreTimers : public SystemCounterListener
+    class CoreTimers : public SystemCounterListener, public Serializable
     {
       public:
         CoreTimers(GenericTimer &_parent, ArmSystem &system, unsigned cpu,