diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-04 09:40:19 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-06-11 16:55:30 +0000 |
| commit | f54020eb8155371725ab75b0fc5c419287eca084 (patch) | |
| tree | 65d379f7603e689e083e9a58ff4c2e90abd19fbf /src/cpu/translation.hh | |
| parent | 2113b21996d086dab32b9fd388efe3df241bfbd2 (diff) | |
| download | gem5-f54020eb8155371725ab75b0fc5c419287eca084.tar.xz | |
misc: Using smart pointers for memory Requests
This patch is changing the underlying type for RequestPtr from Request*
to shared_ptr<Request>. Having memory requests being managed by smart
pointers will simplify the code; it will also prevent memory leakage and
dangling pointers.
Change-Id: I7749af38a11ac8eb4d53d8df1252951e0890fde3
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/10996
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Diffstat (limited to 'src/cpu/translation.hh')
| -rw-r--r-- | src/cpu/translation.hh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cpu/translation.hh b/src/cpu/translation.hh index a7372f3ee..601d24cd1 100644 --- a/src/cpu/translation.hh +++ b/src/cpu/translation.hh @@ -78,8 +78,8 @@ class WholeTranslationState * Single translation state. We set the number of outstanding * translations to one and indicate that it is not split. */ - WholeTranslationState(RequestPtr _req, uint8_t *_data, uint64_t *_res, - BaseTLB::Mode _mode) + WholeTranslationState(const RequestPtr &_req, uint8_t *_data, + uint64_t *_res, BaseTLB::Mode _mode) : outstanding(1), delay(false), isSplit(false), mainReq(_req), sreqLow(NULL), sreqHigh(NULL), data(_data), res(_res), mode(_mode) { @@ -92,9 +92,9 @@ class WholeTranslationState * number of outstanding translations to two and then mark this as a * split translation. */ - WholeTranslationState(RequestPtr _req, RequestPtr _sreqLow, - RequestPtr _sreqHigh, uint8_t *_data, uint64_t *_res, - BaseTLB::Mode _mode) + WholeTranslationState(const RequestPtr &_req, const RequestPtr &_sreqLow, + const RequestPtr &_sreqHigh, uint8_t *_data, + uint64_t *_res, BaseTLB::Mode _mode) : outstanding(2), delay(false), isSplit(true), mainReq(_req), sreqLow(_sreqLow), sreqHigh(_sreqHigh), data(_data), res(_res), mode(_mode) @@ -196,10 +196,10 @@ class WholeTranslationState void deleteReqs() { - delete mainReq; + mainReq.reset(); if (isSplit) { - delete sreqLow; - delete sreqHigh; + sreqLow.reset(); + sreqHigh.reset(); } } }; @@ -249,7 +249,7 @@ class DataTranslation : public BaseTLB::Translation * translation is complete if the state says so. */ void - finish(const Fault &fault, RequestPtr req, ThreadContext *tc, + finish(const Fault &fault, const RequestPtr &req, ThreadContext *tc, BaseTLB::Mode mode) { assert(state); |