Updated Makefile with residue module targets. Updated the license info.

1 files changed, 39 insertions, 29 deletions

diff --git a/toolruns/Makefile b/toolruns/Makefile
index 91fcd42..1662e01 100755
--- a/toolruns/Makefile
+++ b/toolruns/Makefile
@@ -2,38 +2,38 @@
 #
 # Makefile
 # --------
-# Makefile for building the modular exponentiation submodules, core
-# and top simulations.
+# Makefile for building the modular exponentiation submodules,
+# core and top simulations.
 #
 #
-# Author: Joachim Strombergson
-# Copyright (c) 2014, Secworks Sweden AB
-# All rights reserved.
+# Author: Joachim Strombergson, Peter Magnusson
+# Copyright (c) 2015, NORDUnet A/S All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
 #
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# - 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.
 #
-# 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.
+# - Neither the name of the NORDUnet nor the names of its contributors may
+#   be used to endorse or promote products derived from this software
+#   without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
-# COPYRIGHT OWNER 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.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# HOLDER 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.
 #
 #===================================================================
 
@@ -43,9 +43,10 @@ CCFLAGS = -Wall
 LINT = verilator
 LINTFLAGS = --lint-only -Wall
 
+
 # sources
-#RESIDUE_TB = ../src/tb/tb_montprod.v
-RESIDUE_SRC = ../src/rtl/residue.v
+RESIDUE_TB = ../src/tb/tb_residue.v ../src/rtl/blockmem1r1w.v
+RESIDUE_SRC = ../src/rtl/residue.v ../src/rtl/adder32.v ../src/rtl/shl32.v
 
 MONTPROD_TB = ../src/tb/tb_montprod.v
 MONTPROD_SRC = ../src/rtl/montprod.v ../src/rtl/adder32.v ../src/rtl/shr32.v ../src/rtl/blockmem1r1w.v
@@ -55,7 +56,7 @@ TOP_TB=../src/tb/tb_modexp.v
 
 
 # rules
-all: top.sim montprod.sim
+all: top.sim montprod.sim residue.sim
 
 
 top.sim: $(TOP_TB) $(TOP_SRC)
@@ -66,6 +67,10 @@ montprod.sim: $(MONTPROD_TB) $(MONTPROD_SRC)
 	$(CC) $(CCFLAGS) -o montprod.sim $(MONTPROD_TB) $(MONTPROD_SRC)
 
 
+residue.sim: $(RESIDUE_TB) $(RESIDUE_SRC)
+	$(CC) $(CCFLAGS) -o residue.sim $(RESIDUE_TB) $(RESIDUE_SRC)
+
+
 sim-top: top.sim
 	./top.sim
 
@@ -74,6 +79,10 @@ sim-montprod: montprod.sim
 	./montprod.sim
 
 
+sim-residue: residue.sim
+	./residue.sim
+
+
 lint:
 	@echo "Linting of montprod:"
 	$(LINT) $(LINTFLAGS) $(MONTPROD_SRC)
@@ -87,6 +96,7 @@ lint:
 	$(LINT) $(LINTFLAGS) $(TOP_SRC)
 	@echo ""
 
+
 clean:
 	rm -f top.sim
 	rm -f montprod.sim