Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/24965 )
Change subject: fastmodel: Use a shared pointer to track PC events.
......................................................................
fastmodel: Use a shared pointer to track PC events.
When the last event is removed from a breakpoint, then the breakpoint
itself is uninstalled from IRIS, and the list is deleted. Even though
the list has been traversed and so we don't lose track of any other
events that need to be processed, we also still need to check against
end() to see that we're done. If that now freed memory gets
overwritten, then we won't see the end and will wander right off the
end of the list into nonsense.
This change modifies the breakpoint info tracking structure to keep a
shared pointer to the event list. The pointer will still automatically
manage the list's memory so that it doesn't leak, and it won't get
deleted out from under us as we're iterating through it.
Change-Id: I5ad0f095d07f0a3a5cce9c10f03121827a674c33
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24965
Maintainer: Gabe Black <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Chun-Chen TK Hsu <chunchen...@google.com>
---
M src/arch/arm/fastmodel/iris/thread_context.cc
M src/arch/arm/fastmodel/iris/thread_context.hh
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Chun-Chen TK Hsu: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index 260e5a8..547a4c4 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -228,8 +228,9 @@
auto it = getOrAllocBp(pc);
- auto e_it = it->second->events.begin();
- while (e_it != it->second->events.end()) {
+ std::shared_ptr<BpInfo::EventList> events = it->second->events;
+ auto e_it = events->begin();
+ while (e_it != events->end()) {
PCEvent *e = *e_it;
// Advance e_it here since e might remove itself from the list.
e_it++;
@@ -319,7 +320,7 @@
ThreadContext::schedule(PCEvent *e)
{
auto it = getOrAllocBp(e->pc());
- it->second->events.push_back(e);
+ it->second->events->push_back(e);
if (_instId != iris::IRIS_UINT64_MAX && !it->second->validId())
installBp(it);
@@ -331,7 +332,7 @@
ThreadContext::remove(PCEvent *e)
{
auto it = getOrAllocBp(e->pc());
- it->second->events.remove(e);
+ it->second->events->remove(e);
if (it->second->empty())
delBp(it);
diff --git a/src/arch/arm/fastmodel/iris/thread_context.hh
b/src/arch/arm/fastmodel/iris/thread_context.hh
index 0b55415..89b0004 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.hh
+++ b/src/arch/arm/fastmodel/iris/thread_context.hh
@@ -110,11 +110,14 @@
{
Addr pc;
BpId id;
- std::list<PCEvent *> events;
+ using EventList = std::list<PCEvent *>;
+ std::shared_ptr<EventList> events;
- BpInfo(Addr _pc) : pc(_pc), id(iris::IRIS_UINT64_MAX) {}
+ BpInfo(Addr _pc) : pc(_pc), id(iris::IRIS_UINT64_MAX),
+ events(new EventList)
+ {}
- bool empty() const { return events.empty(); }
+ bool empty() const { return events->empty(); }
bool validId() const { return id != iris::IRIS_UINT64_MAX; }
void clearId() { id = iris::IRIS_UINT64_MAX; }
};
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/24965
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: I5ad0f095d07f0a3a5cce9c10f03121827a674c33
Gerrit-Change-Number: 24965
Gerrit-PatchSet: 9
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Chun-Chen TK Hsu <chunchen...@google.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
