diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
| commit | 26b1c455e0aed69eda0cc165b5084edb1b557c38 (patch) | |
| tree | 0b7ffa9259c55f9a639a12f09ddef033d78b084b /src/sim/root.cc | |
| parent | 02c39000bfc6be620382bf89636e3b1bbb2f4cf6 (diff) | |
| parent | abc76f20cb98c90e8dab416dd16dfd4a954013ba (diff) | |
| download | gem5-26b1c455e0aed69eda0cc165b5084edb1b557c38.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888
Diffstat (limited to 'src/sim/root.cc')
| -rw-r--r-- | src/sim/root.cc | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/sim/root.cc b/src/sim/root.cc index f4743af0a..15f73b15b 100644 --- a/src/sim/root.cc +++ b/src/sim/root.cc @@ -36,28 +36,17 @@ #include <vector> #include "base/misc.hh" -#include "sim/builder.hh" +#include "params/Root.hh" #include "sim/sim_object.hh" // Dummy Object struct Root : public SimObject { - Root(const std::string &name) : SimObject(name) {} + Root(RootParams *params) : SimObject(params) {} }; -BEGIN_DECLARE_SIM_OBJECT_PARAMS(Root) - - Param<int> dummy; // needed below - -END_DECLARE_SIM_OBJECT_PARAMS(Root) - -BEGIN_INIT_SIM_OBJECT_PARAMS(Root) - - INIT_PARAM(dummy, "") // All SimObjects must have params - -END_INIT_SIM_OBJECT_PARAMS(Root) - -CREATE_SIM_OBJECT(Root) +Root * +RootParams::create() { static bool created = false; if (created) @@ -65,7 +54,5 @@ CREATE_SIM_OBJECT(Root) created = true; - return new Root(getInstanceName()); + return new Root(this); } - -REGISTER_SIM_OBJECT("Root", Root) |