From 8c1ea47b3c2fc90378eb16f3ad92d4ae522567c5 Mon Sep 17 00:00:00 2001 From: Sean Wilson Date: Wed, 28 Jun 2017 08:52:08 -0500 Subject: cpu: Refactor some Event subclasses to lambdas Change-Id: If765c6100d67556f157e4e61aa33c2b7eeb8d2f0 Signed-off-by: Sean Wilson Reviewed-on: https://gem5-review.googlesource.com/3923 Reviewed-by: Jason Lowe-Power Reviewed-by: Andreas Sandberg Maintainer: Jason Lowe-Power --- src/cpu/minor/lsq.cc | 3 ++- src/cpu/minor/lsq.hh | 15 +-------------- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'src/cpu/minor') diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc index 3b70c53aa..bf2612071 100644 --- a/src/cpu/minor/lsq.cc +++ b/src/cpu/minor/lsq.cc @@ -321,7 +321,8 @@ LSQ::SplitDataRequest::finish(const Fault &fault_, RequestPtr request_, LSQ::SplitDataRequest::SplitDataRequest(LSQ &port_, MinorDynInstPtr inst_, bool isLoad_, PacketDataPtr data_, uint64_t *res_) : LSQRequest(port_, inst_, isLoad_, data_, res_), - translationEvent(*this), + translationEvent([this]{ sendNextFragmentToTranslation(); }, + "translationEvent"), numFragments(0), numInTranslationFragments(0), numTranslatedFragments(0), diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh index 1a9094806..d4973f5a3 100644 --- a/src/cpu/minor/lsq.hh +++ b/src/cpu/minor/lsq.hh @@ -377,20 +377,7 @@ class LSQ : public Named { protected: /** Event to step between translations */ - class TranslationEvent : public Event - { - protected: - SplitDataRequest &owner; - - public: - TranslationEvent(SplitDataRequest &owner_) - : owner(owner_) { } - - void process() - { owner.sendNextFragmentToTranslation(); } - }; - - TranslationEvent translationEvent; + EventFunctionWrapper translationEvent; protected: /** Number of fragments this request is split into */ unsigned int numFragments; -- cgit v1.2.3