diff options
| author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-07 12:13:16 -0500 |
|---|---|---|
| committer | Sean Wilson <spwilson2@wisc.edu> | 2017-06-20 18:03:21 +0000 |
| commit | ebe5f0df9a6158ec4ed84429d1619f388eb1388b (patch) | |
| tree | c3070d745a0820856a044313860c8edede236be8 /src/cpu/trace | |
| parent | 8421362cc23a6341e44ce59f2c4f578438fd8a55 (diff) | |
| download | gem5-ebe5f0df9a6158ec4ed84429d1619f388eb1388b.tar.xz | |
cpu, gpu-compute: Replace EventWrapper use with EventFunctionWrapper
Change-Id: Idd5992463bcf9154f823b82461070d1f1842cea3
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3746
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/cpu/trace')
| -rw-r--r-- | src/cpu/trace/trace_cpu.cc | 4 | ||||
| -rw-r--r-- | src/cpu/trace/trace_cpu.hh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc index 7b59b49e0..824c1258f 100644 --- a/src/cpu/trace/trace_cpu.cc +++ b/src/cpu/trace/trace_cpu.cc @@ -57,8 +57,8 @@ TraceCPU::TraceCPU(TraceCPUParams *params) icacheGen(*this, ".iside", icachePort, instMasterID, instTraceFile), dcacheGen(*this, ".dside", dcachePort, dataMasterID, dataTraceFile, params), - icacheNextEvent(this), - dcacheNextEvent(this), + icacheNextEvent([this]{ schedIcacheNext(); }, name()), + dcacheNextEvent([this]{ schedDcacheNext(); }, name()), oneTraceComplete(false), traceOffset(0), execCompleteEvent(nullptr), diff --git a/src/cpu/trace/trace_cpu.hh b/src/cpu/trace/trace_cpu.hh index 07c739c57..c873a349f 100644 --- a/src/cpu/trace/trace_cpu.hh +++ b/src/cpu/trace/trace_cpu.hh @@ -1082,10 +1082,10 @@ class TraceCPU : public BaseCPU void schedDcacheNext(); /** Event for the control flow method schedIcacheNext() */ - EventWrapper<TraceCPU, &TraceCPU::schedIcacheNext> icacheNextEvent; + EventFunctionWrapper icacheNextEvent; /** Event for the control flow method schedDcacheNext() */ - EventWrapper<TraceCPU, &TraceCPU::schedDcacheNext> dcacheNextEvent; + EventFunctionWrapper dcacheNextEvent; /** This is called when either generator finishes executing from the trace */ void checkAndSchedExitEvent(); |