X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=88c7d9b908e6d513c14de9b3fffaa4ed511f0a79;hb=2764a47dea69d1ef555844c7ca474c102bafd50b;hp=ed2de7f9db0251a9cfbbf979fb748aa96971e55a;hpb=c38e474e4e480aba0d8a070ee52f608aaf4f4c1d;p=fleet.git

diff --git a/Makefile b/Makefile
index ed2de7f..88c7d9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,56 @@
 
 ## Fleeterpreter ##############################################################################
 
-interpreter_class = edu.berkeley.fleet.interpreter.Main
-cp                = -cp fleet.jar
+cp                = -cp fleet.jar:lib/RXTXcomm.jar
 java              = java -Xmx500m
 
-run: fleet.jar
-	$(java) $(cp) $(interpreter_class)
+run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
-fleet.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
+ifeq ($(shell uname -o 2>/dev/null),Cygwin)
+ps=\;
+else
+ps=:
+endif
+
+fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g
 	mkdir -p build/class/edu/berkeley/fleet/assembler/
 	cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
-	javac -cp lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
-	cd build/class/; jar xvf ../../lib/edu.berkeley.sbp.jar
+	javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+	for A in `find ships -name \*.ship`;\
+	  do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
+	  done
+	javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
 	echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
-	cd build/class/; jar cvmf manifest ../../$@ .
+	cd build/class/; jar cmf manifest ../../$@ .
 
 
-## Slipway ####################################################################################
+## Fpga ####################################################################################
 
 #host = sting.eecs.berkeley.edu
 #remote_xilinx = /opt/ISE81/
 #remote_dir = fleet/
 
-host = mm2.millennium.berkeley.edu
+host = intel2950-4.eecs.berkeley.edu
 remote_xilinx = /scratch/megacz/xilinx/
 remote_dir = /scratch/megacz/fleet/
 
-xilinx =  cd build; 
+#host = cs61c-tb@ilinux1.eecs.berkeley.edu
+#remote_xilinx = /usr/local/xilinx/xilinx.ise.9.1-1607-8571-0259-2277
+#remote_dir = /home/tmp/cs61c-tb/fleet
+
+#host = mm2.millennium.berkeley.edu
+#remote_xilinx = /scratch/megacz/xilinx/
+#remote_dir = /scratch/megacz/fleet/
+
+xilinx =  cd build/fpga;
 xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(XILINX)/bin/lin
 xilinx += XILINX=$(XILINX)
 xilinx += PATH=$$PATH:$(XILINX)/bin/lin
 xilinx += $(XILINX)/bin/lin/
 
+device = xc4vfx60-ff1152
+
 remote_run =  skill a.out;
 remote_run += user_unprogram 1;
 remote_run += user_program 1 main.bit;
@@ -41,38 +59,83 @@ remote_run += gcc test.c;
 remote_run += echo running;
 remote_run +=  ./a.out /dev/selectmap1 fleet.bin
 
+verilog_files  = $(shell find src -name \*.v)
+verilog_files += $(shell find src -name \*.inc)
+
 runfpga: fleet.jar
+	$(java) -jar fleet.jar target=fpga run
+
+upload: fleet.jar build/fpga/main.bit
 	mkdir -p build
-	$(java) $(cp) $(interpreter_class) --dump-code
-	$(java) $(cp) edu.berkeley.fleet.slipway.Client < build/fleet.bin
+	rsync -are ssh --progress --verbose ./ root@goliath:fleet/
 
-mrunfpga: fleet.jar build/main.bit
-	$(java) $(cp) $(interpreter_class) --dump-code
-	rsync -zare ssh --progress --verbose build/main.bit root@bee441.cs.berkeley.edu:/var/slipway/megacz.bit
-	$(java) $(cp) edu.berkeley.fleet.slipway.Client megacz.bit < build/fleet.bin
+uploadtest:
+	make upload
+	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
+testmegacz:
+	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
 
-build/main.bit: contrib/demo.ships $(shell find src -name \*.v)
+build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
 	make fleet.jar
-	mkdir -p build
-	$(java) $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
+	mkdir -p build/fpga
+	$(java) $(cp) edu.berkeley.fleet.fpga.Fpga > build/fpga/fabric.v
+
+build/fpga/main.bit: build/fpga/fabric.v $(verilog_files)
+	make fleet.jar
+	cp src/edu/berkeley/fleet/fpga/* build/fpga
+	for A in `find ships -name \*.ship`;\
+	  do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
+	  done
+	$(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
 	rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
-	ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
-	scp ${host}:${remote_dir}/build/main.bit build/
+	time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
+	scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
 
 synth:
-	cd build; ln -sf ../src/edu/berkeley/fleet/slipway/* .
-	cd build; echo work > main.lso
-	cd build; for A in *.v; do echo verilog work \""$$A"\"; done > main.prj
-	cd build; mkdir -p tmp
-	cd build; mkdir -p xst
-	rm -rf build/_ngo
-	$(xilinx)xst -intstyle ise -ifn main.xst -ofn main.syr < main.xst
-	$(xilinx)ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc main.ucf -p xc2vp70-ff1704-6 main.ngc main.ngd
-	$(xilinx)map -intstyle ise -p xc2vp70-ff1704-6 -cm area -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf
-	$(xilinx)par -w -intstyle ise -pl std -ol std -t 99 main_map.ncd main.ncd main.pcf
-	$(xilinx)bitgen -intstyle ise -d -f main.ut main.ncd
-#	$(xilinx)trce -intstyle ise -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
-
+	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
+	cd build/fpga; echo work > main.lso
+	cd build/fpga; for A in *.v; do echo verilog work \""$$A"\"; done > main.prj
+	cd build/fpga; mkdir -p tmp
+	cd build/fpga; mkdir -p xst
+	rm -rf build/fpga/_ngo
+	$(xilinx)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
+	$(xilinx)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
+	$(xilinx)map -intstyle xflow -p $(device) -cm speed -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf
+	$(xilinx)par -w -intstyle xflow -pl std -ol std -t 99 main_map.ncd main.ncd main.pcf
+	$(xilinx)bitgen -intstyle xflow -d -f main.ut main.ncd
+#	$(xilinx)trce -intstyle xflow -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
+
+
+
+test:     fleet.jar; $(java) -jar fleet.jar             test tests ships/*.ship
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests ships/*.ship
+
+generate: fleet.jar
+	$(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
+
+## Manual ####################################################################################
+
+svgs    = $(shell find doc -name \*.svg)
+%.eps: %.svg
+	DISPLAY= /Applications/Inkscape.app/Contents//Resources/bin/inkscape  -z --export-area-drawing $^ --export-eps=$@
+
+%.pdf: %.eps
+	epstopdf $^ --outfile=$@
+
+manual: archmanual toolmanual
+
+archmanual: fleet.jar $(svgs:%.svg=%.pdf)
+	$(java) -jar fleet.jar doc
+	cd .tmp; ln -sf ../doc/*.bib .
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex
+	cd .tmp; for A in *.mp; do mpost --tex=latex $$A; done
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex
+	open .tmp/FleetTwo.Manual.pdf
+toolmanual: fleet.jar $(svgs:%.svg=%.pdf)
+	$(java) -jar fleet.jar doc
+	cd .tmp; ln -sf ../doc/*.bib .
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex toolchain.tex
+	open .tmp/toolchain.pdf
 
 ## API docs ####################################################################################
 
@@ -107,6 +170,8 @@ dist:
 	darcs get . --repo-name=fleet-`date +%d.%h.%y`
 	make -C fleet-`date +%d.%h.%y` fleet.jar
 	rm -rf fleet-`date +%d.%h.%y`/build
+	echo 'http://research.cs.berkeley.edu/class/fleet/repos/fleet/' > \
+	  fleet-`date +%d.%h.%y`/_darcs/prefs/defaultrepo
 	tar cvzf fleet-`date +%d.%h.%y`.tgz fleet-`date +%d.%h.%y`
 	rm -rf fleet-`date +%d.%h.%y`
 	mv fleet-`date +%d.%h.%y`.tgz /afs/research.cs.berkeley.edu/class/fleet/website/files/
@@ -117,4 +182,19 @@ dist:
 	@echo
 
 
+# you'll probably want to change this line
+ghc  = /usr/local/brian/ghc/compiler/ghc-inplace
+
+ghc += -fglasgow-exts -fallow-undecidable-instances -fallow-overlapping-instances -cpp 
+ghc += -i$(shell pwd)/build/hi/ -hidir $(shell pwd)/build/hi/ -odir $(shell pwd)/build/class/
+
+f0: fleet.jar
+	mkdir -p build/hi build/class
+	cd lib;                        $(ghc) -c -java SBP.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Util.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Fleet.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Types.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Compile.lhs
+	cd src/edu/berkeley/fleet/f0/; $(ghc) -fglasgow-exts -cpp $(hflags)    -java Main.lhs
+	$(java) -cp build/class:lib/HSbase.jar:lib/HSrts.jar:lib/HSstm.jar:fleet.jar Main