summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2005-11-28 18:33:48 -0500
committerNathan Binkert <binkertn@umich.edu>2005-11-28 18:33:48 -0500
commit108cfe53d6ac09c18dc531230a38bdc1c25bd2cb (patch)
treea30fb47bc936db37ffeb6a9b4ad9b95b53abd1fc
parent47ff0af17e4494ed99c6eebbf8c6b742f7f7dacf (diff)
downloadgem5-108cfe53d6ac09c18dc531230a38bdc1c25bd2cb.tar.xz
Make the debugger a bit more useful with m5.opt by moving stuff
from #ifdef DEBUG to #ifndef NDEBUG base/remote_gdb.cc: make the remote debugger gdb stuff work in m5.opt sim/system.cc: sim/system.hh: make the console panic break event happen in m5.opt --HG-- extra : convert_revision : 044a9b7cdacb058112388a31315e45c5d8cf70fd
-rw-r--r--base/remote_gdb.cc6
-rw-r--r--sim/system.cc2
-rw-r--r--sim/system.hh2
3 files changed, 5 insertions, 5 deletions
diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 1f3a60bbf..67d745d43 100644
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -133,7 +133,7 @@
using namespace std;
-#ifdef DEBUG
+#ifndef NDEBUG
vector<RemoteGDB *> debuggers;
int current_debugger = -1;
@@ -195,12 +195,12 @@ GDBListener::listen()
event = new Event(this, listener.getfd(), POLLIN);
pollQueue.schedule(event);
-#ifdef DEBUG
+#ifndef NDEBUG
gdb->number = debuggers.size();
debuggers.push_back(gdb);
#endif
-#ifdef DEBUG
+#ifndef NDEBUG
ccprintf(cerr, "%d: %s: listening for remote gdb #%d on port %d\n",
curTick, name(), gdb->number, port);
#else
diff --git a/sim/system.cc b/sim/system.cc
index c91d7f142..4bcc89c56 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -123,7 +123,7 @@ System::System(Params *p)
DPRINTF(Loader, "Kernel loaded...\n");
Addr addr = 0;
-#ifdef DEBUG
+#ifndef NDEBUG
consolePanicEvent = addConsoleFuncEvent<BreakPCEvent>("panic");
#endif
diff --git a/sim/system.hh b/sim/system.hh
index 8cfe790de..aa697c040 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -97,7 +97,7 @@ class System : public SimObject
Kernel::Binning *kernelBinning;
-#ifdef DEBUG
+#ifndef NDEBUG
/** Event to halt the simulator if the console calls panic() */
BreakPCEvent *consolePanicEvent;
#endif