summaryrefslogtreecommitdiff
path: root/src/cpu/testers/memtest
diff options
context:
space:
mode:
authorSean Wilson <spwilson2@wisc.edu>2017-06-07 12:13:16 -0500
committerSean Wilson <spwilson2@wisc.edu>2017-06-20 18:03:21 +0000
commitebe5f0df9a6158ec4ed84429d1619f388eb1388b (patch)
treec3070d745a0820856a044313860c8edede236be8 /src/cpu/testers/memtest
parent8421362cc23a6341e44ce59f2c4f578438fd8a55 (diff)
downloadgem5-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/testers/memtest')
-rw-r--r--src/cpu/testers/memtest/memtest.cc6
-rw-r--r--src/cpu/testers/memtest/memtest.hh6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc
index 46387fa01..6f3f9b36f 100644
--- a/src/cpu/testers/memtest/memtest.cc
+++ b/src/cpu/testers/memtest/memtest.cc
@@ -86,9 +86,9 @@ MemTest::sendPkt(PacketPtr pkt) {
MemTest::MemTest(const Params *p)
: MemObject(p),
- tickEvent(this),
- noRequestEvent(this),
- noResponseEvent(this),
+ tickEvent([this]{ tick(); }, name()),
+ noRequestEvent([this]{ noRequest(); }, name()),
+ noResponseEvent([this]{ noResponse(); }, name()),
port("port", *this),
retryPkt(nullptr),
size(p->size),
diff --git a/src/cpu/testers/memtest/memtest.hh b/src/cpu/testers/memtest/memtest.hh
index daed5e5d2..023b878c9 100644
--- a/src/cpu/testers/memtest/memtest.hh
+++ b/src/cpu/testers/memtest/memtest.hh
@@ -84,15 +84,15 @@ class MemTest : public MemObject
void tick();
- EventWrapper<MemTest, &MemTest::tick> tickEvent;
+ EventFunctionWrapper tickEvent;
void noRequest();
- EventWrapper<MemTest, &MemTest::noRequest> noRequestEvent;
+ EventFunctionWrapper noRequestEvent;
void noResponse();
- EventWrapper<MemTest, &MemTest::noResponse> noResponseEvent;
+ EventFunctionWrapper noResponseEvent;
class CpuPort : public MasterPort
{