From: megacz <adam@megacz.com>
Date: Mon, 6 Apr 2009 18:53:20 +0000 (-0700)
Subject: add campus.png, ibex.jar, upload image to Fpga in MergeSort demo
X-Git-Url: http://git.megacz.com/?p=fleet.git;a=commitdiff_plain;h=281589ecfbaea02473261c71899d3f7382360d03

add campus.png, ibex.jar, upload image to Fpga in MergeSort demo
---

diff --git a/Makefile b/Makefile
index cd0e3d0..cc8f8d7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.jar: $(java_files) $(ship_files) 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 -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	javac -classpath lib/ibex.jar: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
+	cd build/class/; jar xf ../../lib/ibex.jar
 	for A in `find ships -name \*.ship`;\
 	  do java -cp fleet.jar: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`
+	javac -classpath lib/ibex.jar: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
 	jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -211,7 +212,6 @@ synth:
 	  | grep --line-buffered -v 'been backward balanced into' \
 	  | grep --line-buffered -v 'IDDR has been replaced by IDDR_2CLK' \
 	  | grep --line-buffered -v 'WARNING:Xst:616 - Invalid property'
-	#rm build/fpga/dvi.ucf
 	cat build/fpga/*.ucf > build/fpga/main.ucf
 	$(xilinx_ise)ngdbuild ${intstyle} -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
 	$(xilinx_ise)map      ${intstyle} -ol ${effort} -p $(device) -pr b -cm ${opt_for} -o main_map.ncd main.ngd main.pcf
diff --git a/campus.png b/campus.png
new file mode 100644
index 0000000..b307515
Binary files /dev/null and b/campus.png differ
diff --git a/lib/ibex.jar b/lib/ibex.jar
new file mode 100644
index 0000000..27cad7a
Binary files /dev/null and b/lib/ibex.jar differ
diff --git a/src/edu/berkeley/fleet/dataflow/MergeSort.java b/src/edu/berkeley/fleet/dataflow/MergeSort.java
index 057db66..b478462 100644
--- a/src/edu/berkeley/fleet/dataflow/MergeSort.java
+++ b/src/edu/berkeley/fleet/dataflow/MergeSort.java
@@ -4,7 +4,7 @@ import java.io.*;
 import edu.berkeley.fleet.loops.*;
 import edu.berkeley.fleet.api.*;
 import edu.berkeley.fleet.fpga.*;
-//import org.ibex.graphics.*;
+import org.ibex.graphics.*;
 
 public class MergeSort {
 
@@ -282,7 +282,6 @@ public class MergeSort {
         BitVector[] bvs = new BitVector[vals_length];
 
         long index = 0;
-        /*
         Picture p = new Picture(new FileInputStream("campus.png"));
         for(int y=0; y<(478/2); y++)
             for(int x=0; x<544; x++) {
@@ -300,7 +299,7 @@ public class MergeSort {
                 bvs[(int)index] = new BitVector(fleet.getWordWidth()).set( r | (g<<6) | (b<<12) | (index<<18) );
                 index++;
             }
-        */
+
         for(; index<vals_length; index++) {
             long tag = index<<18;
             bvs[(int)index] = new BitVector(fleet.getWordWidth()).set( tag );