From 8921166670f9c0b77101c6f232e7850c2cb72548 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 20 Aug 2007 08:29:41 +0100 Subject: [PATCH] rename slipway=>fpga --- src/edu/berkeley/fleet/Main.java | 2 +- src/edu/berkeley/fleet/assembler/Parser.java | 4 ++-- src/edu/berkeley/fleet/{slipway => fpga}/Client.java | 2 +- src/edu/berkeley/fleet/{slipway => fpga}/Generator.java | 3 +-- src/edu/berkeley/fleet/{slipway => fpga}/Server.java | 2 +- src/edu/berkeley/fleet/{slipway => fpga}/Slipway.java | 4 ++-- src/edu/berkeley/fleet/{slipway => fpga}/SlipwayBenkoBox.java | 2 +- src/edu/berkeley/fleet/{slipway => fpga}/SlipwayShip.java | 2 +- src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128.edn | 0 src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128.v | 0 .../async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc | 0 ...nc_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn | 0 src/edu/berkeley/fleet/{slipway => fpga}/bram.inc | 0 src/edu/berkeley/fleet/{slipway => fpga}/cache.inc | 0 src/edu/berkeley/fleet/{slipway => fpga}/cache_write.inc | 0 src/edu/berkeley/fleet/{slipway => fpga}/macros.v | 0 src/edu/berkeley/fleet/{slipway => fpga}/main.ucf | 0 src/edu/berkeley/fleet/{slipway => fpga}/main.ut | 0 src/edu/berkeley/fleet/{slipway => fpga}/main.v | 0 src/edu/berkeley/fleet/{slipway => fpga}/main.xst | 0 src/edu/berkeley/fleet/{slipway => fpga}/root.v | 0 src/edu/berkeley/fleet/{slipway => fpga}/user_fifo.v | 0 22 files changed, 10 insertions(+), 11 deletions(-) rename src/edu/berkeley/fleet/{slipway => fpga}/Client.java (98%) rename src/edu/berkeley/fleet/{slipway => fpga}/Generator.java (99%) rename src/edu/berkeley/fleet/{slipway => fpga}/Server.java (99%) rename src/edu/berkeley/fleet/{slipway => fpga}/Slipway.java (99%) rename src/edu/berkeley/fleet/{slipway => fpga}/SlipwayBenkoBox.java (99%) rename src/edu/berkeley/fleet/{slipway => fpga}/SlipwayShip.java (98%) rename src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128.edn (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128.v (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/bram.inc (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/cache.inc (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/cache_write.inc (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/macros.v (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/main.ucf (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/main.ut (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/main.v (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/main.xst (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/root.v (100%) rename src/edu/berkeley/fleet/{slipway => fpga}/user_fifo.v (100%) diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java index 6f35082..309012a 100644 --- a/src/edu/berkeley/fleet/Main.java +++ b/src/edu/berkeley/fleet/Main.java @@ -1,7 +1,7 @@ package edu.berkeley.fleet; import edu.berkeley.sbp.util.ANSI; import edu.berkeley.fleet.api.*; -import edu.berkeley.fleet.slipway.*; +import edu.berkeley.fleet.fpga.*; import edu.berkeley.fleet.doc.*; import edu.berkeley.fleet.interpreter.*; import java.io.*; diff --git a/src/edu/berkeley/fleet/assembler/Parser.java b/src/edu/berkeley/fleet/assembler/Parser.java index 0e714ad..eef0ca9 100644 --- a/src/edu/berkeley/fleet/assembler/Parser.java +++ b/src/edu/berkeley/fleet/assembler/Parser.java @@ -57,8 +57,8 @@ public class Parser { skip = false; baseCodeBag.add(new Instruction.Literal.CodeBagDescriptor(null, rootCodeBag.getFakeAddress(), 1)); walk((Tree)parse(r), rootCodeBag); - if (fleet instanceof edu.berkeley.fleet.slipway.Slipway) - ((edu.berkeley.fleet.slipway.Slipway)fleet).dumpFabric(true); + if (fleet instanceof edu.berkeley.fleet.fpga.Slipway) + ((edu.berkeley.fleet.fpga.Slipway)fleet).dumpFabric(true); // map from arbitrary identifiers to actual addresses int[] codeBagMap = new int[codeBags.size()]; diff --git a/src/edu/berkeley/fleet/slipway/Client.java b/src/edu/berkeley/fleet/fpga/Client.java similarity index 98% rename from src/edu/berkeley/fleet/slipway/Client.java rename to src/edu/berkeley/fleet/fpga/Client.java index 406be4c..a4257ee 100644 --- a/src/edu/berkeley/fleet/slipway/Client.java +++ b/src/edu/berkeley/fleet/fpga/Client.java @@ -1,4 +1,4 @@ -package edu.berkeley.fleet.slipway; +package edu.berkeley.fleet.fpga; import edu.berkeley.fleet.api.*; import java.io.*; diff --git a/src/edu/berkeley/fleet/slipway/Generator.java b/src/edu/berkeley/fleet/fpga/Generator.java similarity index 99% rename from src/edu/berkeley/fleet/slipway/Generator.java rename to src/edu/berkeley/fleet/fpga/Generator.java index 32e39c8..b9ffe54 100644 --- a/src/edu/berkeley/fleet/slipway/Generator.java +++ b/src/edu/berkeley/fleet/fpga/Generator.java @@ -1,6 +1,5 @@ // note: got rid of funnel "fairness" code -package edu.berkeley.fleet.slipway; -import edu.berkeley.fleet.slipway.*; +package edu.berkeley.fleet.fpga; import edu.berkeley.fleet.doc.*; import edu.berkeley.fleet.api.*; import edu.berkeley.fleet.ies44.*; diff --git a/src/edu/berkeley/fleet/slipway/Server.java b/src/edu/berkeley/fleet/fpga/Server.java similarity index 99% rename from src/edu/berkeley/fleet/slipway/Server.java rename to src/edu/berkeley/fleet/fpga/Server.java index c30b23c..417df5f 100644 --- a/src/edu/berkeley/fleet/slipway/Server.java +++ b/src/edu/berkeley/fleet/fpga/Server.java @@ -1,4 +1,4 @@ -package edu.berkeley.fleet.slipway; +package edu.berkeley.fleet.fpga; import java.io.*; import java.net.*; diff --git a/src/edu/berkeley/fleet/slipway/Slipway.java b/src/edu/berkeley/fleet/fpga/Slipway.java similarity index 99% rename from src/edu/berkeley/fleet/slipway/Slipway.java rename to src/edu/berkeley/fleet/fpga/Slipway.java index 8f3da87..1f8757c 100644 --- a/src/edu/berkeley/fleet/slipway/Slipway.java +++ b/src/edu/berkeley/fleet/fpga/Slipway.java @@ -1,5 +1,5 @@ -package edu.berkeley.fleet.slipway; -import edu.berkeley.fleet.slipway.*; +package edu.berkeley.fleet.fpga; +import edu.berkeley.fleet.fpga.*; import edu.berkeley.fleet.doc.*; import edu.berkeley.fleet.api.*; import edu.berkeley.fleet.ies44.*; diff --git a/src/edu/berkeley/fleet/slipway/SlipwayBenkoBox.java b/src/edu/berkeley/fleet/fpga/SlipwayBenkoBox.java similarity index 99% rename from src/edu/berkeley/fleet/slipway/SlipwayBenkoBox.java rename to src/edu/berkeley/fleet/fpga/SlipwayBenkoBox.java index a43a659..25d22f6 100644 --- a/src/edu/berkeley/fleet/slipway/SlipwayBenkoBox.java +++ b/src/edu/berkeley/fleet/fpga/SlipwayBenkoBox.java @@ -1,4 +1,4 @@ -package edu.berkeley.fleet.slipway; +package edu.berkeley.fleet.fpga; import edu.berkeley.fleet.api.*; import edu.berkeley.fleet.api.BenkoBox; import java.util.*; diff --git a/src/edu/berkeley/fleet/slipway/SlipwayShip.java b/src/edu/berkeley/fleet/fpga/SlipwayShip.java similarity index 98% rename from src/edu/berkeley/fleet/slipway/SlipwayShip.java rename to src/edu/berkeley/fleet/fpga/SlipwayShip.java index 22ad930..4379fa4 100644 --- a/src/edu/berkeley/fleet/slipway/SlipwayShip.java +++ b/src/edu/berkeley/fleet/fpga/SlipwayShip.java @@ -1,4 +1,4 @@ -package edu.berkeley.fleet.slipway; +package edu.berkeley.fleet.fpga; import edu.berkeley.fleet.doc.*; import edu.berkeley.fleet.api.*; import java.util.*; diff --git a/src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.edn b/src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.edn similarity index 100% rename from src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.edn rename to src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.edn diff --git a/src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.v b/src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.v similarity index 100% rename from src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.v rename to src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.v diff --git a/src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc b/src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc similarity index 100% rename from src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc rename to src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc diff --git a/src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn b/src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn similarity index 100% rename from src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn rename to src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn diff --git a/src/edu/berkeley/fleet/slipway/bram.inc b/src/edu/berkeley/fleet/fpga/bram.inc similarity index 100% rename from src/edu/berkeley/fleet/slipway/bram.inc rename to src/edu/berkeley/fleet/fpga/bram.inc diff --git a/src/edu/berkeley/fleet/slipway/cache.inc b/src/edu/berkeley/fleet/fpga/cache.inc similarity index 100% rename from src/edu/berkeley/fleet/slipway/cache.inc rename to src/edu/berkeley/fleet/fpga/cache.inc diff --git a/src/edu/berkeley/fleet/slipway/cache_write.inc b/src/edu/berkeley/fleet/fpga/cache_write.inc similarity index 100% rename from src/edu/berkeley/fleet/slipway/cache_write.inc rename to src/edu/berkeley/fleet/fpga/cache_write.inc diff --git a/src/edu/berkeley/fleet/slipway/macros.v b/src/edu/berkeley/fleet/fpga/macros.v similarity index 100% rename from src/edu/berkeley/fleet/slipway/macros.v rename to src/edu/berkeley/fleet/fpga/macros.v diff --git a/src/edu/berkeley/fleet/slipway/main.ucf b/src/edu/berkeley/fleet/fpga/main.ucf similarity index 100% rename from src/edu/berkeley/fleet/slipway/main.ucf rename to src/edu/berkeley/fleet/fpga/main.ucf diff --git a/src/edu/berkeley/fleet/slipway/main.ut b/src/edu/berkeley/fleet/fpga/main.ut similarity index 100% rename from src/edu/berkeley/fleet/slipway/main.ut rename to src/edu/berkeley/fleet/fpga/main.ut diff --git a/src/edu/berkeley/fleet/slipway/main.v b/src/edu/berkeley/fleet/fpga/main.v similarity index 100% rename from src/edu/berkeley/fleet/slipway/main.v rename to src/edu/berkeley/fleet/fpga/main.v diff --git a/src/edu/berkeley/fleet/slipway/main.xst b/src/edu/berkeley/fleet/fpga/main.xst similarity index 100% rename from src/edu/berkeley/fleet/slipway/main.xst rename to src/edu/berkeley/fleet/fpga/main.xst diff --git a/src/edu/berkeley/fleet/slipway/root.v b/src/edu/berkeley/fleet/fpga/root.v similarity index 100% rename from src/edu/berkeley/fleet/slipway/root.v rename to src/edu/berkeley/fleet/fpga/root.v diff --git a/src/edu/berkeley/fleet/slipway/user_fifo.v b/src/edu/berkeley/fleet/fpga/user_fifo.v similarity index 100% rename from src/edu/berkeley/fleet/slipway/user_fifo.v rename to src/edu/berkeley/fleet/fpga/user_fifo.v -- 1.7.10.4