Pull in RISC-V + CHERI-RISC-V Sail licenses, incorporate into front m…

…atter.

LICENSE

@@ -1,3 +1,7 @@
-This work is licensed under the Creative Commons Attribution 4.0 International
-License.  To view a copy of this license, visit:
-http://creativecommons.org/licenses/by/4.0/
+\noindent
+The CHERI ISA specification is licensed under the Creative Commons Attribution
+4.0 International License.  To view a copy of this license, visit:
+
+\medskip
+
+\url{http://creativecommons.org/licenses/by/4.0/}

LICENSE-sail-cheri-riscv

@@ -0,0 +1,56 @@
+\noindent
+The CHERI-RISC-V pseudocode is derived from the Sail CHERI-RISC-V model:
+
+\begin{scriptsize}
+\begin{verbatim}
+This CHERI Sail RISC-V architecture model here, comprising all files and
+directories except for the snapshots of the Lem and Sail libraries in the
+prover_snapshots directory (which include copies of their licenses), is subject
+to the BSD two-clause licence below.
+
+Copyright (c) 2017-2021 Alasdair Armstrong, Thomas Bauereiss, Brian Campbell,
+  Jessica Clarke, Nathaniel Wesley Filardo (contributions prior to July 2020,
+  thereafter Microsoft), Alexandre Joannou, Microsoft, Prashanth Mundkur,
+  Robert Norton-Wright (contributions prior to March 2020, thereafter
+  Microsoft), Alexander Richardson, Peter Rugg, Peter Sewell
+
+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/AFRL contract FA8650-18-C-7809 ("CIFV"), and
+under DARPA contract HR0011-18-C-0016 ("ECATS") as part of the DARPA
+SSITH research programme.
+
+This software was developed within the Rigorous Engineering of
+Mainstream Systems (REMS) project, partly funded by EPSRC grant
+EP/K008528/1, at the Universities of Cambridge and Edinburgh.
+
+This project has received funding from the European Research Council
+(ERC) under the European Union’s Horizon 2020 research and innovation
+programme (grant agreement 789108, ELVER).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+\end{verbatim}
+\end{scriptsize}

LICENSE-sail-riscv

@@ -0,0 +1,60 @@
+\noindent
+The RISC-V pseudocode is derived from the Sail RISC-V model:
+
+\begin{scriptsize}
+\begin{verbatim}
+This Sail RISC-V architecture model, comprising all files and
+directories except for the snapshots of the Lem and Sail libraries
+in the prover_snapshots directory (which include copies of their
+licences), is subject to the BSD two-clause licence below.
+
+Copyright (c) 2017-2021 Prashanth Mundkur, Rishiyur S. Nikhil and
+  Bluespec, Inc., Jon French, Brian Campbell, Robert Norton-Wright,
+  Alasdair Armstrong, Thomas Bauereiss, Shaked Flur, Christopher Pulte,
+  Peter Sewell, Alexander Richardson, Hesham Almatary,
+  Jessica Clarke, Microsoft, for contributions by Robert Norton-Wright and
+  Nathaniel Wesley Filardo, Peter Rugg,
+  Aril Computer Corp., for contributions by Scott Johnson
+
+All rights reserved.
+
+This software was developed by the above within the Rigorous
+Engineering of Mainstream Systems (REMS) project, partly funded by
+EPSRC grant EP/K008528/1, at the Universities of Cambridge and
+Edinburgh.
+
+This software was developed by SRI International and the University of
+Cambridge Computer Laboratory (Department of Computer Science and
+Technology) under DARPA/AFRL contract FA8650-18-C-7809 ("CIFV"), and
+under DARPA contract HR0011-18-C-0016 ("ECATS") as part of the DARPA
+SSITH research programme.
+
+This project has received funding from the European Research Council
+(ERC) under the European Union’s Horizon 2020 research and innovation
+programme (grant agreement 789108, ELVER).
+
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+\end{verbatim}
+\end{scriptsize}

Makefile

@@ -5,7 +5,7 @@ PREVEOUS=../branches/20150624-cheri-architecture-1-13
 SAIL_LATEX_MIPS_DIR=sail_latex_mips
 SAIL_LATEX_RISCV_DIR=sail_latex_riscv
 
-SOURCES=$(wildcard *.tex insn-mips/*.tex insn-riscv/*.tex $(SAIL_LATEX_MIPS_DIR)/*.tex $(SAIL_LATEX_RISCV_DIR)/*.tex) cheri.bib
+SOURCES=$(wildcard *.tex insn-mips/*.tex insn-riscv/*.tex $(SAIL_LATEX_MIPS_DIR)/*.tex $(SAIL_LATEX_RISCV_DIR)/*.tex) cheri.bib LICENSE LICENSE-sail-cheri-riscv LICENSE-sail-riscv
 DIFFDIR=diff
 DIFFTEX=$(SOURCES:%=${DIFFDIR}/%)
 DIFFPARAM=--type=UNDERLINE --packages=amsmath,hyperref --math-markup=1

cheri-architecture.tex

@@ -105,10 +105,15 @@
 
 \clearpage
 
-\noindent
-This work is licensed under the Creative Commons Attribution 4.0 International
-License.  To view a copy of this license, visit:
-\url{http://creativecommons.org/licenses/by/4.0/}
+\input{LICENSE}
+
+\clearpage
+
+\input{LICENSE-sail-cheri-riscv}
+
+\clearpage
+
+\input{LICENSE-sail-riscv}
 
 \clearpage