Juno updates including

- Copyright date to 2022
- StandardMem interface instead of SimpleMem
- New naming conventions
- Fix compiler warnings

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright 2009-2021 National Technology and Engineering Solutions of Sandia,
+Copyright 2009-2022 National Technology and Engineering Solutions of Sandia,
 LLC (NTESS).  Under the terms of Contract DE-NA-0003525, the U.S. Government
 retains certain rights in this software.
 
@@ -9,7 +9,7 @@ by National Technology and Engineering Solutions of Sandia, LLC., a wholly
 owned subsidiary of Honeywell International, Inc., for the U.S. Department of
 Energy's National Nuclear Security Administration under contract DE-NA0003525.
 
-Copyright (c) 2009-2021, NTESS
+Copyright (c) 2009-2022, NTESS
 
 All rights reserved.
 

asm/asmlocalopcodes.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

asm/asmmain.cc

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

asm/asmop.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -83,7 +83,7 @@ class AssemblyRegisterOperand : public AssemblyOperand {
 		}
 
 		char regNum[JUNO_MAX_REGISTER_DIGITS];
-		for(int i = 1; i < std::max(static_cast<size_t>(JUNO_MAX_REGISTER_DIGITS), strlen(regst)); ++i) {
+		for(size_t i = 1; i < std::max(static_cast<size_t>(JUNO_MAX_REGISTER_DIGITS), strlen(regst)); ++i) {
 			regNum[i-1] = regst[i];
 		}
 

asm/asmoptions.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

asm/asmprogram.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -81,7 +81,7 @@ class AssemblyProgram {
 
 					int index = -1;
 
-					for( int j = 0; j < int64Literals.size(); ++j ) {
+					for( size_t j = 0; j < int64Literals.size(); ++j ) {
 						if( litVal == int64Literals[j] ) {
 							index = j;
 							break;
@@ -167,13 +167,13 @@ class AssemblyProgram {
 		fwrite( &literalSize, sizeof(literalSize), 1, binary );
 		fwrite( &programSize, sizeof(programSize), 1, binary );
 
-		for( int i = 0; i < int64Literals.size(); ++i ) {
+		for( size_t i = 0; i < int64Literals.size(); ++i ) {
 			fwrite( &int64Literals[i], sizeof(int64_t), 1, binary );
 		}
 
 		char binaryOp[4];
 
-		for( int i = 0; i < op->size(); ++i ) {
+		for( size_t i = 0; i < op->size(); ++i ) {
 			for( int j = 0; j < 4; ++j ) {
 				binaryOp[j] = 0;
 			}
@@ -228,7 +228,7 @@ class AssemblyProgram {
 				memcpy( (void*) &binaryOp[2], (void*)& zero, sizeof(zero) );
 				memcpy( (void*) &binaryOp[3], (void*)& zero, sizeof(zero) );
 			} else {
-				fprintf(stderr, "Unknown instruction code: %s at instruction index: %d\n",
+				fprintf(stderr, "Unknown instruction code: %s at instruction index: %zu\n",
 					curOp->getInstCode().c_str(), i);
 				exit(-1);
 			}
@@ -349,11 +349,11 @@ class AssemblyProgram {
                 }
 
                 AssemblyLiteralOperand* litOp = dynamic_cast<AssemblyLiteralOperand*>(curOp->getOperand(0));
-                uint64_t litVal  = static_cast<uint64_t>( litOp->getLiteral() );
+                int64_t litVal  = litOp->getLiteral();
 
 		int index = -1;
 
-		for( int i = 0; i < int64Literals.size(); ++i ) {
+		for( size_t i = 0; i < int64Literals.size(); ++i ) {
 			if(int64Literals[i] == litVal) {
 				index = i;
 				break;
@@ -393,11 +393,11 @@ class AssemblyProgram {
 		}
 
 		AssemblyLiteralOperand* litOp = dynamic_cast<AssemblyLiteralOperand*>(curOp->getOperand(1));
-                uint64_t litVal  = static_cast<uint64_t>( litOp->getLiteral() );
+                int64_t litVal  = litOp->getLiteral();
 
 		int index = -1;
 
-		for( int i = 0; i < int64Literals.size(); ++i ) {
+		for( size_t i = 0; i < int64Literals.size(); ++i ) {
 			if(int64Literals[i] == litVal) {
 				index = i;
 				break;

asm/asmreader.cc

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

asm/asmreader.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/custominst/junocustinst.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/custominst/junorandextinst.cc

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -32,8 +32,8 @@ JunoExternalRandInstructionHandler::JunoExternalRandInstructionHandler( Componen
 	randAccLink = configureLink( "genlink", "1ns", new Event::Handler<JunoExternalRandInstructionHandler>(
 		this, &JunoExternalRandInstructionHandler::handleGenerateResp));
 
-	statRandCalls = registerStatistic<uint64_t>("rand-calls");
-	statCyclesBusy = registerStatistic<uint64_t>("cycles-busy");
+	statRandCalls = registerStatistic<uint64_t>("rand_calls");
+	statCyclesBusy = registerStatistic<uint64_t>("cycles_busy");
 }
 
 JunoExternalRandInstructionHandler::~JunoExternalRandInstructionHandler() {

src/custominst/junorandextinst.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -67,8 +67,8 @@ class JunoExternalRandInstructionHandler : public JunoCustomInstructionHandler {
 		)
 
 	SST_ELI_DOCUMENT_STATISTICS(
-		{ "rand-calls", "Calls to the RAND instruction", "calls", 1 },
-		{ "cycles-busy", "Cycles spent waiting for accelerator", "cycles", 1 }
+		{ "rand_calls", "Calls to the RAND instruction", "calls", 1 },
+		{ "cycles_busy", "Cycles spent waiting for accelerator", "cycles", 1 }
 		)
 
 private:

src/custominst/junorandinst.cc

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -30,8 +30,8 @@ JunoRandInstructionHandler::JunoRandInstructionHandler( ComponentId_t id, 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");
+	statRandCalls = registerStatistic<uint64_t>("calls_to_rand");
+	statRandSeedCalls = registerStatistic<uint64_t>("calls_to_rseed");
 
 	cyclesLeft = 0;
 }

src/custominst/junorandinst.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:
@@ -65,8 +65,8 @@ class JunoRandInstructionHandler : public JunoCustomInstructionHandler {
     		)
 
 	SST_ELI_DOCUMENT_STATISTICS(
-		{ "calls-to-rand", "Number of times the RAND instruction is called", "calls", 1 },
-		{ "calls-to-rseed", "Number of times the RSEED instruction is called", "calls", 1 }
+		{ "calls_to_rand", "Number of times the RAND instruction is called", "calls", 1 },
+		{ "calls_to_rseed", "Number of times the RSEED instruction is called", "calls", 1 }
 		)
 
 private:

src/custominst/randaccel/junogenrandev.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/custominst/randaccel/junogenrandresp.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/custominst/randaccel/junorandacc.cc

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/custominst/randaccel/junorandacc.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/instmgr/junofixedprogmgr.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers:

src/junoalu.h

@@ -1,8 +1,8 @@
-// Copyright 2013-2021 NTESS. Under the terms
+// Copyright 2013-2022 NTESS. Under the terms
 // of Contract DE-NA0003525 with NTESS, the U.S.
 // Government retains certain rights in this software.
 //
-// Copyright (c) 2013-2021, NTESS
+// Copyright (c) 2013-2022, NTESS
 // All rights reserved.
 //
 // Portions are copyright of other developers: