Skip to content

Commit

Permalink
Update copyright to 2020
Browse files Browse the repository at this point in the history
  • Loading branch information
allevin committed Mar 30, 2020
1 parent 50fda15 commit 2e5753f
Show file tree
Hide file tree
Showing 110 changed files with 1,172 additions and 1,172 deletions.
12 changes: 6 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
BSD 3-Clause License

CCopyright 2009-2018 National Technology and Engineering Solutions of Sandia,
LLC (NTESS). Under the terms of Contract DE-NA-0003525, the U.S. Government
Copyright 2009-2020 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.

Sandia National Laboratories is a multimission laboratory managed and operated
by National Technology and Engineering Solutions of Sandia, LLC., a wholly
owned subsidiary of Honeywell International, Inc., for the U.S. Department of
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-2018, NTESS
Copyright (c) 2009-2020, NTESS

All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
Expand Down
4 changes: 2 additions & 2 deletions asm/asmlocalopcodes.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
6 changes: 3 additions & 3 deletions asm/asmmain.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down Expand Up @@ -43,7 +43,7 @@ int main(int argc, char* argv[]) {

if( labelsOK ) {
printf("All labels checkout OK.\n");
}
}

printf("Writing binary...\n");
program->writeBinary( options->getOutputFile() );
Expand Down
4 changes: 2 additions & 2 deletions asm/asmop.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions asm/asmoptions.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions asm/asmprogram.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions asm/asmreader.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions asm/asmreader.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/junocustinst.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/junorandextinst.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/junorandextinst.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/junorandinst.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/junorandinst.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/randaccel/junogenrandev.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/randaccel/junogenrandresp.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/randaccel/junorandacc.cc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
4 changes: 2 additions & 2 deletions src/custominst/randaccel/junorandacc.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand Down
24 changes: 12 additions & 12 deletions src/instmgr/junofixedprogmgr.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2013-2018 NTESS. Under the terms
// Copyright 2013-2020 NTESS. Under the terms
// of Contract DE-NA0003525 with NTESS, the U.S.
// Government retains certain rights in this software.
//
// Copyright (c) 2013-2018, NTESS
// Copyright (c) 2013-2020, NTESS
// All rights reserved.
//
// Portions are copyright of other developers:
Expand All @@ -23,37 +23,37 @@

namespace SST {
namespace Juno {

class JunoFixedPrgInstMgr : public JunoInstructionMgr {

public:
JunoFixedPrgInstMgr( const char* buff, const uint64_t length ) :
JunoInstructionMgr(), maxLen(length) {

buffer = (char*) malloc( sizeof(char) * maxLen );
memcpy( buffer, buff, maxLen );
}
~JunoFixedPrgInstMgr() {}

bool instReady( const uint64_t addr ) {
return true;
}

JunoCPUInstruction* getInstruction( const uint64_t addr ) {
int32_t instCode = 0;

memcpy( (void*) &instCode, &buffer[addr], sizeof(instCode) );
JunoCPUInstruction* inst = new JunoCPUInstruction( instCode);

return inst;
}

protected:
char* buffer;
uint64_t maxLen;

};

}
}

Expand Down
Loading

0 comments on commit 2e5753f

Please sign in to comment.