# Node ID b4f709126ae9144d8c62145dcfaace598b5e4b16
# Parent  ed72b0ade912973bc59b067c2b2a3e5ca22944d9
diff --git a/src/arch/alpha/ev5.cc b/src/arch/alpha/ev5.cc
--- a/src/arch/alpha/ev5.cc
+++ b/src/arch/alpha/ev5.cc
@@ -271,11 +271,6 @@
         break;
 
       case IPR_IPLR:
-#ifdef DEBUG
-        if (break_ipl != -1 && break_ipl == (int)(val & 0x1f))
-            Debug::breakpoint();
-#endif
-
         // only write least significant five bits - interrupt level
         ipr[idx] = val & 0x1f;
         if (tc->getKernelStats())
diff --git a/src/dev/net/ns_gige.cc b/src/dev/net/ns_gige.cc
--- a/src/dev/net/ns_gige.cc
+++ b/src/dev/net/ns_gige.cc
@@ -951,7 +951,6 @@
 
     intrTick = when;
     if (intrTick < curTick()) {
-        Debug::breakpoint();
         intrTick = curTick();
     }
 
@@ -1725,7 +1724,6 @@
                             tcp->sum(cksum(tcp));
                             txTcpChecksums++;
                         } else {
-                            Debug::breakpoint();
                             warn_once("TCPPKT set, but not UDP!\n");
                         }
                     }
@@ -1735,7 +1733,6 @@
                             ip->sum(cksum(ip));
                             txIpChecksums++;
                         } else {
-                            Debug::breakpoint();
                             warn_once("IPPKT set, but not UDP!\n");
                         }
                     }
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -527,7 +527,6 @@
 
     intrTick = when;
     if (intrTick < curTick()) {
-        Debug::breakpoint();
         intrTick = curTick();
     }
 
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -94,14 +94,15 @@
 
     # Debugging options
     group("Debugging Options")
-    option("--debug-break", metavar="TIME[,TIME]", action='append', split=',',
-        help="Tick to create a breakpoint")
+    option("--debug-break", metavar="TICK[,TICK]", action='append', split=',',
+        help="Create breakpoint(s) at TICK(s) " \
+             "(kills process if no debugger attached)")
     option("--debug-help", action='store_true',
         help="Print help on debug flags")
     option("--debug-flags", metavar="FLAG[,FLAG]", action='append', split=',',
         help="Sets the flags for debug output (-FLAG disables a flag)")
-    option("--debug-start", metavar="TIME", type='int',
-        help="Start debug output at TIME (must be in ticks)")
+    option("--debug-start", metavar="TICK", type='int',
+        help="Start debug output at TICK (must be in ticks)")
     option("--debug-file", metavar="FILE", default="cout",
         help="Sets the output file for debug [Default: %default]")
     option("--debug-ignore", metavar="EXPR", action='append', split=':',
diff --git a/src/sim/init_signals.cc b/src/sim/init_signals.cc
--- a/src/sim/init_signals.cc
+++ b/src/sim/init_signals.cc
@@ -178,9 +178,6 @@
     // ignore them
     signal(SIGFPE, SIG_IGN);
 
-    // We use SIGTRAP sometimes for debugging
-    signal(SIGTRAP, SIG_IGN);
-
     // Dump intermediate stats
     installSignalHandler(SIGUSR1, dumpStatsHandler);