Merge branch 'master' of git://git.hcoop.net/git/crawshaw/fleet

diff --combined Makefile
index 79a028e,79596d2..aa5881a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,26 -24,15 +24,26 @@@ fleet.jar: $(java_files) $(ship_files) 
          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 cmf manifest ../../$@ .
+       jar cmf build/class/manifest $@ ships -C build/class .
  
  
  ## Fpga ####################################################################################
  
 +# 32Gb ram, 4-core.     small-config:1019s  large-config:2530s
  host = intel2950-5.eecs.berkeley.edu
 -remote_ise = /tools/xilinx/ISE9.1i_lin
 -remote_edk = /tools/xilinx/EDK9.1i
 -remote_dir = /scratch/megacz/fleet/
 +
 +# 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
 +#host = amdr905-1.eecs.berkeley.edu
 +
 +remote_ise = /tools/xilinx/10.1/ISE
 +remote_edk = /tools/xilinx/10.1/EDK
 +
 +#remote_ise = /tools/xilinx/ISE9.1i_lin
 +#remote_edk = /tools/xilinx/EDK9.1i
 +
 +#remote_dir = /scratch/megacz/fleet/
 +#remote_dir = /vol/hitz/home/megacz/fleet/
 +remote_dir = /tmp/megacz/fleet/
  
  #host = mm2.millennium.berkeley.edu
  #remote_ise = /scratch/megacz/xilinx/ise/
@@@ -54,7 -43,7 +54,7 @@@
  xilinx =  cd build/fpga;
  xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
  xilinx += PATH=$$PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
 -xilinx += XST_VERSION=9.2i
 +#xilinx += XST_VERSION=9.2i
  xilinx += XILINX=$(remote_ise)
  xilinx += XIL_XST_HIDEMESSAGES=hdl_and_low_levels
  xilinx += XILINX_EDK=$(remote_edk)
@@@ -62,23 -51,9 +62,23 @@@
  xilinx_ise = $(xilinx) $(remote_ise)/bin/lin/
  xilinx_edk = $(xilinx) $(remote_edk)/bin/lin/
  
 -speed_grade = 11
 -device = xc4vfx60ff1152-${speed_grade}
 -#device = xc2vp70-7ff1704
 +# ML50X
 +speed_grade = 1
 +part = xc5vlx110t
 +package = ff1136
 +board = ml505   # ??
 +
 +# ML410
 +#part = xc4vfx60
 +#package = ff1152
 +#speed_grade = 11
 +#board = ml410
 +
 +# BEE2
 +#part = xc2vp70
 +#package = 7ff1704
 +
 +device = ${part}${package}-${speed_grade}
  
  upload: fleet.jar build/fpga/main.bit
        mkdir -p build
@@@ -98,12 -73,9 +98,12 @@@ build/fpga/main.bit: $(java_files) $(sh
        scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
  
  pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
 +#effort = std
 +effort = high
  synth:
        cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
        cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
 +      cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/greg/* .
        rm -f build/fpga/main.lso
        echo work                        >> build/fpga/main.lso
        rm -f build/fpga/main.prj
@@@ -123,7 -95,7 +123,7 @@@
        echo -n " -ifmt mixed" >> build/fpga/main.xst
        echo -n " -ofn main" >> build/fpga/main.xst
        echo -n " -ofmt NGC" >> build/fpga/main.xst
 -      echo -n " -p xc4vfx60-11ff1152" >> build/fpga/main.xst
 +      echo -n " -p ${device}" >> build/fpga/main.xst
        echo -n " -top main" >> build/fpga/main.xst
        echo -n " -opt_mode area" >> build/fpga/main.xst
        echo -n " -opt_level 2" >> build/fpga/main.xst
@@@ -195,14 -167,14 +195,14 @@@
        echo '-g Security:NONE' >> build/fpga/main.ut
        echo '-g Persist:No' >> build/fpga/main.ut
  
 -      $(xilinx_ise)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
 -      $(xilinx_ise)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
 -      $(xilinx_ise)map -cm area -intstyle xflow -p $(device) -pr b -ol high -o main_map.ncd main.ngd main.pcf
 -      $(xilinx_ise)par -w -intstyle xflow -t 99 -pl high -rl high main_map.ncd main.ncd main.pcf
 -      $(xilinx_ise)bitgen -intstyle xflow -f main.ut main.ncd
 -#     $(xilinx_ise)trce -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
 -      $(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ml410 -ace mainx.ace
 -      mv build/fpga/mainx.ace build/fpga/main.ace   # genace throws a fit if the filename prefix is the same?
 +      $(xilinx_ise)xst      -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
 +      $(xilinx_ise)ngdbuild -intstyle xflow -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
 +      $(xilinx_ise)map      -intstyle xflow -ol ${effort} -p $(device) -pr b -cm area -o main_map.ncd main.ngd main.pcf
 +      $(xilinx_ise)par      -intstyle xflow -ol ${effort} -w main_map.ncd main.ncd main.pcf
 +      $(xilinx_ise)bitgen   -intstyle xflow -f main.ut main.ncd
 +#     $(xilinx_ise)trce     -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
 +#     $(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
 +#     mv build/fpga/mainx.ace build/fpga/main.ace   # genace throws a fit if the filename prefix is the same?
  
  
  runserver: fleet.jar
@@@ -331,15 -303,15 +331,15 @@@ lib/suncvs.jar: fleet.jar suncvs/marin
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
  
 -#sun_server = frehley
 -sun_server = simmons
 +sun_server = frehley
 +#sun_server = simmons
  
  runtest: fleet.jar
        rm lib/suncvs.jar; make lib/suncvs.jar
        rm -f suncvs/marina/testSims/isolatedInDock.spi.run
        ssh ${sun_server} 'skill nanosim'
        rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
 -      ssh ${sun_server} 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; ln -s ../testCode/marina.xml ../testCode/marina.spi ../testCode/cfg .; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java  -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3018'
 +      ssh ${sun_server} 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; ln -s ../testCode/marina.xml ../testCode/marina.spi ../testCode/cfg .; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java  -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3021'
  
  electric:
        rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out

diff --combined src/edu/berkeley/fleet/assembler/Parser.java
index 36b7b56,dcd468f..3a1fdbd
--- 1/src/edu/berkeley/fleet/assembler/Parser.java
--- 2/src/edu/berkeley/fleet/assembler/Parser.java
+++ b/src/edu/berkeley/fleet/assembler/Parser.java
@@@ -29,7 -29,6 +29,7 @@@ public class Parser 
          SIGNAL_ONE.set(0,true);
      }
      
 +    /** WARNING: this class may change in the future; it is not a stable interface */
      public Parser(Fleet fleet) {
          expect = new ArrayList<Long>();
          this.fleet = fleet;
@@@ -218,7 -217,7 +218,7 @@@
          }
      }
  
-     String string(Tree<String> t) {
+     private static String string(Tree<String> t) {
          String ret = "";
          if (t.head() != null) ret += t.head();
          for(Tree<String> c : t)
@@@ -226,14 -225,14 +226,14 @@@
          return ret;
      }
  
-     String stringBody(Tree<String> t) {
+     private static String stringBody(Tree<String> t) {
          String ret = "";
          for(Tree<String> c : t)
              ret += string(c);
          return ret;
      }
  
-     String name(Tree<String> t) {
+     private static String name(Tree<String> t) {
          return string(t.child(0))+string(t.child(1));
      }