From: Gabe Black <gabeblack@google.com>
Date: Thu, 15 Oct 2020 20:15:52 +0000 (-0700)
Subject: fastmodel: Fix up for the new standardized create() methods.
X-Git-Tag: develop-gem5-snapshot~564
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f07dbdacfd0c89beba048caf380dc4496c8402a9;p=gem5.git

fastmodel: Fix up for the new standardized create() methods.

Change-Id: I2e3610b5cad37b67d32907a2c2568b504d5ed113
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36155
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
index a9206dec3..802299b9f 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
@@ -98,8 +98,8 @@ CortexA76::getPort(const std::string &if_name, PortID idx)
         return Base::getPort(if_name, idx);
 }
 
-CortexA76Cluster::CortexA76Cluster(Params &p) :
-    SimObject(&p), _params(p), cores(p.cores), evs(p.evs)
+CortexA76Cluster::CortexA76Cluster(const Params &p) :
+    SimObject(p), _params(p), cores(p.cores), evs(p.evs)
 {
     for (int i = 0; i < p.cores.size(); i++)
         p.cores[i]->setCluster(this, i);
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
index 6088b0a6c..68ff1a80d 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
@@ -62,8 +62,8 @@ class CortexA76 : public Iris::CPU<CortexA76TC>
     const Params &params() { return _params; }
 
   public:
-    CortexA76(Params &p) : Base(&p, scx::scx_get_iris_connection_interface()),
-        _params(p)
+    CortexA76(const Params &p) :
+        Base(p, scx::scx_get_iris_connection_interface()), _params(p)
     {}
 
     void
@@ -110,7 +110,7 @@ class CortexA76Cluster : public SimObject
     CortexA76 *getCore(int num) const { return cores.at(num); }
     sc_core::sc_module *getEvs() const { return evs; }
 
-    CortexA76Cluster(Params &p);
+    CortexA76Cluster(const Params &p);
     const Params &params() { return _params; }
 
     Port &getPort(const std::string &if_name,
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
index 1936e2a69..31485d2b6 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
@@ -94,7 +94,7 @@ CortexR52::getPort(const std::string &if_name, PortID idx)
 }
 
 CortexR52Cluster::CortexR52Cluster(const Params &p) :
-    SimObject(&p), _params(p), cores(p.cores), evs(p.evs)
+    SimObject(p), _params(p), cores(p.cores), evs(p.evs)
 {
     for (int i = 0; i < p.cores.size(); i++)
         p.cores[i]->setCluster(this, i);
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
index 9abf19463..8332066c5 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
@@ -63,7 +63,7 @@ class CortexR52 : public Iris::CPU<CortexR52TC>
 
   public:
     CortexR52(const Params &p) :
-        Base(&p, scx::scx_get_iris_connection_interface()), _params(p)
+        Base(p, scx::scx_get_iris_connection_interface()), _params(p)
     {}
 
     template <class T>
diff --git a/src/arch/arm/fastmodel/GIC/gic.cc b/src/arch/arm/fastmodel/GIC/gic.cc
index 97d015453..934305bd5 100644
--- a/src/arch/arm/fastmodel/GIC/gic.cc
+++ b/src/arch/arm/fastmodel/GIC/gic.cc
@@ -297,7 +297,7 @@ SCGIC::before_end_of_elaboration()
 }
 
 GIC::GIC(const FastModelGICParams &params) :
-    BaseGic(&params),
+    BaseGic(params),
     ambaM(params.sc_gic->amba_m, params.name + ".amba_m", -1),
     ambaS(params.sc_gic->amba_s, params.name + ".amba_s", -1),
     redistributors(params.port_redistributor_connection_count),