diff options
Diffstat (limited to 'src/sim')
-rw-r--r-- | src/sim/process.hh | 5 | ||||
-rw-r--r-- | src/sim/system.cc | 17 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/sim/process.hh b/src/sim/process.hh index ab9d64cf3..36db8d091 100644 --- a/src/sim/process.hh +++ b/src/sim/process.hh @@ -91,11 +91,6 @@ class Process : public SimObject // thread contexts associated with this process std::vector<int> contextIds; - // remote gdb objects - std::vector<BaseRemoteGDB *> remoteGDB; - std::vector<GDBListener *> gdbListen; - bool breakpoint(); - // number of CPUs (esxec contexts, really) assigned to this process. unsigned int numCpus() { return contextIds.size(); } diff --git a/src/sim/system.cc b/src/sim/system.cc index da77f1995..c7f5b2d08 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -151,9 +151,6 @@ System::~System() #endif // FULL_SYSTEM} } -int rgdb_wait = -1; -int rgdb_enable = true; - void System::setMemoryMode(Enums::MemoryMode mode) { @@ -168,6 +165,13 @@ bool System::breakpoint() return false; } +/** + * Setting rgdb_wait to a positive integer waits for a remote debugger to + * connect to that context ID before continuing. This should really + be a parameter on the CPU object or something... + */ +int rgdb_wait = -1; + int System::registerThreadContext(ThreadContext *tc, int assigned) { @@ -193,14 +197,11 @@ System::registerThreadContext(ThreadContext *tc, int assigned) _numContexts++; int port = getRemoteGDBPort(); - if (rgdb_enable && port) { + if (port) { RemoteGDB *rgdb = new RemoteGDB(this, tc); GDBListener *gdbl = new GDBListener(rgdb, port + id); gdbl->listen(); - /** - * Uncommenting this line waits for a remote debugger to - * connect to the simulator before continuing. - */ + if (rgdb_wait != -1 && rgdb_wait == id) gdbl->accept(); |