diff options
author | Miles Kaufmann <milesck@eecs.umich.edu> | 2007-08-30 15:16:59 -0400 |
---|---|---|
committer | Miles Kaufmann <milesck@eecs.umich.edu> | 2007-08-30 15:16:59 -0400 |
commit | 54cc0053f0a6822e47a49771976af6daaabc24bb (patch) | |
tree | 72e6c7879de698347832e1e1475afbb9c1be2b70 /src/dev/sparc | |
parent | 9cb49ab9e0ff8917d20fd7dc81be3ce5ecc81bd8 (diff) | |
download | gem5-54cc0053f0a6822e47a49771976af6daaabc24bb.tar.xz |
params: Deprecate old-style constructors; update most SimObject constructors.
SimObjects not yet updated:
- Process and subclasses
- BaseCPU and subclasses
The SimObject(const std::string &name) constructor was removed. Subclasses
that still rely on that behavior must call the parent initializer as
: SimObject(makeParams(name))
--HG--
extra : convert_revision : d6faddde76e7c3361ebdbd0a7b372a40941c12ed
Diffstat (limited to 'src/dev/sparc')
-rw-r--r-- | src/dev/sparc/t1000.cc | 7 | ||||
-rw-r--r-- | src/dev/sparc/t1000.hh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc index 692e0cfe1..49e44af55 100644 --- a/src/dev/sparc/t1000.cc +++ b/src/dev/sparc/t1000.cc @@ -39,15 +39,14 @@ #include "cpu/intr_control.hh" #include "dev/simconsole.hh" #include "dev/sparc/t1000.hh" -#include "params/T1000.hh" #include "sim/system.hh" using namespace std; //Should this be AlphaISA? using namespace TheISA; -T1000::T1000(const string &name, System *s, IntrControl *ic) - : Platform(name, ic), system(s) +T1000::T1000(const Params *p) + : Platform(p), system(p->system) { // set the back pointer from the system to myself system->platform = this; @@ -104,5 +103,5 @@ T1000::calcConfigAddr(int bus, int dev, int func) T1000 * T1000Params::create() { - return new T1000(name, system, intrctrl); + return new T1000(this); } diff --git a/src/dev/sparc/t1000.hh b/src/dev/sparc/t1000.hh index 8e28d90e5..76de0a550 100644 --- a/src/dev/sparc/t1000.hh +++ b/src/dev/sparc/t1000.hh @@ -38,6 +38,7 @@ #define __DEV_T1000_HH__ #include "dev/platform.hh" +#include "params/T1000.hh" class IdeController; class System; @@ -49,13 +50,14 @@ class T1000 : public Platform System *system; public: + typedef T1000Params Params; /** * Constructor for the Tsunami Class. * @param name name of the object * @param s system the object belongs to * @param intctrl pointer to the interrupt controller */ - T1000(const std::string &name, System *s, IntrControl *intctrl); + T1000(const Params *p); /** * Return the interrupting frequency to AlphaAccess |