projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
854891e
)
rename slipway=>fpga
author
adam
<adam@megacz.com>
Mon, 20 Aug 2007 07:29:41 +0000
(08:29 +0100)
committer
adam
<adam@megacz.com>
Mon, 20 Aug 2007 07:29:41 +0000
(08:29 +0100)
22 files changed:
src/edu/berkeley/fleet/Main.java
patch
|
blob
|
history
src/edu/berkeley/fleet/assembler/Parser.java
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/Client.java
[moved from
src/edu/berkeley/fleet/slipway/Client.java
with 98% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/Generator.java
[moved from
src/edu/berkeley/fleet/slipway/Generator.java
with 99% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/Server.java
[moved from
src/edu/berkeley/fleet/slipway/Server.java
with 99% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/Slipway.java
[moved from
src/edu/berkeley/fleet/slipway/Slipway.java
with 99% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/SlipwayBenkoBox.java
[moved from
src/edu/berkeley/fleet/slipway/SlipwayBenkoBox.java
with 99% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/SlipwayShip.java
[moved from
src/edu/berkeley/fleet/slipway/SlipwayShip.java
with 98% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.edn
[moved from
src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.edn
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/async_fifo_8_8_128.v
[moved from
src/edu/berkeley/fleet/slipway/async_fifo_8_8_128.v
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc
[moved from
src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1.ngc
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn
[moved from
src/edu/berkeley/fleet/slipway/async_fifo_8_8_128_fifo_generator_v2_2_xst_1_blkmemdp_v6_2_xst.edn
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/bram.inc
[moved from
src/edu/berkeley/fleet/slipway/bram.inc
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/cache.inc
[moved from
src/edu/berkeley/fleet/slipway/cache.inc
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/cache_write.inc
[moved from
src/edu/berkeley/fleet/slipway/cache_write.inc
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/macros.v
[moved from
src/edu/berkeley/fleet/slipway/macros.v
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/main.ucf
[moved from
src/edu/berkeley/fleet/slipway/main.ucf
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/main.ut
[moved from
src/edu/berkeley/fleet/slipway/main.ut
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/main.v
[moved from
src/edu/berkeley/fleet/slipway/main.v
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/main.xst
[moved from
src/edu/berkeley/fleet/slipway/main.xst
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/root.v
[moved from
src/edu/berkeley/fleet/slipway/root.v
with 100% similarity]
patch
|
blob
|
history
src/edu/berkeley/fleet/fpga/user_fifo.v
[moved from
src/edu/berkeley/fleet/slipway/user_fifo.v
with 100% similarity]
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/Main.java
b/src/edu/berkeley/fleet/Main.java
index
6f35082
..
309012a
100644
(file)
--- 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.*;
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.*;
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
(file)
--- 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<String>)parse(r), rootCodeBag);
skip = false;
baseCodeBag.add(new Instruction.Literal.CodeBagDescriptor(null, rootCodeBag.getFakeAddress(), 1));
walk((Tree<String>)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()];
// 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
(file)
--- 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.*;
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
(file)
--- 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
// 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.*;
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
(file)
--- 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.*;
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
(file)
--- 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.*;
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
(file)
--- 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.*;
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
(file)
--- 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.*;
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