summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-08-11 12:22:17 -0700
committerNathan Binkert <nate@binkert.org>2008-08-11 12:22:17 -0700
commit9cf8ad3a17894c482968b5055e72f5434740f1f2 (patch)
treec01643645476f4c6b4e382c788e2d6f72242b85a /src
parentee62a0fec8e63f45f816c61ab9fb28aba7414185 (diff)
downloadgem5-9cf8ad3a17894c482968b5055e72f5434740f1f2.tar.xz
params: Get rid of the remnants of the old style parameter configuration stuff.
Diffstat (limited to 'src')
-rw-r--r--src/mem/mem_object.cc8
-rw-r--r--src/mem/mem_object.hh13
-rw-r--r--src/sim/sim_object.cc8
-rw-r--r--src/sim/sim_object.hh4
-rw-r--r--src/sim/system.cc6
5 files changed, 4 insertions, 35 deletions
diff --git a/src/mem/mem_object.cc b/src/mem/mem_object.cc
index ce2a1107e..20a1b4cd8 100644
--- a/src/mem/mem_object.cc
+++ b/src/mem/mem_object.cc
@@ -35,14 +35,6 @@ MemObject::MemObject(const Params *params)
{
}
-MemObjectParams *
-MemObject::makeParams(const std::string &name)
-{
- MemObjectParams *params = new MemObjectParams;
- params->name = name;
- return params;
-}
-
void
MemObject::deletePortRefs(Port *p)
{
diff --git a/src/mem/mem_object.hh b/src/mem/mem_object.hh
index 33b56dfd4..b8bf4b939 100644
--- a/src/mem/mem_object.hh
+++ b/src/mem/mem_object.hh
@@ -48,17 +48,10 @@ class MemObject : public SimObject
{
public:
typedef MemObjectParams Params;
- MemObject(const Params *params);
-
- const Params *
- params() const
- {
- return dynamic_cast<const Params *>(_params);
- }
+ const Params *params() const
+ { return dynamic_cast<const Params *>(_params); }
- protected:
- // static: support for old-style constructors (call manually)
- static Params *makeParams(const std::string &name);
+ MemObject(const Params *params);
public:
/** Additional function to return the Port of a memory object. */
diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index a835aee5b..2c2213987 100644
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -69,14 +69,6 @@ SimObject::SimObject(const Params *p)
state = Running;
}
-SimObjectParams *
-SimObject::makeParams(const std::string &name)
-{
- SimObjectParams *params = new SimObjectParams;
- params->name = name;
- return params;
-}
-
void
SimObject::init()
{
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh
index 00bb3fee6..0141c16cc 100644
--- a/src/sim/sim_object.hh
+++ b/src/sim/sim_object.hh
@@ -87,10 +87,6 @@ class SimObject : public Serializable, protected StartupCallback
SimObject(const Params *_params);
virtual ~SimObject() {}
- protected:
- // static: support for old-style constructors (call manually)
- static Params *makeParams(const std::string &name);
-
public:
virtual const std::string name() const { return params()->name; }
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 803881539..7b830d0f7 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -285,11 +285,7 @@ const char *System::MemoryModeStrings[3] = {"invalid", "atomic",
System *
SystemParams::create()
{
- System::Params *p = new System::Params;
- p->name = name;
- p->physmem = physmem;
- p->mem_mode = mem_mode;
- return new System(p);
+ return new System(this);
}
#endif