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/dev/sparc/t1000.cc | |
| parent | 02c39000bfc6be620382bf89636e3b1bbb2f4cf6 (diff) | |
| parent | abc76f20cb98c90e8dab416dd16dfd4a954013ba (diff) | |
| download | gem5-26b1c455e0aed69eda0cc165b5084edb1b557c38.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888
Diffstat (limited to 'src/dev/sparc/t1000.cc')
| -rw-r--r-- | src/dev/sparc/t1000.cc | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc index 3a2f881f1..692e0cfe1 100644 --- a/src/dev/sparc/t1000.cc +++ b/src/dev/sparc/t1000.cc @@ -39,7 +39,7 @@ #include "cpu/intr_control.hh" #include "dev/simconsole.hh" #include "dev/sparc/t1000.hh" -#include "sim/builder.hh" +#include "params/T1000.hh" #include "sim/system.hh" using namespace std; @@ -101,23 +101,8 @@ T1000::calcConfigAddr(int bus, int dev, int func) M5_DUMMY_RETURN } -BEGIN_DECLARE_SIM_OBJECT_PARAMS(T1000) - - SimObjectParam<System *> system; - SimObjectParam<IntrControl *> intrctrl; - -END_DECLARE_SIM_OBJECT_PARAMS(T1000) - -BEGIN_INIT_SIM_OBJECT_PARAMS(T1000) - - INIT_PARAM(system, "system"), - INIT_PARAM(intrctrl, "interrupt controller") - -END_INIT_SIM_OBJECT_PARAMS(T1000) - -CREATE_SIM_OBJECT(T1000) +T1000 * +T1000Params::create() { - return new T1000(getInstanceName(), system, intrctrl); + return new T1000(name, system, intrctrl); } - -REGISTER_SIM_OBJECT("T1000", T1000) |