From ecec88750729b2c94d5ca9dedbf7a755c46c41a7 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 16 Jan 2018 01:25:39 -0800 Subject: sim, arch, base: Refactor the base remote GDB class. Fold the GDBListener class into the main BaseRemoteGDB class, move around a bunch of functions, convert a lot of internal functions to be private, move some functions into the .cc, make some functions non-virtual which didn't really need to be overridden. Change-Id: Id0832b730b0fdfb2eababa5067e72c66de1c147d Reviewed-on: https://gem5-review.googlesource.com/7422 Reviewed-by: Jason Lowe-Power Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/sim/system.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/sim/system.cc') diff --git a/src/sim/system.cc b/src/sim/system.cc index 2f047f227..ed01e0e64 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -261,16 +261,15 @@ System::registerThreadContext(ThreadContext *tc, ContextID assigned) #if THE_ISA != NULL_ISA int port = getRemoteGDBPort(); if (port) { - RemoteGDB *rgdb = new RemoteGDB(this, tc); - GDBListener *gdbl = new GDBListener(rgdb, port + id); - gdbl->listen(); + RemoteGDB *rgdb = new RemoteGDB(this, tc, port + id); + rgdb->listen(); BaseCPU *cpu = tc->getCpuPtr(); if (cpu->waitForRemoteGDB()) { inform("%s: Waiting for a remote GDB connection on port %d.\n", - cpu->name(), gdbl->getPort()); + cpu->name(), rgdb->port()); - gdbl->accept(); + rgdb->connect(); } if (remoteGDB.size() <= id) { remoteGDB.resize(id + 1); -- cgit v1.2.3