diff --git a/src_Core/CPU/CPU_Decode_C.bsv b/src_Core/CPU/CPU_Decode_C.bsv index 99168bf..5b3b04e 100644 --- a/src_Core/CPU/CPU_Decode_C.bsv +++ b/src_Core/CPU/CPU_Decode_C.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2016-2019 Bluespec, Inc. All Rights Reserved +//- +// 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"). +//- package CPU_Decode_C; diff --git a/src_Core/CPU/Core.bsv b/src_Core/CPU/Core.bsv index ea3af92..1f77235 100644 --- a/src_Core/CPU/Core.bsv +++ b/src_Core/CPU/Core.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 diff --git a/src_Core/CPU/CsrFile.bsv b/src_Core/CPU/CsrFile.bsv index 298e2fa..b08015a 100644 --- a/src_Core/CPU/CsrFile.bsv +++ b/src_Core/CPU/CsrFile.bsv @@ -2,9 +2,11 @@ // Copyright (c) 2017 Massachusetts Institute of Technology // Portions Copyright (c) 2019-2020 Bluespec, Inc. // -// CHERI modifications: -// Copyright (c) 2020 Jonathan Woodruff +//- +// 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 @@ -12,6 +14,9 @@ // 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 diff --git a/src_Core/CPU/LLC_AXI4_Adapter.bsv b/src_Core/CPU/LLC_AXI4_Adapter.bsv index c70e720..0c8afa4 100644 --- a/src_Core/CPU/LLC_AXI4_Adapter.bsv +++ b/src_Core/CPU/LLC_AXI4_Adapter.bsv @@ -1,3 +1,17 @@ +//- +// 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"). +//- + package LLC_AXI4_Adapter; // ================================================================ diff --git a/src_Core/CPU/MMIOPlatform.bsv b/src_Core/CPU/MMIOPlatform.bsv index 6a057c9..278a3b1 100644 --- a/src_Core/CPU/MMIOPlatform.bsv +++ b/src_Core/CPU/MMIOPlatform.bsv @@ -1,7 +1,22 @@ - // Copyright (c) 2018 Massachusetts Institute of Technology // Portions (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 diff --git a/src_Core/CPU/MMIO_AXI4_Adapter.bsv b/src_Core/CPU/MMIO_AXI4_Adapter.bsv index 98029ba..0cebab4 100644 --- a/src_Core/CPU/MMIO_AXI4_Adapter.bsv +++ b/src_Core/CPU/MMIO_AXI4_Adapter.bsv @@ -1,4 +1,18 @@ // 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"). +//- package MMIO_AXI4_Adapter; diff --git a/src_Core/CPU/Proc.bsv b/src_Core/CPU/Proc.bsv index 2fbb780..219bad9 100644 --- a/src_Core/CPU/Proc.bsv +++ b/src_Core/CPU/Proc.bsv @@ -5,6 +5,22 @@ package Proc; // Copyright (c) 2018 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 diff --git a/src_Core/CPU/Proc_IFC.bsv b/src_Core/CPU/Proc_IFC.bsv index 7351db0..7c4a263 100644 --- a/src_Core/CPU/Proc_IFC.bsv +++ b/src_Core/CPU/Proc_IFC.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2016-2020 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package Proc_IFC; diff --git a/src_Core/Core/CoreW.bsv b/src_Core/Core/CoreW.bsv index e3795e2..7bbbff7 100644 --- a/src_Core/Core/CoreW.bsv +++ b/src_Core/Core/CoreW.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2018-2020 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package CoreW; diff --git a/src_Core/Core/CoreW_IFC.bsv b/src_Core/Core/CoreW_IFC.bsv index 3cf3b97..efed821 100644 --- a/src_Core/Core/CoreW_IFC.bsv +++ b/src_Core/Core/CoreW_IFC.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2018-2020 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package CoreW_IFC; diff --git a/src_Core/Core/Fabric_Defs.bsv b/src_Core/Core/Fabric_Defs.bsv index a1196ff..c9cdb1a 100644 --- a/src_Core/Core/Fabric_Defs.bsv +++ b/src_Core/Core/Fabric_Defs.bsv @@ -1,4 +1,16 @@ // Copyright (c) 2018-2019 Bluespec, Inc. All Rights Reserved +//- +// 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"). +//- package Fabric_Defs; diff --git a/src_Core/Core/TV_Encode.bsv b/src_Core/Core/TV_Encode.bsv index fefe1a7..238e76a 100644 --- a/src_Core/Core/TV_Encode.bsv +++ b/src_Core/Core/TV_Encode.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2013-2020 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package TV_Encode; diff --git a/src_Core/Core/TV_Taps.bsv b/src_Core/Core/TV_Taps.bsv index 5b4ee39..075cdbd 100644 --- a/src_Core/Core/TV_Taps.bsv +++ b/src_Core/Core/TV_Taps.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2018-2020 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package TV_Taps; diff --git a/src_Core/Core/Trace_Data2_to_Trace_Data.bsv b/src_Core/Core/Trace_Data2_to_Trace_Data.bsv index c044a87..410323d 100644 --- a/src_Core/Core/Trace_Data2_to_Trace_Data.bsv +++ b/src_Core/Core/Trace_Data2_to_Trace_Data.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2020 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package Trace_Data2_to_Trace_Data; diff --git a/src_Core/Debug_Module/DM_Abstract_Commands.bsv b/src_Core/Debug_Module/DM_Abstract_Commands.bsv index c5146b8..370ee52 100644 --- a/src_Core/Debug_Module/DM_Abstract_Commands.bsv +++ b/src_Core/Debug_Module/DM_Abstract_Commands.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2017-2019 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package DM_Abstract_Commands; diff --git a/src_Core/Debug_Module/DM_Run_Control.bsv b/src_Core/Debug_Module/DM_Run_Control.bsv index 51e00aa..4887ade 100644 --- a/src_Core/Debug_Module/DM_Run_Control.bsv +++ b/src_Core/Debug_Module/DM_Run_Control.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2017-2019 Bluespec, Inc. All Rights Reserved. +// +//- +// 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"). +//- package DM_Run_Control; diff --git a/src_Core/Debug_Module/DM_System_Bus.bsv b/src_Core/Debug_Module/DM_System_Bus.bsv index 421662c..a6f9abc 100644 --- a/src_Core/Debug_Module/DM_System_Bus.bsv +++ b/src_Core/Debug_Module/DM_System_Bus.bsv @@ -1,16 +1,18 @@ // Copyright (c) 2017-2019 Bluespec, Inc. All Rights Reserved. - +// //- -// AXI (user fields) modifications: -// Copyright (c) 2019 Alexandre Joannou -// Copyright (c) 2019 Peter Rugg -// Copyright (c) 2019 Jonathan Woodruff +// 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"). //- package DM_System_Bus; diff --git a/src_Core/Debug_Module/Debug_Module.bsv b/src_Core/Debug_Module/Debug_Module.bsv index 297307e..afe53be 100644 --- a/src_Core/Debug_Module/Debug_Module.bsv +++ b/src_Core/Debug_Module/Debug_Module.bsv @@ -1,16 +1,18 @@ // Copyright (c) 2017-2019 Bluespec, Inc. All Rights Reserved. - +// //- -// AXI (user fields) modifications: -// Copyright (c) 2019 Alexandre Joannou -// Copyright (c) 2019 Peter Rugg -// Copyright (c) 2019 Jonathan Woodruff +// 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"). //- package Debug_Module; diff --git a/src_Core/ISA/ISA_Decls.bsv b/src_Core/ISA/ISA_Decls.bsv index 0b406b0..d5d5776 100644 --- a/src_Core/ISA/ISA_Decls.bsv +++ b/src_Core/ISA/ISA_Decls.bsv @@ -1,4 +1,16 @@ // Copyright (c) 2013-2020 Bluespec, Inc. All Rights Reserved +//- +// 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"). +//- // ================================================================ // ISA defs for UC Berkeley RISC V diff --git a/src_Core/ISA/ISA_Decls_CHERI.bsv b/src_Core/ISA/ISA_Decls_CHERI.bsv index 56fb917..bbd7568 100755 --- a/src_Core/ISA/ISA_Decls_CHERI.bsv +++ b/src_Core/ISA/ISA_Decls_CHERI.bsv @@ -1,11 +1,14 @@ /* - * Copyright (c) 2019 Peter Rugg + * 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"). * * @BERI_LICENSE_HEADER_START@ * diff --git a/src_Core/ISA/ISA_Decls_Priv_M.bsv b/src_Core/ISA/ISA_Decls_Priv_M.bsv index fa040ce..0ebbc62 100644 --- a/src_Core/ISA/ISA_Decls_Priv_M.bsv +++ b/src_Core/ISA/ISA_Decls_Priv_M.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2013-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- // ================================================================ // This is an 'include' file, not a separate BSV package diff --git a/src_Core/ISA/ISA_Decls_Priv_S.bsv b/src_Core/ISA/ISA_Decls_Priv_S.bsv index 19fe461..3dce8bc 100644 --- a/src_Core/ISA/ISA_Decls_Priv_S.bsv +++ b/src_Core/ISA/ISA_Decls_Priv_S.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2013-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- // ================================================================ // WARNING: this is an 'include' file, not a separate BSV package! diff --git a/src_Core/ISA/TV_Info.bsv b/src_Core/ISA/TV_Info.bsv index d70a6d3..525889e 100644 --- a/src_Core/ISA/TV_Info.bsv +++ b/src_Core/ISA/TV_Info.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2013-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- // ================================================================ // Definition of Tandem Verifier Packets. diff --git a/src_Core/PLIC/PLIC.bsv b/src_Core/PLIC/PLIC.bsv index 9f40ac1..dbd05ab 100644 --- a/src_Core/PLIC/PLIC.bsv +++ b/src_Core/PLIC/PLIC.bsv @@ -1,4 +1,18 @@ // Copyright (c) 2019-2020 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package PLIC; diff --git a/src_Core/PLIC/PLIC_16_2_7.bsv b/src_Core/PLIC/PLIC_16_2_7.bsv index 361d7cc..b62d1d4 100644 --- a/src_Core/PLIC/PLIC_16_2_7.bsv +++ b/src_Core/PLIC/PLIC_16_2_7.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package PLIC_16_2_7; diff --git a/src_Core/PLIC/Test_PLIC.bsv b/src_Core/PLIC/Test_PLIC.bsv index 74360a4..e4dd2c7 100644 --- a/src_Core/PLIC/Test_PLIC.bsv +++ b/src_Core/PLIC/Test_PLIC.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package Test_PLIC; diff --git a/src_Core/RISCY_OOO/coherence/src/CCPipe.bsv b/src_Core/RISCY_OOO/coherence/src/CCPipe.bsv index 53f9a4d..04e1587 100644 --- a/src_Core/RISCY_OOO/coherence/src/CCPipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/CCTypes.bsv b/src_Core/RISCY_OOO/coherence/src/CCTypes.bsv index 83f9de2..586d232 100644 --- a/src_Core/RISCY_OOO/coherence/src/CCTypes.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/CrossBar.bsv b/src_Core/RISCY_OOO/coherence/src/CrossBar.bsv index eb4c0b1..e43f2e5 100644 --- a/src_Core/RISCY_OOO/coherence/src/CrossBar.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/IBank.bsv b/src_Core/RISCY_OOO/coherence/src/IBank.bsv index 6615bc5..eea023e 100644 --- a/src_Core/RISCY_OOO/coherence/src/IBank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/ICRqMshr.bsv b/src_Core/RISCY_OOO/coherence/src/ICRqMshr.bsv index 416680d..b6c815f 100644 --- a/src_Core/RISCY_OOO/coherence/src/ICRqMshr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/IPRqMshr.bsv b/src_Core/RISCY_OOO/coherence/src/IPRqMshr.bsv index 735307e..2ef1be9 100644 --- a/src_Core/RISCY_OOO/coherence/src/IPRqMshr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/L1Bank.bsv b/src_Core/RISCY_OOO/coherence/src/L1Bank.bsv index 2e1fbbe..3e4adec 100644 --- a/src_Core/RISCY_OOO/coherence/src/L1Bank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/L1CRqMshr.bsv b/src_Core/RISCY_OOO/coherence/src/L1CRqMshr.bsv index a3ac066..7028a34 100644 --- a/src_Core/RISCY_OOO/coherence/src/L1CRqMshr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/L1PRqMshr.bsv b/src_Core/RISCY_OOO/coherence/src/L1PRqMshr.bsv index eb6cf74..732586e 100644 --- a/src_Core/RISCY_OOO/coherence/src/L1PRqMshr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/L1Pipe.bsv b/src_Core/RISCY_OOO/coherence/src/L1Pipe.bsv index f20a327..481edbf 100644 --- a/src_Core/RISCY_OOO/coherence/src/L1Pipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/LLBank.bsv b/src_Core/RISCY_OOO/coherence/src/LLBank.bsv index c8f4ae9..06be57a 100644 --- a/src_Core/RISCY_OOO/coherence/src/LLBank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/LLCRqMshr.bsv b/src_Core/RISCY_OOO/coherence/src/LLCRqMshr.bsv index 3909685..bde74ea 100644 --- a/src_Core/RISCY_OOO/coherence/src/LLCRqMshr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/LLPipe.bsv b/src_Core/RISCY_OOO/coherence/src/LLPipe.bsv index 3068e60..9880deb 100644 --- a/src_Core/RISCY_OOO/coherence/src/LLPipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/RWBramCore.bsv b/src_Core/RISCY_OOO/coherence/src/RWBramCore.bsv index e0233a8..3c8a6f4 100644 --- a/src_Core/RISCY_OOO/coherence/src/RWBramCore.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/RandomReplace.bsv b/src_Core/RISCY_OOO/coherence/src/RandomReplace.bsv index 313cec6..936f6e0 100644 --- a/src_Core/RISCY_OOO/coherence/src/RandomReplace.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvIBank.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvIBank.bsv index 45c0c45..8587d60 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvIBank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvIPipe.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvIPipe.bsv index 19f6b14..4fffd6d 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvIPipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvL1Bank.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvL1Bank.bsv index ffc25fe..88060e6 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvL1Bank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvL1Pipe.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvL1Pipe.bsv index b3716a4..45b4b9a 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvL1Pipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvLLBank.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvLLBank.bsv index 50c7245..c2c19df 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvLLBank.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/coherence/src/SelfInvLLPipe.bsv b/src_Core/RISCY_OOO/coherence/src/SelfInvLLPipe.bsv index 5f517ae..72f6314 100644 --- a/src_Core/RISCY_OOO/coherence/src/SelfInvLLPipe.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/connectal/bsv/ConnectalBramFifo.bsv b/src_Core/RISCY_OOO/connectal/bsv/ConnectalBramFifo.bsv index df0b060..a53cb0d 100644 --- a/src_Core/RISCY_OOO/connectal/bsv/ConnectalBramFifo.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv index b60ec82..b2cdc19 100755 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/AluExePipeline.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv index 97d51fb..b3cc5b3 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv index 876dce6..18ef0ad 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/FetchStage.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/FpuMulDivExePipeline.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/FpuMulDivExePipeline.bsv index ea0574e..dfef24e 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/FpuMulDivExePipeline.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv index 88ad15e..59923cc 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv index 69c35f0..871a586 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/ProcConfig.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/RFileSynth.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/RFileSynth.bsv index 63c4b17..5226e4c 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/RFileSynth.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv index 7f02da0..315a7f0 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/ReservationStationMem.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/ReservationStationMem.bsv index cb0dc8d..fde3056 100644 --- a/src_Core/RISCY_OOO/procs/RV64G_OOO/ReservationStationMem.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Amo.bsv b/src_Core/RISCY_OOO/procs/lib/Amo.bsv index 5ed8a4b..6fcb090 100644 --- a/src_Core/RISCY_OOO/procs/lib/Amo.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Bht.bsv b/src_Core/RISCY_OOO/procs/lib/Bht.bsv index 32397b1..79c1746 100644 --- a/src_Core/RISCY_OOO/procs/lib/Bht.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/BrPred.bsv b/src_Core/RISCY_OOO/procs/lib/BrPred.bsv index 14f6c0e..5943f36 100644 --- a/src_Core/RISCY_OOO/procs/lib/BrPred.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Btb.bsv b/src_Core/RISCY_OOO/procs/lib/Btb.bsv index 6f02d79..4b97844 100644 --- a/src_Core/RISCY_OOO/procs/lib/Btb.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Bypass.bsv b/src_Core/RISCY_OOO/procs/lib/Bypass.bsv index 527156e..5c3acef 100644 --- a/src_Core/RISCY_OOO/procs/lib/Bypass.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/CacheUtils.bsv b/src_Core/RISCY_OOO/procs/lib/CacheUtils.bsv index 3171b5e..c0c039c 100644 --- a/src_Core/RISCY_OOO/procs/lib/CacheUtils.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/DTlb.bsv b/src_Core/RISCY_OOO/procs/lib/DTlb.bsv index d06ce3f..c0eedf9 100644 --- a/src_Core/RISCY_OOO/procs/lib/DTlb.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Decode.bsv b/src_Core/RISCY_OOO/procs/lib/Decode.bsv index 0877c0a..597e2e2 100755 --- a/src_Core/RISCY_OOO/procs/lib/Decode.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv b/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv index 51e87e0..fe48ab1 100644 --- a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Ehr.bsv b/src_Core/RISCY_OOO/procs/lib/Ehr.bsv index fe1f602..cfad7df 100644 --- a/src_Core/RISCY_OOO/procs/lib/Ehr.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Exec.bsv b/src_Core/RISCY_OOO/procs/lib/Exec.bsv index adfc6a7..99a94fb 100755 --- a/src_Core/RISCY_OOO/procs/lib/Exec.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/FP_Utils.bsv b/src_Core/RISCY_OOO/procs/lib/FP_Utils.bsv index 3e0dab1..9481a8e 100644 --- a/src_Core/RISCY_OOO/procs/lib/FP_Utils.bsv +++ b/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; diff --git a/src_Core/RISCY_OOO/procs/lib/Fifos.bsv b/src_Core/RISCY_OOO/procs/lib/Fifos.bsv index b0621cf..a83154d 100644 --- a/src_Core/RISCY_OOO/procs/lib/Fifos.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv index 7fa0025..84c7344 100644 --- a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/GSelectPred.bsv b/src_Core/RISCY_OOO/procs/lib/GSelectPred.bsv index 30c2a1a..a8eccfb 100644 --- a/src_Core/RISCY_OOO/procs/lib/GSelectPred.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/GSharePred.bsv b/src_Core/RISCY_OOO/procs/lib/GSharePred.bsv index beedb80..ce04324 100644 --- a/src_Core/RISCY_OOO/procs/lib/GSharePred.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/ITlb.bsv b/src_Core/RISCY_OOO/procs/lib/ITlb.bsv index dcb435b..485044f 100644 --- a/src_Core/RISCY_OOO/procs/lib/ITlb.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/L1CoCache.bsv b/src_Core/RISCY_OOO/procs/lib/L1CoCache.bsv index 85f3294..ce455b1 100644 --- a/src_Core/RISCY_OOO/procs/lib/L1CoCache.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/L2Tlb.bsv b/src_Core/RISCY_OOO/procs/lib/L2Tlb.bsv index 8cf3d99..ab8b58e 100644 --- a/src_Core/RISCY_OOO/procs/lib/L2Tlb.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/LLCDmaConnect.bsv b/src_Core/RISCY_OOO/procs/lib/LLCDmaConnect.bsv index b3de024..b008ebb 100644 --- a/src_Core/RISCY_OOO/procs/lib/LLCDmaConnect.bsv +++ b/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. diff --git a/src_Core/RISCY_OOO/procs/lib/LLCRqMshrSecureModel.bsv b/src_Core/RISCY_OOO/procs/lib/LLCRqMshrSecureModel.bsv index ed81eed..91c77cc 100644 --- a/src_Core/RISCY_OOO/procs/lib/LLCRqMshrSecureModel.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/LLCache.bsv b/src_Core/RISCY_OOO/procs/lib/LLCache.bsv index 38badac..401aa2c 100644 --- a/src_Core/RISCY_OOO/procs/lib/LLCache.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MMIOAddrs.bsv b/src_Core/RISCY_OOO/procs/lib/MMIOAddrs.bsv index 4178ebb..8c5ffa0 100644 --- a/src_Core/RISCY_OOO/procs/lib/MMIOAddrs.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MMIOCore.bsv b/src_Core/RISCY_OOO/procs/lib/MMIOCore.bsv index 0864791..834a136 100644 --- a/src_Core/RISCY_OOO/procs/lib/MMIOCore.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MMIOInst.bsv b/src_Core/RISCY_OOO/procs/lib/MMIOInst.bsv index 523fc7f..0429386 100644 --- a/src_Core/RISCY_OOO/procs/lib/MMIOInst.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MemLoader.bsv b/src_Core/RISCY_OOO/procs/lib/MemLoader.bsv index 22141d2..e9c6da8 100644 --- a/src_Core/RISCY_OOO/procs/lib/MemLoader.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MemoryTypes.bsv b/src_Core/RISCY_OOO/procs/lib/MemoryTypes.bsv index 60692bb..a212b04 100644 --- a/src_Core/RISCY_OOO/procs/lib/MemoryTypes.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MsgFifo.bsv b/src_Core/RISCY_OOO/procs/lib/MsgFifo.bsv index 7b8636d..1da6665 100644 --- a/src_Core/RISCY_OOO/procs/lib/MsgFifo.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/MulDiv.bsv b/src_Core/RISCY_OOO/procs/lib/MulDiv.bsv index 20a2429..dd8ffe3 100644 --- a/src_Core/RISCY_OOO/procs/lib/MulDiv.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/PhysRFile.bsv b/src_Core/RISCY_OOO/procs/lib/PhysRFile.bsv index c4c53c6..90c5d2d 100644 --- a/src_Core/RISCY_OOO/procs/lib/PhysRFile.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv b/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv index d192e1e..882c386 100755 --- a/src_Core/RISCY_OOO/procs/lib/ProcTypes.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Ras.bsv b/src_Core/RISCY_OOO/procs/lib/Ras.bsv index 0083712..9848057 100644 --- a/src_Core/RISCY_OOO/procs/lib/Ras.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/ReorderBuffer.bsv b/src_Core/RISCY_OOO/procs/lib/ReorderBuffer.bsv index 7c9f08f..8425be9 100755 --- a/src_Core/RISCY_OOO/procs/lib/ReorderBuffer.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Scoreboard.bsv b/src_Core/RISCY_OOO/procs/lib/Scoreboard.bsv index 6abce64..8c12695 100644 --- a/src_Core/RISCY_OOO/procs/lib/Scoreboard.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/SplitLSQ.bsv b/src_Core/RISCY_OOO/procs/lib/SplitLSQ.bsv index bc8ace8..25b734f 100644 --- a/src_Core/RISCY_OOO/procs/lib/SplitLSQ.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/StoreBuffer.bsv b/src_Core/RISCY_OOO/procs/lib/StoreBuffer.bsv index a99d4bb..715086d 100644 --- a/src_Core/RISCY_OOO/procs/lib/StoreBuffer.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/TourPred.bsv b/src_Core/RISCY_OOO/procs/lib/TourPred.bsv index 4097483..c03cccf 100644 --- a/src_Core/RISCY_OOO/procs/lib/TourPred.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/TourPredSecure.bsv b/src_Core/RISCY_OOO/procs/lib/TourPredSecure.bsv index 2574715..b18e2a9 100644 --- a/src_Core/RISCY_OOO/procs/lib/TourPredSecure.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/TranslationCache.bsv b/src_Core/RISCY_OOO/procs/lib/TranslationCache.bsv index aa87f8f..479fc8d 100644 --- a/src_Core/RISCY_OOO/procs/lib/TranslationCache.bsv +++ b/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 diff --git a/src_Core/RISCY_OOO/procs/lib/Types.bsv b/src_Core/RISCY_OOO/procs/lib/Types.bsv index 8514f97..9cfa226 100644 --- a/src_Core/RISCY_OOO/procs/lib/Types.bsv +++ b/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 diff --git a/src_Testbench/SoC/Boot_ROM.bsv b/src_Testbench/SoC/Boot_ROM.bsv index 868eb66..5a8daf8 100644 --- a/src_Testbench/SoC/Boot_ROM.bsv +++ b/src_Testbench/SoC/Boot_ROM.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2016-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package Boot_ROM; diff --git a/src_Testbench/SoC/Mem_Controller.bsv b/src_Testbench/SoC/Mem_Controller.bsv index b68a78c..e37b5b6 100644 --- a/src_Testbench/SoC/Mem_Controller.bsv +++ b/src_Testbench/SoC/Mem_Controller.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2016-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package Mem_Controller; diff --git a/src_Testbench/SoC/SoC_Map.bsv b/src_Testbench/SoC/SoC_Map.bsv index 2ce4e70..b65bde6 100644 --- a/src_Testbench/SoC/SoC_Map.bsv +++ b/src_Testbench/SoC/SoC_Map.bsv @@ -1,4 +1,19 @@ // Copyright (c) 2013-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package SoC_Map; diff --git a/src_Testbench/SoC/SoC_Top.bsv b/src_Testbench/SoC/SoC_Top.bsv index b84fb21..e92074a 100644 --- a/src_Testbench/SoC/SoC_Top.bsv +++ b/src_Testbench/SoC/SoC_Top.bsv @@ -1,13 +1,19 @@ // Copyright (c) 2016-2020 Bluespec, Inc. All Rights Reserved. +// //- -// RVFI_DII modifications: -// Copyright (c) 2018 Peter Rugg +// 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"). //- package SoC_Top; diff --git a/src_Testbench/SoC/UART_Model.bsv b/src_Testbench/SoC/UART_Model.bsv index cccf275..77a6345 100644 --- a/src_Testbench/SoC/UART_Model.bsv +++ b/src_Testbench/SoC/UART_Model.bsv @@ -1,4 +1,18 @@ // Copyright (c) 2016-2020 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- package UART_Model; diff --git a/src_Testbench/Top/Mem_Model.bsv b/src_Testbench/Top/Mem_Model.bsv index a299742..f70c8d7 100644 --- a/src_Testbench/Top/Mem_Model.bsv +++ b/src_Testbench/Top/Mem_Model.bsv @@ -1,4 +1,17 @@ // Copyright (c) 2016-2019 Bluespec, Inc. All Rights Reserved +// +//- +// 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"). +//- //- // RVFI_DII modifications: // Copyright (c) 2018 Peter Rugg diff --git a/src_Testbench/Top/Top_HW_Side.bsv b/src_Testbench/Top/Top_HW_Side.bsv index 11e22de..51f9970 100644 --- a/src_Testbench/Top/Top_HW_Side.bsv +++ b/src_Testbench/Top/Top_HW_Side.bsv @@ -1,14 +1,17 @@ // Copyright (c) 2013-2020 Bluespec, Inc. All Rights Reserved. +// //- -// RVFI_DII modifications: -// Copyright (c) 2018 Peter Rugg +// 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"). //- package Top_HW_Side;