derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu: Make accesses to comInstEventQueue indirect through methods.

Browse Source 
This lets us move the event queue itself around, or change how those
services are provided.

Change-Id: Ie36665b353cf9788968f253cf281a854a6eff4f4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22107
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Gabe Black
2019-10-13 22:02:35 -07:00
parent fea2af5b9c
commit c73c19effd
8 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/base/remote_gdb.cc
View File

@@ -317,12 +317,6 @@ break_type(char c)
std::map<Addr, HardBreakpoint *> hardBreakMap;
EventQueue *
getComInstEventQueue(ThreadContext *tc)
{
return tc->getCpuPtr()->comInstEventQueue[tc->threadId()];
}
}
BaseRemoteGDB::BaseRemoteGDB(System *_system, ThreadContext *c, int _port) :
@@ -759,17 +753,18 @@ BaseRemoteGDB::setTempBreakpoint(Addr bkpt)
void
BaseRemoteGDB::scheduleInstCommitEvent(Event *ev, int delta)
{
EventQueue *eq = getComInstEventQueue(tc);
auto *cpu = tc->getCpuPtr();
// Here "ticks" aren't simulator ticks which measure time, they're
// instructions committed by the CPU.
eq->schedule(ev, eq->getCurTick() + delta);
cpu->scheduleInstCountEvent(tc->threadId(), ev,
cpu->getCurrentInstCount(tc->threadId()) + delta);
}
void
BaseRemoteGDB::descheduleInstCommitEvent(Event *ev)
{
if (ev->scheduled())
getComInstEventQueue(tc)->deschedule(ev);
tc->getCpuPtr()->descheduleInstCountEvent(tc->threadId(), ev);
}
std::map<char, BaseRemoteGDB::GdbCommand> BaseRemoteGDB::command_map = {