sim: Make the System object a PCEventScope.
This abstracts away the raw PCEventQueue managed by the System.
Change-Id: I04d773e6be90a891884a76841f15c3eecd5796ed
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22101
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index ae9e5ef..89d18f6 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -149,7 +149,7 @@
// leads to non-intuitive behavior with --trace-start.
Addr addr = 0;
if (false && kernelSymtab->findAddress("alpha_switch_to", addr)) {
- printThreadEvent = new PrintThreadInfo(&pcEventQueue, "threadinfo",
+ printThreadEvent = new PrintThreadInfo(this, "threadinfo",
addr + sizeof(MachInst) * 6);
} else {
printThreadEvent = NULL;
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index d0ccde5..3dde235 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -717,7 +717,7 @@
HardBreakpoint *&bkpt = hardBreakMap[addr];
if (bkpt == 0)
- bkpt = new HardBreakpoint(this, &sys->pcEventQueue, addr);
+ bkpt = new HardBreakpoint(this, sys, addr);
bkpt->refcount++;
}
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 3868f57..7b8ca87 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -292,6 +292,20 @@
return id;
}
+#if THE_ISA != NULL_ISA
+bool
+System::schedule(PCEvent *event)
+{
+ return pcEventQueue.schedule(event);
+}
+
+bool
+System::remove(PCEvent *event)
+{
+ return pcEventQueue.remove(event);
+}
+#endif
+
int
System::numRunningContexts()
{
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 852bc21..c2b8411 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -74,7 +74,8 @@
*/
#if THE_ISA != NULL_ISA
#include "cpu/pc_event.hh"
-
+#else
+class PCEvent;
#endif
class BaseRemoteGDB;
@@ -83,6 +84,9 @@
class ThreadContext;
class System : public SimObject
+#if THE_ISA != NULL_ISA
+ , public PCEventScope
+#endif
{
private:
@@ -201,6 +205,13 @@
std::vector<ThreadContext *> threadContexts;
const bool multiThread;
+ using SimObject::schedule;
+
+#if THE_ISA != NULL_ISA
+ bool schedule(PCEvent *event) override;
+ bool remove(PCEvent *event) override;
+#endif
+
ThreadContext *getThreadContext(ContextID tid) const
{
return threadContexts[tid];
@@ -493,7 +504,7 @@
#if THE_ISA != NULL_ISA
if (symtab->findAddress(lbl, addr)) {
- T *ev = new T(&pcEventQueue, desc, fixFuncEventAddr(addr),
+ T *ev = new T(this, desc, fixFuncEventAddr(addr),
std::forward<Args>(args)...);
return ev;
}