summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-06-22 17:20:34 -0400
committerAli Saidi <saidi@eecs.umich.edu>2004-06-22 17:20:34 -0400
commit556b2a9098930698b39f296c8d13831f2b91311b (patch)
tree014cb2e144436258518bfb77de9a8d2150a1d8ea /base
parente05dbb5116b9ff0984ea8214ec921d2db3aed41d (diff)
parentf37eb6f5c7184acb6df46d14d9e48a22c8ac8134 (diff)
downloadgem5-556b2a9098930698b39f296c8d13831f2b91311b.tar.xz
Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-linux
--HG-- extra : convert_revision : 448f6e7851c14dd2c9f6148122da873a19c20772
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 0898a283a..14e28219a 100644
--- a/base/traceflags.py
+++ b/base/traceflags.py
@@ -67,6 +67,7 @@ baseFlags = [
'AlphaConsole',
'Flow',
'Interrupt',
+ 'Fault',
'Cycle',
'Loader',
'MMU',