summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-06-22 13:48:49 -0400
committerAli Saidi <saidi@eecs.umich.edu>2004-06-22 13:48:49 -0400
commit4deb81989496b360500985377e8f8c1a2f017b27 (patch)
tree20e9a164feb1631c965999ba738999abc4b0a691 /base
parent074969f8f16110680de05fca64a6be48aedcdfd8 (diff)
parentc1e58b6bf6b353f9355aafd8ed2cb86e6d00e32a (diff)
downloadgem5-4deb81989496b360500985377e8f8c1a2f017b27.tar.xz
pull from head before pushing linux tree
--HG-- extra : convert_revision : 345f91c5c16c69db22035dc716e82fd77041380f
Diffstat (limited to 'base')
-rw-r--r--base/misc.cc5
-rw-r--r--base/traceflags.py1
2 files changed, 1 insertions, 5 deletions
diff --git a/base/misc.cc b/base/misc.cc
index 075ed2af8..0c459352f 100644
--- a/base/misc.cc
+++ b/base/misc.cc
@@ -61,11 +61,6 @@ __panic(const string &format, cp::ArgList &args, const char *func,
delete &args;
-#if TRACING_ON
- // dump trace buffer, if there is one
- Trace::theLog.dump(cerr);
-#endif
-
abort();
}
diff --git a/base/traceflags.py b/base/traceflags.py
index 3d7623965..e26fcd1fe 100644
--- a/base/traceflags.py
+++ b/base/traceflags.py
@@ -67,6 +67,7 @@ baseFlags = [
'AlphaConsole',
'Flow',
'Interrupt',
+ 'Fault',
'Cycle',
'Loader',
'MMU',