projects
/
fleet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FpgaPath: actually return the Signal in getSignal()
[fleet.git]
/
src
/
edu
/
berkeley
/
fleet
/
fpga
/
FpgaPath.java
diff --git
a/src/edu/berkeley/fleet/fpga/FpgaPath.java
b/src/edu/berkeley/fleet/fpga/FpgaPath.java
index
1007296
..
2bc194a
100644
(file)
--- a/
src/edu/berkeley/fleet/fpga/FpgaPath.java
+++ b/
src/edu/berkeley/fleet/fpga/FpgaPath.java
@@
-1,19
+1,15
@@
package edu.berkeley.fleet.fpga;
import edu.berkeley.fleet.api.*;
package edu.berkeley.fleet.fpga;
import edu.berkeley.fleet.api.*;
-import edu.berkeley.fleet.ies44.*;
+import edu.berkeley.fleet.two.*;
import edu.berkeley.fleet.*;
import java.lang.reflect.*;
import edu.berkeley.fleet.*;
import java.lang.reflect.*;
-import edu.berkeley.sbp.chr.*;
-import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.meta.*;
-import edu.berkeley.sbp.util.*;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
-import static edu.berkeley.fleet.ies44.InstructionEncoder.*;
+import static edu.berkeley.fleet.two.FleetTwoFleet.*;
import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
import static edu.berkeley.fleet.fpga.verilog.Verilog.*;
-public class FpgaPath extends Path {
+public class FpgaPath extends FleetTwoPath {
private boolean[] path;
private FpgaDestination dest;
private boolean[] path;
private FpgaDestination dest;
@@
-28,6
+24,12
@@
public class FpgaPath extends Path {
this.dest = dest;
}
this.dest = dest;
}
+ public BitVector toBitVector() {
+ BitVector bv = new BitVector(((Fpga)dest.dock.getShip().getFleet()).PACKET_DEST.getWidth() +
+ ((Fpga)dest.dock.getShip().getFleet()).PACKET_SIGNAL.getWidth());
+ bv.set(toLong());
+ return bv;
+ }
public long toLong() {
long ret = 0;
for(int i=0; i<path.length; i++) {
public long toLong() {
long ret = 0;
for(int i=0; i<path.length; i++) {
@@
-75,6
+77,6
@@
public class FpgaPath extends Path {
return new FpgaPath(new boolean[0], dest, signal);
}
return new FpgaPath(new boolean[0], dest, signal);
}
- public BitVector getSignal() { return null; }
+ public BitVector getSignal() { return signal; }
}
}