diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-23 17:55:54 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-23 17:55:54 -0400 |
| commit | 17bfb1540e938406548202f3f1c941857f514c33 (patch) | |
| tree | 6b39561099e011efbc9f59be4048b1cca4fa96a8 /base | |
| parent | 231fac0a2b4ed7c882c6d83c279bf2a4d2083726 (diff) | |
| parent | 06d8f0af5def68e395b58636d5e7d6ca69daa51f (diff) | |
| download | gem5-17bfb1540e938406548202f3f1c941857f514c33.tar.xz | |
Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-endian
--HG--
extra : convert_revision : d4938c6011173d3017f47fd592c4b5e4c8d543a3
Diffstat (limited to 'base')
| -rw-r--r-- | base/misc.cc | 5 | ||||
| -rw-r--r-- | base/traceflags.py | 7 |
2 files changed, 6 insertions, 6 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..14e28219a 100644 --- a/base/traceflags.py +++ b/base/traceflags.py @@ -67,6 +67,7 @@ baseFlags = [ 'AlphaConsole', 'Flow', 'Interrupt', + 'Fault', 'Cycle', 'Loader', 'MMU', @@ -74,6 +75,10 @@ baseFlags = [ 'EthernetPIO', 'EthernetDMA', 'EthernetData', + 'EthernetDesc', + 'EthernetIntr', + 'EthernetSM', + 'EthernetCksum', 'GDBMisc', 'GDBAcc', 'GDBRead', @@ -124,7 +129,7 @@ compoundFlagMap = { 'GDBAll' : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend', 'GDBRecv', 'GDBExtra' ], 'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ], 'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ], - 'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ], + 'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ], 'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ] } |