move Verilog.java to edu.berkeley.fleet.fpga.verilog

diff --git a/src/edu/berkeley/fleet/fpga/FabricElement.java b/src/edu/berkeley/fleet/fpga/FabricElement.java
index 2893d20..5e0d7a3 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FabricElement.java
+++ b/src/edu/berkeley/fleet/fpga/FabricElement.java
@@ -10,7 +10,7 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 
 public interface FabricElement {

diff --git a/src/edu/berkeley/fleet/fpga/FifoModule.java b/src/edu/berkeley/fleet/fpga/FifoModule.java
index 0367c86..bb05228 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FifoModule.java
+++ b/src/edu/berkeley/fleet/fpga/FifoModule.java
@@ -10,7 +10,7 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 public class FifoModule extends Module {
     public FifoModule(int len) {

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index c409eb0..36f20b8 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -12,7 +12,7 @@ import java.util.*;
 import java.io.*;
 import edu.berkeley.fleet.two.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 
 public class Fpga extends Fleet {

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDestination.java b/src/edu/berkeley/fleet/fpga/FpgaDestination.java
index a57910c..976f0d7 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaDestination.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDestination.java
@@ -10,9 +10,8 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 import edu.berkeley.fleet.api.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
 import edu.berkeley.fleet.api.Dock;
 import java.util.*;
 

diff --git a/src/edu/berkeley/fleet/fpga/FpgaDock.java b/src/edu/berkeley/fleet/fpga/FpgaDock.java
index 259409d..33bfc9e 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaDock.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaDock.java
@@ -10,9 +10,8 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 import edu.berkeley.fleet.api.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
 import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.two.*;
 import java.util.*;

diff --git a/src/edu/berkeley/fleet/fpga/FpgaPath.java b/src/edu/berkeley/fleet/fpga/FpgaPath.java
index d265803..1007296 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaPath.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaPath.java
@@ -10,7 +10,7 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 
 public class FpgaPath extends Path {

diff --git a/src/edu/berkeley/fleet/fpga/FpgaShip.java b/src/edu/berkeley/fleet/fpga/FpgaShip.java
index d5f9595..53443f1 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FpgaShip.java
+++ b/src/edu/berkeley/fleet/fpga/FpgaShip.java
@@ -4,7 +4,7 @@ import java.util.*;
 import java.io.*;
 import edu.berkeley.fleet.two.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 /** a ship, which belongs to a fleet and which may have many ports */
 public class FpgaShip extends FleetTwoShip {

diff --git a/src/edu/berkeley/fleet/fpga/FunnelModule.java b/src/edu/berkeley/fleet/fpga/FunnelModule.java
index 4646cb7..3cc9256 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FunnelModule.java
+++ b/src/edu/berkeley/fleet/fpga/FunnelModule.java
@@ -10,7 +10,7 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 
 public class FunnelModule extends Module {

diff --git a/src/edu/berkeley/fleet/fpga/HornModule.java b/src/edu/berkeley/fleet/fpga/HornModule.java
index df380ed..c650a96 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/HornModule.java
+++ b/src/edu/berkeley/fleet/fpga/HornModule.java
@@ -10,7 +10,7 @@ import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
 import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
-import static edu.berkeley.fleet.verilog.Verilog.*;
+import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
 
 
 public class HornModule extends Module {

diff --git a/src/edu/berkeley/fleet/gasp/Verilog.java b/src/edu/berkeley/fleet/fpga/verilog/Verilog.java
similarity index 99%
rename from src/edu/berkeley/fleet/gasp/Verilog.java
rename to src/edu/berkeley/fleet/fpga/verilog/Verilog.java
index 073d2b0..604b68d 100644 (file)
--- a/src/edu/berkeley/fleet/gasp/Verilog.java
+++ b/src/edu/berkeley/fleet/fpga/verilog/Verilog.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.verilog;
+package edu.berkeley.fleet.fpga.verilog;
 import edu.berkeley.fleet.api.*;
 import edu.berkeley.fleet.ies44.*;
 import edu.berkeley.fleet.*;