sim: Switch from EventWrapper to MemberEventWrapper before deprec

Change-Id: I25c81787d522a0dd063112b6727669da46e0f0e7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67655
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>

src/arch/sparc/isa.hh

@@ -133,13 +133,13 @@ class ISA : public BaseISA
     void processSTickCompare();
     void processHSTickCompare();
 
-    typedef EventWrapper<ISA, &ISA::processTickCompare> TickCompareEvent;
+    typedef MemberEventWrapper<&ISA::processTickCompare> TickCompareEvent;
     TickCompareEvent *tickCompare = nullptr;
 
-    typedef EventWrapper<ISA, &ISA::processSTickCompare> STickCompareEvent;
+    typedef MemberEventWrapper<&ISA::processSTickCompare> STickCompareEvent;
     STickCompareEvent *sTickCompare = nullptr;
 
-    typedef EventWrapper<ISA, &ISA::processHSTickCompare> HSTickCompareEvent;
+    typedef MemberEventWrapper<&ISA::processHSTickCompare> HSTickCompareEvent;
     HSTickCompareEvent *hSTickCompare = nullptr;
 
     static const int NumGlobalRegs = 8;

src/base/remote_gdb.hh

@@ -274,8 +274,8 @@ class BaseRemoteGDB
 
     BaseGdbRegCache *regCachePtr = nullptr;
 
-    EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::connect> connectEvent;
-    EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::detach>  disconnectEvent;
+    MemberEventWrapper<&BaseRemoteGDB::connect> connectEvent;
+    MemberEventWrapper<&BaseRemoteGDB::detach>  disconnectEvent;
 
     class TrapEvent : public Event
     {
@@ -308,7 +308,7 @@ class BaseRemoteGDB
 
     // Single step.
     void singleStep();
-    EventWrapper<BaseRemoteGDB, &BaseRemoteGDB::singleStep> singleStepEvent;
+    MemberEventWrapper<&BaseRemoteGDB::singleStep> singleStepEvent;
 
     void clearSingleStep();
     void setSingleStep();

src/dev/arm/smmu_v3.hh

@@ -167,7 +167,7 @@ class SMMUv3 : public ClockedObject
     SMMUAction runProcessTiming(SMMUProcess *proc, PacketPtr pkt);
 
     void processCommands();
-    EventWrapper<SMMUv3, &SMMUv3::processCommands> processCommandsEvent;
+    MemberEventWrapper<&SMMUv3::processCommands> processCommandsEvent;
 
     void processCommand(const SMMUCommand &cmd);
 

src/dev/arm/smmu_v3_deviceifc.hh

@@ -114,9 +114,7 @@ class SMMUv3DeviceInterface : public ClockedObject
     bool atsDeviceNeedsRetry;
 
     SMMUDeviceRetryEvent sendDeviceRetryEvent;
-    EventWrapper<
-        SMMUv3DeviceInterface,
-        &SMMUv3DeviceInterface::atsSendDeviceRetry> atsSendDeviceRetryEvent;
+    MemberEventWrapper<&SMMUv3DeviceInterface::atsSendDeviceRetry> atsSendDeviceRetryEvent;
 
     Port& getPort(const std::string &name, PortID id) override;
 

src/dev/arm/smmu_v3_proc.cc

@@ -199,8 +199,7 @@ SMMUProcess::doBroadcastSignal(SMMUSignal &sig)
 void
 SMMUProcess::scheduleWakeup(Tick when)
 {
-    auto *ep = new EventWrapper<
-        SMMUProcess, &SMMUProcess::wakeup> (this, true);
+    auto *ep = new MemberEventWrapper<&SMMUProcess::wakeup> (this, true);
 
     smmu.schedule(ep, when);
 }

src/mem/qos/mem_sink.hh

@@ -222,9 +222,7 @@ class MemSinkCtrl : public MemCtrl
     void processNextReqEvent();
 
     /** Event wrapper to schedule next request handler function */
-    EventWrapper<
-        MemSinkCtrl,
-        &MemSinkCtrl::processNextReqEvent> nextReqEvent;
+    MemberEventWrapper<&MemSinkCtrl::processNextReqEvent> nextReqEvent;
 
     /**
      * Check if the read queue has room for more entries

src/sim/power_domain.hh

@@ -151,7 +151,7 @@ class PowerDomain : public PowerState
     /**
      * Event to update the power states of the followers
      */
-    EventWrapper<PowerDomain, &PowerDomain::setFollowerPowerStates>
+    MemberEventWrapper<&PowerDomain::setFollowerPowerStates>
                 pwrStateUpdateEvent;
 
   protected:

src/systemc/core/kernel.hh

@@ -65,7 +65,7 @@ class Kernel : public gem5::SimObject
   private:
     static void stopWork();
 
-    gem5::EventWrapper<Kernel, &Kernel::t0Handler> t0Event;
+    gem5::MemberEventWrapper<&Kernel::t0Handler> t0Event;
 };
 
 extern Kernel *kernel;

src/systemc/core/scheduler.hh

@@ -465,13 +465,13 @@ class Scheduler
     }
 
     void runReady();
-    gem5::EventWrapper<Scheduler, &Scheduler::runReady> readyEvent;
+    gem5::MemberEventWrapper<&Scheduler::runReady> readyEvent;
     void scheduleReadyEvent();
 
     void pause();
     void stop();
-    gem5::EventWrapper<Scheduler, &Scheduler::pause> pauseEvent;
-    gem5::EventWrapper<Scheduler, &Scheduler::stop> stopEvent;
+    gem5::MemberEventWrapper<&Scheduler::pause> pauseEvent;
+    gem5::MemberEventWrapper<&Scheduler::stop> stopEvent;
 
     const ::sc_core::sc_report *_throwUp;
 
@@ -484,7 +484,7 @@ class Scheduler
                  timeSlots.front()->targeted_when > maxTick) &&
                 initList.empty());
     }
-    gem5::EventWrapper<Scheduler, &Scheduler::pause> starvationEvent;
+    gem5::MemberEventWrapper<&Scheduler::pause> starvationEvent;
     void scheduleStarvationEvent();
 
     bool _elaborationDone;
@@ -502,10 +502,10 @@ class Scheduler
             _changeStamp++;
         pause();
     }
-    gem5::EventWrapper<Scheduler, &Scheduler::maxTickFunc> maxTickEvent;
+    gem5::MemberEventWrapper<&Scheduler::maxTickFunc> maxTickEvent;
 
     void timeAdvances() { trace(false); }
-    gem5::EventWrapper<Scheduler, &Scheduler::timeAdvances> timeAdvancesEvent;
+    gem5::MemberEventWrapper<&Scheduler::timeAdvances> timeAdvancesEvent;
     void
     scheduleTimeAdvancesEvent()
     {

util/systemc/systemc_within_gem5/systemc_simple_object/feeder.hh

@@ -64,7 +64,7 @@ class Feeder : public gem5::SimObject
     // except to help interact with systemc objects/models.
     sc_core::sc_buffer<const char *> buf;
 
-    gem5::EventWrapper<Feeder, &Feeder::feed> event;
+    gem5::MemberEventWrapper<&Feeder::feed> event;
 
     void startup() override;
 };