added working test case for send-without-destination

[fleet.git] / src / edu / berkeley / fleet / fpga / Fpga.java

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index 919ca3f..5d2fb55 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -183,7 +183,7 @@ public class Fpga extends Fleet {
                 System.out.print(" krunk"+(krunk++)+"(clk, ");
                 System.out.print("instruction_"+getUniqueName(port.getShip())+"_"+port.getName()+"_r, ");
                 System.out.print("instruction_"+getUniqueName(port.getShip())+"_"+port.getName()+"_a, ");
-                System.out.print("instruction_"+getUniqueName(port.getShip())+"_"+port.getName()+", ");
+                System.out.print("`packet_data(instruction_"+getUniqueName(port.getShip())+"_"+port.getName()+"), ");
                 System.out.print("dest_"+getUniqueName(port.getShip())+"_"+port.getName()+"_r, ");
                 System.out.print("dest_"+getUniqueName(port.getShip())+"_"+port.getName()+"_a, ");
                 System.out.print("dest_"+getUniqueName(port.getShip())+"_"+port.getName()+", ");
@@ -303,7 +303,7 @@ public class Fpga extends Fleet {
                 for(int i=0; i<indentamount; i++) indent += "  ";
                 if (decl) {
                     String n = describe(prefix).startsWith("instruction")
-                        ? "[(`INSTRUCTION_WIDTH-1):0]" : "[(`PACKET_WIDTH-1):0]";
+                        ? "[(`PACKET_WIDTH-1):0]" : "[(`PACKET_WIDTH-1):0]";
                     System.out.println("  wire "+n+" "+indent+describe(prefix)+";");
                 } else {
                     System.out.println("     "+indent+
@@ -332,7 +332,7 @@ public class Fpga extends Fleet {
                     for(int i=0; i<indentamount; i++) indent += "  ";
                     if (decl) {
                         String n = FabricTree.this.describe(prefix,o).startsWith("instruction")
-                            ? "[(`INSTRUCTION_WIDTH-1):0]" : "[(`PACKET_WIDTH-1):0]";
+                            ? "[(`PACKET_WIDTH-1):0]" : "[(`PACKET_WIDTH-1):0]";
                         System.out.println("  wire "+n+" "+indent+FabricTree.this.describe(prefix,o)+";");
                     }
                 }