summaryrefslogtreecommitdiff
path: root/src/dev/alpha
diff options
context:
space:
mode:
authorMiles Kaufmann <milesck@eecs.umich.edu>2007-08-30 15:16:59 -0400
committerMiles Kaufmann <milesck@eecs.umich.edu>2007-08-30 15:16:59 -0400
commit54cc0053f0a6822e47a49771976af6daaabc24bb (patch)
tree72e6c7879de698347832e1e1475afbb9c1be2b70 /src/dev/alpha
parent9cb49ab9e0ff8917d20fd7dc81be3ce5ecc81bd8 (diff)
downloadgem5-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/alpha')
-rw-r--r--src/dev/alpha/tsunami.cc7
-rw-r--r--src/dev/alpha/tsunami.hh10
2 files changed, 6 insertions, 11 deletions
diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index bac2a8682..5bc0de5da 100644
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -42,15 +42,14 @@
#include "dev/alpha/tsunami_pchip.hh"
#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunami.hh"
-#include "params/Tsunami.hh"
#include "sim/system.hh"
using namespace std;
//Should this be AlphaISA?
using namespace TheISA;
-Tsunami::Tsunami(const string &name, System *s, IntrControl *ic)
- : Platform(name, ic), system(s)
+Tsunami::Tsunami(const Params *p)
+ : Platform(p), system(p->system)
{
// set the back pointer from the system to myself
system->platform = this;
@@ -117,5 +116,5 @@ Tsunami::unserialize(Checkpoint *cp, const std::string &section)
Tsunami *
TsunamiParams::create()
{
- return new Tsunami(name, system, intrctrl);
+ return new Tsunami(this);
}
diff --git a/src/dev/alpha/tsunami.hh b/src/dev/alpha/tsunami.hh
index 6fbfac851..44c5d41a4 100644
--- a/src/dev/alpha/tsunami.hh
+++ b/src/dev/alpha/tsunami.hh
@@ -38,6 +38,7 @@
#define __DEV_TSUNAMI_HH__
#include "dev/platform.hh"
+#include "params/Tsunami.hh"
class IdeController;
class TsunamiCChip;
@@ -80,13 +81,8 @@ class Tsunami : public Platform
int ipi_pending[Tsunami::Max_CPUs];
public:
- /**
- * 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
- */
- Tsunami(const std::string &name, System *s, IntrControl *intctrl);
+ typedef TsunamiParams Params;
+ Tsunami(const Params *p);
/**
* Return the interrupting frequency to AlphaAccess