if (tick_cmp) {

    case MISCREG_STICK_CMPR:
      if (sTickCompare == NULL)

    case MISCREG_HSTICK_CMPR:
      if (hSTickCompare == NULL)

Gabriel B. has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/67657?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sim: Use ref constructor of MemberEventWrapper everywhere ...................................................................... sim: Use ref constructor of MemberEventWrapper everywhere Change-Id: I77989aa7318142634c771c558293138e7b1e8e51 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67657 Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> --- M src/arch/sparc/isa.cc M src/arch/sparc/ua2005.cc M src/base/remote_gdb.cc M src/dev/arm/smmu_v3.cc M src/dev/arm/smmu_v3_deviceifc.cc M src/dev/arm/smmu_v3_proc.cc M src/mem/qos/mem_sink.cc M src/systemc/core/kernel.cc M src/systemc/core/scheduler.cc 9 files changed, 18 insertions(+), 18 deletions(-) Approvals: Daniel Carvalho: Looks good to me, approved Bobby Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc index 38b3d1c..e7807c2 100644 --- a/src/arch/sparc/isa.cc +++ b/src/arch/sparc/isa.cc @@ -953,15 +953,15 @@ UNSERIALIZE_SCALAR(hstick_cmp); if (tick_cmp) { - tickCompare = new TickCompareEvent(this); + tickCompare = new TickCompareEvent(*this); schedule(tickCompare, tick_cmp); } if (stick_cmp) { - sTickCompare = new STickCompareEvent(this); + sTickCompare = new STickCompareEvent(*this); schedule(sTickCompare, stick_cmp); } if (hstick_cmp) { - hSTickCompare = new HSTickCompareEvent(this); + hSTickCompare = new HSTickCompareEvent(*this); schedule(hSTickCompare, hstick_cmp); } } diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc index 3f5372a..45cc9d7 100644 --- a/src/arch/sparc/ua2005.cc +++ b/src/arch/sparc/ua2005.cc @@ -107,7 +107,7 @@ case MISCREG_TICK_CMPR: if (tickCompare == NULL) - tickCompare = new TickCompareEvent(this); + tickCompare = new TickCompareEvent(*this); setMiscRegNoEffect(miscReg, val); if ((tick_cmpr & ~mask(63)) && tickCompare->scheduled()) cpu->deschedule(tickCompare); @@ -122,7 +122,7 @@ case MISCREG_STICK_CMPR: if (sTickCompare == NULL) - sTickCompare = new STickCompareEvent(this); + sTickCompare = new STickCompareEvent(*this); setMiscRegNoEffect(miscReg, val); if ((stick_cmpr & ~mask(63)) && sTickCompare->scheduled()) cpu->deschedule(sTickCompare); @@ -193,7 +193,7 @@ case MISCREG_HSTICK_CMPR: if (hSTickCompare == NULL) - hSTickCompare = new HSTickCompareEvent(this); + hSTickCompare = new HSTickCompareEvent(*this); setMiscRegNoEffect(miscReg, val); if ((hstick_cmpr & ~mask(63)) && hSTickCompare->scheduled()) cpu->deschedule(hSTickCompare); diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc index 43f53d1..dd37a35 100644 --- a/src/base/remote_gdb.cc +++ b/src/base/remote_gdb.cc @@ -393,7 +393,7 @@ BaseRemoteGDB::BaseRemoteGDB(System *_system, int _port) : incomingConnectionEvent(nullptr), incomingDataEvent(nullptr), _port(_port), fd(-1), sys(_system), - connectEvent(this), disconnectEvent(this), trapEvent(this), + connectEvent(*this), disconnectEvent(*this), trapEvent(this), singleStepEvent(*this) {} diff --git a/src/dev/arm/smmu_v3.cc b/src/dev/arm/smmu_v3.cc index 41f7424e..8ce8bd9 100644 --- a/src/dev/arm/smmu_v3.cc +++ b/src/dev/arm/smmu_v3.cc @@ -100,7 +100,7 @@ deviceInterfaces(params.device_interfaces), commandExecutor(name() + ".cmd_exec", *this), regsMap(params.reg_map), - processCommandsEvent(this) + processCommandsEvent(*this) { fatal_if(regsMap.size() != SMMU_REG_SIZE, "Invalid register map size: %#x different than SMMU_REG_SIZE = %#x\n", diff --git a/src/dev/arm/smmu_v3_deviceifc.cc b/src/dev/arm/smmu_v3_deviceifc.cc index 166b85d..0966150 100644 --- a/src/dev/arm/smmu_v3_deviceifc.cc +++ b/src/dev/arm/smmu_v3_deviceifc.cc @@ -78,7 +78,7 @@ deviceNeedsRetry(false), atsDeviceNeedsRetry(false), sendDeviceRetryEvent(*this), - atsSendDeviceRetryEvent(this) + atsSendDeviceRetryEvent(*this) {} void diff --git a/src/dev/arm/smmu_v3_proc.cc b/src/dev/arm/smmu_v3_proc.cc index ef3db5d..f0c2633 100644 --- a/src/dev/arm/smmu_v3_proc.cc +++ b/src/dev/arm/smmu_v3_proc.cc @@ -199,7 +199,7 @@ void SMMUProcess::scheduleWakeup(Tick when) { - auto *ep = new MemberEventWrapper<&SMMUProcess::wakeup> (this, true); + auto *ep = new MemberEventWrapper<&SMMUProcess::wakeup> (*this, true); smmu.schedule(ep, when); } diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc index b6b77ca..66b9451 100644 --- a/src/mem/qos/mem_sink.cc +++ b/src/mem/qos/mem_sink.cc @@ -60,7 +60,7 @@ readBufferSize(p.read_buffer_size), writeBufferSize(p.write_buffer_size), port(name() + ".port", *this), interface(p.interface), - retryRdReq(false), retryWrReq(false), nextRequest(0), nextReqEvent(this), + retryRdReq(false), retryWrReq(false), nextRequest(0), nextReqEvent(*this), stats(this) { // Resize read and write queue to allocate space diff --git a/src/systemc/core/kernel.cc b/src/systemc/core/kernel.cc index ae67e46..f6c96e5 100644 --- a/src/systemc/core/kernel.cc +++ b/src/systemc/core/kernel.cc @@ -56,7 +56,7 @@ Kernel::Kernel(const Params &params, int) : gem5::SimObject(params), - t0Event(this, false, gem5::EventBase::Default_Pri - 1) + t0Event(*this, false, gem5::EventBase::Default_Pri - 1) { // Install ourselves as the scheduler's event manager. ::sc_gem5::scheduler.setEventQueue(eventQueue()); diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc index 42a2ca4..bcbc262 100644 --- a/src/systemc/core/scheduler.cc +++ b/src/systemc/core/scheduler.cc @@ -44,14 +44,14 @@ { Scheduler::Scheduler() : - eq(nullptr), readyEvent(this, false, ReadyPriority), - pauseEvent(this, false, PausePriority), - stopEvent(this, false, StopPriority), _throwUp(nullptr), - starvationEvent(this, false, StarvationPriority), + eq(nullptr), readyEvent(*this, false, ReadyPriority), + pauseEvent(*this, false, PausePriority), + stopEvent(*this, false, StopPriority), _throwUp(nullptr), + starvationEvent(*this, false, StarvationPriority), _elaborationDone(false), _started(false), _stopNow(false), _status(StatusOther), maxTick(gem5::MaxTick), - maxTickEvent(this, false, MaxTickPriority), - timeAdvancesEvent(this, false, TimeAdvancesPriority), _numCycles(0), + maxTickEvent(*this, false, MaxTickPriority), + timeAdvancesEvent(*this, false, TimeAdvancesPriority), _numCycles(0), _changeStamp(0), _current(nullptr), initDone(false), runToTime(true), runOnce(false) {} -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/67657?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I77989aa7318142634c771c558293138e7b1e8e51 Gerrit-Change-Number: 67657 Gerrit-PatchSet: 4 Gerrit-Owner: Gabriel B. <gabriel.busnot@arteris.com> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Daniel Carvalho <odanrc@yahoo.com.br> Gerrit-Reviewer: Gabriel B. <gabriel.busnot@arteris.com> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-CC: Jason Lowe-Power <power.jg@gmail.com> Gerrit-MessageType: merged