diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-01-21 18:31:30 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-01-21 18:31:30 -0500 |
| commit | e6b99b07684ca465d83a6d9858fe97a1d5a8177f (patch) | |
| tree | eb77f23c2c71fd6b8128a945ca1282f2676ea8f0 /base | |
| parent | 6ac7954242abf87252b2927c213e9e95bb0772ce (diff) | |
| parent | fa7fa5a90909b79a97aee187aa1de52d96c9dde1 (diff) | |
| download | gem5-e6b99b07684ca465d83a6d9858fe97a1d5a8177f.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision : e802c800a478c297d3aa780a9ea3c6701453d91d
Diffstat (limited to 'base')
| -rw-r--r-- | base/stats/events.cc | 2 | ||||
| -rw-r--r-- | base/traceflags.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/base/stats/events.cc b/base/stats/events.cc index e5efceabe..d716fa4d3 100644 --- a/base/stats/events.cc +++ b/base/stats/events.cc @@ -134,7 +134,7 @@ InsertEvent::insert(const string &stat) first = false; size += sprintf(query + size, "(%u,%u,%llu)", - event, run, curTick); + event, run, (unsigned long long)curTick); } void diff --git a/base/traceflags.py b/base/traceflags.py index 8f20a9692..ef13d9e2a 100644 --- a/base/traceflags.py +++ b/base/traceflags.py @@ -139,6 +139,7 @@ compoundFlagMap = { 'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ], 'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ], 'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ], + 'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ], 'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ] } |