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

2 files changed, 16 insertions, 13 deletions

diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index 628d7ad6b..2e974effe 100644
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -41,8 +41,6 @@
 #include "base/trace.hh"
 #include "config/alpha_tlaser.hh"
 #include "cpu/thread_context.hh"
-#include "params/AlphaDTB.hh"
-#include "params/AlphaITB.hh"
 
 using namespace std;
 using namespace EV5;
@@ -59,8 +57,8 @@ bool uncacheBit40 = false;
 
 #define MODE2MASK(X)			(1 << (X))
 
-TLB::TLB(const string &name, int s)
-    : SimObject(name), size(s), nlu(0)
+TLB::TLB(const Params *p)
+    : SimObject(p), size(p->size), nlu(0)
 {
     table = new TlbEntry[size];
     memset(table, 0, sizeof(TlbEntry[size]));
@@ -286,8 +284,8 @@ TLB::unserialize(Checkpoint *cp, const string &section)
 //
 //  Alpha ITB
 //
-ITB::ITB(const std::string &name, int size)
-    : TLB(name, size)
+ITB::ITB(const Params *p)
+    : TLB(p)
 {}
 
 
@@ -400,8 +398,8 @@ ITB::translate(RequestPtr &req, ThreadContext *tc)
 //
 //  Alpha DTB
 //
- DTB::DTB(const std::string &name, int size)
-     : TLB(name, size)
+ DTB::DTB(const Params *p)
+     : TLB(p)
 {}
 
 void
@@ -624,11 +622,11 @@ TLB::index(bool advance)
 AlphaISA::ITB *
 AlphaITBParams::create()
 {
-    return new AlphaISA::ITB(name, size);
+    return new AlphaISA::ITB(this);
 }
 
 AlphaISA::DTB *
 AlphaDTBParams::create()
 {
-    return new AlphaISA::DTB(name, size);
+    return new AlphaISA::DTB(this);
 }
diff --git a/src/arch/alpha/tlb.hh b/src/arch/alpha/tlb.hh
index 8df47dbec..69a33f32d 100644
--- a/src/arch/alpha/tlb.hh
+++ b/src/arch/alpha/tlb.hh
@@ -41,6 +41,8 @@
 #include "arch/alpha/vtophys.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
+#include "params/AlphaDTB.hh"
+#include "params/AlphaITB.hh"
 #include "sim/faults.hh"
 #include "sim/sim_object.hh"
 
@@ -64,7 +66,8 @@ namespace AlphaISA
         TlbEntry *lookup(Addr vpn, uint8_t asn);
 
       public:
-        TLB(const std::string &name, int size);
+        typedef AlphaTLBParams Params;
+        TLB(const Params *p);
         virtual ~TLB();
 
         int getsize() const { return size; }
@@ -113,7 +116,8 @@ namespace AlphaISA
         mutable Stats::Formula accesses;
 
       public:
-        ITB(const std::string &name, int size);
+        typedef AlphaITBParams Params;
+        ITB(const Params *p);
         virtual void regStats();
 
         Fault translate(RequestPtr &req, ThreadContext *tc);
@@ -136,7 +140,8 @@ namespace AlphaISA
         Stats::Formula accesses;
 
       public:
-        DTB(const std::string &name, int size);
+        typedef AlphaDTBParams Params;
+        DTB(const Params *p);
         virtual void regStats();
 
         Fault translate(RequestPtr &req, ThreadContext *tc, bool write);