rename com.sun.vlsi.chips.marina.test -> edu.berkeley.fleet.marina

diff --git a/Makefile b/Makefile
index ce205fb..6307b0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -484,7 +484,7 @@ endif
 urjtag: fleet.jar chips/marina/testCode/marina.xml
        ${rsync} --delete ./ root@goliath:fleet/
        ${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar
-       ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina com.sun.vlsi.chips.marina.test.MarinaTest -silicon -testNum 0'
+       ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=edu.berkeley.fleet.marina.Marina edu.berkeley.fleet.marina.MarinaTest -silicon -testNum 0'
 
 testlocal: fleet.jar
        cd chips/marina/testCode; \
@@ -492,8 +492,8 @@ testlocal: fleet.jar
          java \
          -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \
-         -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
-         com.sun.vlsi.chips.marina.test.MarinaTest \
+         -Dfleet.impl=edu.berkeley.fleet.marina.Marina \
+         edu.berkeley.fleet.marina.MarinaTest \
          ${testarg} \
          -testNum ${testnum} || tail -n 20 marina.spi.run
 

diff --git a/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java b/src/edu/berkeley/fleet/marina/BitVectorGenerators.java
similarity index 99%
rename from src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java
rename to src/edu/berkeley/fleet/marina/BitVectorGenerators.java
index 040b773..db26fd7 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java
+++ b/src/edu/berkeley/fleet/marina/BitVectorGenerators.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
@@ -305,4 +305,4 @@ public class BitVectorGenerators {
 
     }
 
-}
\ No newline at end of file
+}

diff --git a/src/com/sun/vlsi/chips/marina/test/ChainControls.java b/src/edu/berkeley/fleet/marina/ChainControls.java
similarity index 98%
rename from src/com/sun/vlsi/chips/marina/test/ChainControls.java
rename to src/edu/berkeley/fleet/marina/ChainControls.java
index dc784ad..6c5ea2d 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/ChainControls.java
+++ b/src/edu/berkeley/fleet/marina/ChainControls.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/com/sun/vlsi/chips/marina/test/CmdArgs.java b/src/edu/berkeley/fleet/marina/CmdArgs.java
similarity index 99%
rename from src/com/sun/vlsi/chips/marina/test/CmdArgs.java
rename to src/edu/berkeley/fleet/marina/CmdArgs.java
index a79a275..873abfc 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/CmdArgs.java
+++ b/src/edu/berkeley/fleet/marina/CmdArgs.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;

diff --git a/src/com/sun/vlsi/chips/marina/test/Counter.java b/src/edu/berkeley/fleet/marina/Counter.java
similarity index 95%
rename from src/com/sun/vlsi/chips/marina/test/Counter.java
rename to src/edu/berkeley/fleet/marina/Counter.java
index 029e4ee..9a0fc87 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Counter.java
+++ b/src/edu/berkeley/fleet/marina/Counter.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 
 

diff --git a/src/com/sun/vlsi/chips/marina/test/Design.java b/src/edu/berkeley/fleet/marina/Design.java
similarity index 75%
rename from src/com/sun/vlsi/chips/marina/test/Design.java
rename to src/edu/berkeley/fleet/marina/Design.java
index 3fe9cf5..e49d954 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Design.java
+++ b/src/edu/berkeley/fleet/marina/Design.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 
 import com.sun.electric.tool.simulation.test.*;
 

diff --git a/src/com/sun/vlsi/chips/marina/test/Indenter.java b/src/edu/berkeley/fleet/marina/Indenter.java
similarity index 96%
rename from src/com/sun/vlsi/chips/marina/test/Indenter.java
rename to src/edu/berkeley/fleet/marina/Indenter.java
index eea831e..92d6292 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Indenter.java
+++ b/src/edu/berkeley/fleet/marina/Indenter.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 
 public class Indenter {
     private static char NL = '\n';

diff --git a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/src/edu/berkeley/fleet/marina/InstructionStopper.java
similarity index 92%
rename from src/com/sun/vlsi/chips/marina/test/InstructionStopper.java
rename to src/edu/berkeley/fleet/marina/InstructionStopper.java
index 60d51cf..ca65a44 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java
+++ b/src/edu/berkeley/fleet/marina/InstructionStopper.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@ import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.api.Instruction;
 import edu.berkeley.fleet.marina.MarinaFleet;
 
-import static com.sun.vlsi.chips.marina.test.Marina.INSTRUCTION_LENGTH;
+import static edu.berkeley.fleet.marina.Marina.INSTRUCTION_LENGTH;
 
 /**
  * InstructionStopper is a scaffold that lets us create a 36 bit propperStopper

diff --git a/src/com/sun/vlsi/chips/marina/test/Marina.java b/src/edu/berkeley/fleet/marina/Marina.java
similarity index 99%
rename from src/com/sun/vlsi/chips/marina/test/Marina.java
rename to src/edu/berkeley/fleet/marina/Marina.java
index 12dee06..9ef38ac 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Marina.java
+++ b/src/edu/berkeley/fleet/marina/Marina.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 /* -*- tab-width: 4 -*- */
 import com.sun.electric.tool.simulation.test.*;
 

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java b/src/edu/berkeley/fleet/marina/MarinaPacket.java
similarity index 98%
rename from src/com/sun/vlsi/chips/marina/test/MarinaPacket.java
rename to src/edu/berkeley/fleet/marina/MarinaPacket.java
index 90f108e..503950c 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java
+++ b/src/edu/berkeley/fleet/marina/MarinaPacket.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 /* -*- tab-width: 4 -*- */
 import com.sun.electric.tool.simulation.test.*;
 import edu.berkeley.fleet.api.Dock;
@@ -89,4 +89,4 @@ public class MarinaPacket {
              ? (data.get(19,18).bitReverse().getState()+"_"+data.get(0,18).bitReverse().getState())
              : data.bitReverse().getState());
     }
-}
\ No newline at end of file
+}

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java b/src/edu/berkeley/fleet/marina/MarinaTest.java
similarity index 99%
rename from src/com/sun/vlsi/chips/marina/test/MarinaTest.java
rename to src/edu/berkeley/fleet/marina/MarinaTest.java
index 98044b2..cfca42c 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/src/edu/berkeley/fleet/marina/MarinaTest.java
@@ -1,12 +1,12 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 /* -*- tab-width: 4 -*- */
 import java.util.ArrayList;
 import java.util.List;
 
 import com.sun.electric.tool.simulation.test.*;
-import com.sun.vlsi.chips.marina.test.Marina.Ilc;
-import com.sun.vlsi.chips.marina.test.CmdArgs;
-import com.sun.vlsi.chips.marina.test.CmdArgs.Mode;
+import edu.berkeley.fleet.marina.Marina.Ilc;
+import edu.berkeley.fleet.marina.CmdArgs;
+import edu.berkeley.fleet.marina.CmdArgs.Mode;
 
 import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.api.Instruction;

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java b/src/edu/berkeley/fleet/marina/MarinaUtils.java
similarity index 98%
rename from src/com/sun/vlsi/chips/marina/test/MarinaUtils.java
rename to src/edu/berkeley/fleet/marina/MarinaUtils.java
index 8a8ca2b..8ef8d05 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java
+++ b/src/edu/berkeley/fleet/marina/MarinaUtils.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
@@ -63,4 +63,4 @@ public class MarinaUtils {
         if (bv.getNumBits()!=expected)
             throw new RuntimeException("expected BitVector of length " + expected + ", but got " + bv.getNumBits() +" in " + bv);
     }
-}
\ No newline at end of file
+}

diff --git a/src/com/sun/vlsi/chips/marina/test/MergeExperiment.java b/src/edu/berkeley/fleet/marina/MergeExperiment.java
similarity index 97%
rename from src/com/sun/vlsi/chips/marina/test/MergeExperiment.java
rename to src/edu/berkeley/fleet/marina/MergeExperiment.java
index 2b70406..c41de62 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MergeExperiment.java
+++ b/src/edu/berkeley/fleet/marina/MergeExperiment.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 import edu.berkeley.fleet.api.Instruction;
 import edu.berkeley.fleet.marina.MarinaPath;

diff --git a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java b/src/edu/berkeley/fleet/marina/ProperStopper.java
similarity index 99%
rename from src/com/sun/vlsi/chips/marina/test/ProperStopper.java
rename to src/edu/berkeley/fleet/marina/ProperStopper.java
index 7b089a9..7c78fd5 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
+++ b/src/edu/berkeley/fleet/marina/ProperStopper.java
@@ -1,8 +1,8 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 import java.util.ArrayList;
 import java.util.List;
-import com.sun.vlsi.chips.marina.test.MarinaUtils.StateWireState;
+import edu.berkeley.fleet.marina.MarinaUtils.StateWireState;
 
 public class ProperStopper {
     // position of strobes in the control chain

diff --git a/src/com/sun/vlsi/chips/marina/test/Station.java b/src/edu/berkeley/fleet/marina/Station.java
similarity index 95%
rename from src/com/sun/vlsi/chips/marina/test/Station.java
rename to src/edu/berkeley/fleet/marina/Station.java
index 112c33c..0d64fe9 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Station.java
+++ b/src/edu/berkeley/fleet/marina/Station.java
@@ -1,4 +1,4 @@
-package com.sun.vlsi.chips.marina.test;
+package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;