diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-03-15 17:26:14 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-03-15 17:26:14 -0500 |
| commit | 363f02a1fd0a8ae8c91152ccde4453b934d7d3d4 (patch) | |
| tree | de899d5de7b892ef27ddb28f1068563c7c325471 /sim/sim_object.cc | |
| parent | 3833533a64e5a6871ee8e1901c6dd1950d3966c4 (diff) | |
| parent | 0f8067fbf6106a197212859543ba865b396e75d4 (diff) | |
| download | gem5-363f02a1fd0a8ae8c91152ccde4453b934d7d3d4.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 8f25703b016c391217a7daae5f395bd942d589ef
Diffstat (limited to 'sim/sim_object.cc')
| -rw-r--r-- | sim/sim_object.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sim/sim_object.cc b/sim/sim_object.cc index 818648b98..559415102 100644 --- a/sim/sim_object.cc +++ b/sim/sim_object.cc @@ -61,14 +61,29 @@ namespace Stats { // // SimObject constructor: used to maintain static simObjectList // +SimObject::SimObject(Params *p) + : _params(p) +{ +#ifdef DEBUG + doDebugBreak = false; +#endif + + doRecordEvent = !Stats::event_ignore.match(name()); + simObjectList.push_back(this); +} + +// +// SimObject constructor: used to maintain static simObjectList +// SimObject::SimObject(const string &_name) - : objName(_name) + : _params(new Params) { + _params->name = _name; #ifdef DEBUG doDebugBreak = false; #endif - doRecordEvent = !Stats::event_ignore.match(_name); + doRecordEvent = !Stats::event_ignore.match(name()); simObjectList.push_back(this); } |