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

diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 1f3a60bbf94430ee82b2f3b74c8be52707033605..67d745d437305fe84c896c68ed5e863b8952c3b8 100644 (file)
--- 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 c91d7f1421e34f49ce061b2557b2d186a3711685..4bcc89c561c0f47cde3327bc826564d2ce06d19e 100644 (file)
--- 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 8cfe790de9b6f1c8860a0a553e46a29c962cc744..aa697c040459cc1e87cc6cc6d1a8b62abe348d26 100644 (file)
--- 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