Add CHERI+RVFI_DII grant codes and copyrights

src_Core/RISCY_OOO/coherence/src/CCPipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/CCTypes.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/CrossBar.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/IBank.bsv

@@ -1,5 +1,18 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/ICRqMshr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/IPRqMshr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/L1Bank.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/L1CRqMshr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/L1PRqMshr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/L1Pipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/LLBank.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/LLCRqMshr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/LLPipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/RWBramCore.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/RandomReplace.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/SelfInvIBank.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/SelfInvIPipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2019 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/SelfInvL1Bank.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/SelfInvL1Pipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2019 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/coherence/src/SelfInvLLBank.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/coherence/src/SelfInvLLPipe.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/connectal/bsv/ConnectalBramFifo.bsv

@@ -1,4 +1,17 @@
 // Copyright (c) 2015 Quanta Research Cambridge, Inc.
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv

@@ -1,6 +1,21 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv

@@ -2,6 +2,22 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 // Portions Copyright (c) 2019-2020 Bluespec, Inc.
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv

@@ -2,6 +2,22 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 // Portions Copyright (c) 2019-2020 Bluespec, Inc.
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/FpuMulDivExePipeline.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv

@@ -1,6 +1,21 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/RFileSynth.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv

@@ -2,6 +2,21 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 // Portions Copyright (c) 2019-2020 Bluespec, Inc.
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/RV64G_OOO/ReservationStationMem.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Amo.bsv

@@ -1,5 +1,18 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Bht.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/BrPred.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Btb.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Bypass.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/CacheUtils.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/DTlb.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/Decode.bsv

@@ -1,6 +1,21 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Ehr.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/Exec.bsv

@@ -1,5 +1,20 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/FP_Utils.bsv

@@ -1,4 +1,17 @@
 // Copyright (c) 2019 Bluepec, Inc
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // This package implements utility functions used by the floating point
 // related logic
 package FP_Utils;

src_Core/RISCY_OOO/procs/lib/Fifos.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/Fpu.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2016, 2017 Massachusetts Institute of Technology
 // Portions Copyright (c) 2019-2020 Bluespec, Inc.
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/GSelectPred.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/GSharePred.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2018 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/ITlb.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/L1CoCache.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/L2Tlb.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/LLCDmaConnect.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 // Portions Copyright (c) 2019-2020 Bluespec, Inc.
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 
 // This file is a modified version of:    RISCY_OOO/procs/lib/LLCDmaConnect.bsv
 // Bluespec: this file is has many modifications.

src_Core/RISCY_OOO/procs/lib/LLCRqMshrSecureModel.bsv

@@ -1,5 +1,19 @@
 
 // Copyright (c) 2019 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/LLCache.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/MMIOAddrs.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2018 Massachusetts Institute of Technology
 // Portions copyright (c) 2019-2020 Bluespec, Inc.
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/MMIOCore.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2018 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/MMIOInst.bsv

@@ -1,5 +1,19 @@
 
 // Copyright (c) 2018 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jessica Clarke
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/MemLoader.bsv

@@ -1,5 +1,19 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/MemoryTypes.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/MsgFifo.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/MulDiv.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/PhysRFile.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv

@@ -2,6 +2,21 @@
 // Copyright (c) 2017 Massachusetts Institute of Technology
 // Portions (c) 2020 Bluespec, Inc.
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Ras.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/ReorderBuffer.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Peter Rugg
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/Scoreboard.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/SplitLSQ.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2018 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/StoreBuffer.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/TourPred.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/TourPredSecure.bsv

@@ -1,6 +1,19 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without

src_Core/RISCY_OOO/procs/lib/TranslationCache.bsv

@@ -1,5 +1,18 @@
 
 // Copyright (c) 2018 Massachusetts Institute of Technology
+//
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
 // 
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation

src_Core/RISCY_OOO/procs/lib/Types.bsv

@@ -1,6 +1,20 @@
 
 // Copyright (c) 2017 Massachusetts Institute of Technology
 //
+//-
+// RVFI_DII + CHERI modifications:
+//     Copyright (c) 2020 Alexandre Joannou
+//     Copyright (c) 2020 Jonathan Woodruff
+//     All rights reserved.
+//
+//     This software was developed by SRI International and the University of
+//     Cambridge Computer Laboratory (Department of Computer Science and
+//     Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
+//     DARPA SSITH research programme.
+//
+//     This work was supported by NCSC programme grant 4212611/RFA 15971 ("SafeBet").
+//-
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without