Removed the Component* versions of SubComponent constructors.

sstsimulator · Jan 29, 2020 · 50fda15 · 50fda15
1 parent 8c370c2
commit 50fda15
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/src/custominst/junocustinst.h b/src/custominst/junocustinst.h
@@ -30,9 +30,8 @@ namespace Juno {
 class JunoCustomInstructionHandler : public SST::SubComponent {
 
 public:
-        SST_ELI_REGISTER_SUBCOMPONENT_API(SST::Juno::JunoCustomInstructionHandler)
+    SST_ELI_REGISTER_SUBCOMPONENT_API(SST::Juno::JunoCustomInstructionHandler)
 
-	JunoCustomInstructionHandler( Component* owner, Params& params ) : SubComponent(owner) {}
 	JunoCustomInstructionHandler( ComponentId_t id, Params& params) : SubComponent(id) {}
         ~JunoCustomInstructionHandler() {}
 

diff --git a/src/custominst/junorandextinst.cc b/src/custominst/junorandextinst.cc
@@ -36,16 +36,6 @@ JunoExternalRandInstructionHandler::JunoExternalRandInstructionHandler( Componen
 	statCyclesBusy = registerStatistic<uint64_t>("cycles-busy");
 }
 
-JunoExternalRandInstructionHandler::JunoExternalRandInstructionHandler( Component* owner, Params& params ) :
-		JunoCustomInstructionHandler( owner, params ), nextEvID(0), targetReg(0) {
-
-	randAccLink = configureLink( "genlink", "1ns", new Event::Handler<JunoExternalRandInstructionHandler>(
-		this, &JunoExternalRandInstructionHandler::handleGenerateResp));
-
-	statRandCalls = registerStatistic<uint64_t>("rand-calls");
-	statCyclesBusy = registerStatistic<uint64_t>("cycles-busy");
-}
-
 JunoExternalRandInstructionHandler::~JunoExternalRandInstructionHandler() {
 
 }

diff --git a/src/custominst/junorandextinst.h b/src/custominst/junorandextinst.h
@@ -37,9 +37,8 @@ namespace Juno {
 class JunoExternalRandInstructionHandler : public JunoCustomInstructionHandler {
 
 public:
-	JunoExternalRandInstructionHandler( Component* owner, Params& params );
 	JunoExternalRandInstructionHandler( ComponentId_t id, Params& params );
-        ~JunoExternalRandInstructionHandler();
+    ~JunoExternalRandInstructionHandler();
 
 	// Return true if the op-code is either RAND or RSEED instructions
 	// that's all we can process in this unit

diff --git a/src/custominst/junorandinst.cc b/src/custominst/junorandinst.cc
@@ -36,18 +36,6 @@ JunoRandInstructionHandler::JunoRandInstructionHandler( ComponentId_t id, Params
 	cyclesLeft = 0;
 }
 
-JunoRandInstructionHandler::JunoRandInstructionHandler( Component* owner, Params& params ) :
-		JunoCustomInstructionHandler( owner, params ) {
-
-	const uint64_t rngSeed = params.find<uint64_t>("seed", 101010101);
-	rng = new MersenneRNG( rngSeed );
-
-	statRandCalls = registerStatistic<uint64_t>("calls-to-rand");
-	statRandSeedCalls = registerStatistic<uint64_t>("calls-to-rseed");
-
-	cyclesLeft = 0;
-}
-
 JunoRandInstructionHandler::~JunoRandInstructionHandler() {
 	delete rng;
 }

diff --git a/src/custominst/junorandinst.h b/src/custominst/junorandinst.h
@@ -36,9 +36,8 @@ namespace Juno {
 class JunoRandInstructionHandler : public JunoCustomInstructionHandler {
 
 public:
-	JunoRandInstructionHandler( Component* owner, Params& params );
-        JunoRandInstructionHandler( ComponentId_t id, Params& params );
-        ~JunoRandInstructionHandler();
+    JunoRandInstructionHandler( ComponentId_t id, Params& params );
+    ~JunoRandInstructionHandler();
 
 	// Return true if the op-code is either RAND or RSEED instructions
 	// that's all we can process in this unit