fastmodel: Fix up for the new standardized create() methods.
authorGabe Black <gabeblack@google.com>
Thu, 15 Oct 2020 20:15:52 +0000 (13:15 -0700)
committerGabe Black <gabeblack@google.com>
Sat, 24 Oct 2020 03:35:17 +0000 (03:35 +0000)
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>
src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
src/arch/arm/fastmodel/GIC/gic.cc

index a9206dec366452fd4c903e25dc5b30de1ba21d09..802299b9fb7a211d9516c3867da06c6c6c1e8095 100644 (file)
@@ -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);
index 6088b0a6c58fabb4a2e6a81b27f1b3bfb2bf7b58..68ff1a80d9a343e86a2a94579d829cb3e1903e19 100644 (file)
@@ -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,
index 1936e2a69c70bb6af40cc8abfaa82a9b2ebd492f..31485d2b695029b2da1571cde269d23650c12409 100644 (file)
@@ -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);
index 9abf19463ff2c2b21fe798d5fca99910eeb8a96b..8332066c54e5d67103f869673e924c18c5687173 100644 (file)
@@ -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>
index 97d0154534c5dc60b18e2753cc5954290bfcfb11..934305bd5ca3ab1bfea6ef32ad246874a1e8847d 100644 (file)
@@ -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),