v2x: Fix the multiple_instance test.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
diff --git a/tests/multiple_instance/golden.pb_type.xml b/tests/multiple_instance/golden.pb_type.xml
index 1796907..75334c1 100644
--- a/tests/multiple_instance/golden.pb_type.xml
+++ b/tests/multiple_instance/golden.pb_type.xml
@@ -1,166 +1,209 @@
 <?xml version='1.0' encoding='utf-8'?>
 <pb_type xmlns:xi="http://www.w3.org/2001/XInclude" name="MULTIPLE_INSTANCE" num_pb="1">
-  <input name="a" num_pins="4"/>
-  <input name="b" num_pins="4"/>
-  <input name="c" num_pins="4"/>
-  <input name="cin" num_pins="1"/>
-  <input name="d" num_pins="4"/>
-  <output name="cout" num_pins="1"/>
-  <output name="sum" num_pins="8"/>
-  <pb_type blif_model=".subckt adder" name="comba" num_pb="4">
-    <xi:include href="../fig41-full-adder/adder.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/>
-  </pb_type>
-  <pb_type blif_model=".subckt adder" name="combb" num_pb="4">
+  <input  name="a"    num_pins="4"/>
+  <!-- FIXME: Current hack to work around lack of carry -->
+  <output name="a2b"  num_pins="4"/>
+  <input  name="b"    num_pins="4"/>
+  <input  name="c"    num_pins="4"/>
+  <!-- FIXME: cin/cout should be marked as carry -->
+  <input  name="cin"  num_pins="4"/>
+  <output name="cout" num_pins="4"/>
+  <input  name="d"    num_pins="4"/>
+  <output name="sum"  num_pins="8"/>
+  <pb_type blif_model=".subckt ADDER" name="adder" num_pb="8">
     <xi:include href="../fig41-full-adder/adder.pb_type.xml" xpointer="xpointer(pb_type/child::node())"/>
   </pb_type>
   <interconnect>
+
+    <!-- 1st - a+b -> sum -->
     <direct>
-      <port name="a[3]" type="input"/>
-      <port from="comba[3]" name="a" type="output"/>
+      <port                 name="a[0]"   type="input"  />
+      <port from="adder[2]" name="a"      type="output" />
     </direct>
     <direct>
-      <port name="b[3]" type="input"/>
-      <port from="comba[3]" name="b" type="output"/>
+      <port                 name="b[0]"   type="input"  />
+      <port from="adder[2]" name="b"      type="output" />
     </direct>
     <direct>
-      <port name="cin" type="input"/>
-      <port from="comba[0]" name="cin" type="output"/>
+      <port from="adder[2]" name="sum"    type="input"  />
+      <port                 name="sum[0]" type="output" />
+    </direct>
+
+    <!-- 2nd - a+b -> sum -->
+    <direct>
+      <port                 name="a[1]"   type="input"  />
+      <port from="adder[4]" name="a"      type="output" />
     </direct>
     <direct>
-      <port name="cin" type="input"/>
-      <port from="comba[1]" name="cin" type="output"/>
+      <port                 name="b[1]"   type="input"  />
+      <port from="adder[4]" name="b"      type="output" />
     </direct>
     <direct>
-      <port name="cin" type="input"/>
-      <port from="comba[2]" name="cin" type="output"/>
+      <port from="adder[4]" name="sum"    type="input"  />
+      <port                 name="sum[1]" type="output" />
+    </direct>
+
+    <!-- 3rd - a+b -> sum -->
+    <direct>
+      <port                 name="a[2]"   type="input"/>
+      <port from="adder[6]" name="a"      type="output"/>
     </direct>
     <direct>
-      <port name="cin" type="input"/>
-      <port from="comba[3]" name="cin" type="output"/>
+      <port                 name="b[2]"   type="input"/>
+      <port from="adder[6]" name="b"      type="output"/>
     </direct>
     <direct>
-      <port from="comba[3]" name="sum" type="input"/>
-      <port name="sum[3]" type="output"/>
+      <port from="adder[6]" name="sum"    type="input"/>
+      <port                 name="sum[2]" type="output"/>
+    </direct>
+
+    <!-- 4th - a+b -> sum -->
+    <direct>
+      <port                 name="a[3]"   type="input"  />
+      <port from="adder[0]" name="a"      type="output" />
     </direct>
     <direct>
-      <port name="a[0]" type="input"/>
-      <port from="comba[0]" name="a" type="output"/>
+      <port                 name="b[3]"   type="input"  />
+      <port from="adder[0]" name="b"      type="output" />
     </direct>
     <direct>
-      <port name="b[0]" type="input"/>
-      <port from="comba[0]" name="b" type="output"/>
+      <port from="adder[0]" name="sum"    type="input"  />
+      <port                 name="sum[3]" type="output" />
+    </direct>
+
+    <!-- 1st - c+d -> sum -->
+    <direct>
+      <port                 name="c[0]"   type="input"/>
+      <port from="adder[3]" name="a"      type="output"/>
     </direct>
     <direct>
-      <port from="comba[0]" name="sum" type="input"/>
-      <port name="sum[0]" type="output"/>
+      <port                 name="d[0]"   type="input"/>
+      <port from="adder[3]" name="b"      type="output"/>
     </direct>
     <direct>
-      <port name="a[1]" type="input"/>
-      <port from="comba[1]" name="a" type="output"/>
+      <port from="adder[3]" name="sum"    type="input"/>
+      <port                 name="sum[4]" type="output"/>
+    </direct>
+
+    <!-- 2nd - c+d -> sum -->
+    <direct>
+      <port                 name="c[1]"   type="input"/>
+      <port from="adder[5]" name="a"      type="output"/>
     </direct>
     <direct>
-      <port name="b[1]" type="input"/>
-      <port from="comba[1]" name="b" type="output"/>
+      <port                 name="d[1]"   type="input"/>
+      <port from="adder[5]" name="b"      type="output"/>
     </direct>
     <direct>
-      <port from="comba[1]" name="sum" type="input"/>
-      <port name="sum[1]" type="output"/>
+      <port from="adder[5]" name="sum"    type="input"/>
+      <port                 name="sum[5]" type="output"/>
+    </direct>
+
+    <!-- 3rd - c+d -> sum -->
+    <direct>
+      <port                 name="c[2]"   type="input"/>
+      <port from="adder[7]" name="a"      type="output"/>
     </direct>
     <direct>
-      <port name="a[2]" type="input"/>
-      <port from="comba[2]" name="a" type="output"/>
+      <port                 name="d[2]"   type="input"/>
+      <port from="adder[7]" name="b"      type="output"/>
     </direct>
     <direct>
-      <port name="b[2]" type="input"/>
-      <port from="comba[2]" name="b" type="output"/>
+      <port from="adder[7]" name="sum"    type="input"/>
+      <port                 name="sum[6]" type="output"/>
+    </direct>
+
+    <!-- 4th - c+d -> sum -->
+    <direct>
+      <port                 name="c[3]"   type="input"/>
+      <port from="adder[1]" name="a"      type="output"/>
     </direct>
     <direct>
-      <port from="comba[2]" name="sum" type="input"/>
-      <port name="sum[2]" type="output"/>
+      <port                 name="d[3]"   type="input"/>
+      <port from="adder[1]" name="b"      type="output"/>
     </direct>
     <direct>
-      <port name="c[0]" type="input"/>
-      <port from="combb[0]" name="a" type="output"/>
+      <port from="adder[1]" name="sum"    type="input"/>
+      <port                 name="sum[7]" type="output"/>
+    </direct>
+
+    <!-- Carry chains -->
+
+    <!-- FIXME: Hack until carries work -->
+    <direct>
+      <port from="adder[2]" name="cout"   type="input"  />
+      <port                 name="a2b[0]" type="output" />
     </direct>
     <direct>
-      <port name="d[0]" type="input"/>
-      <port from="combb[0]" name="b" type="output"/>
+      <port from="adder[4]" name="cout"   type="input"  />
+      <port                 name="a2b[1]" type="output" />
     </direct>
     <direct>
-      <port from="comba[0]" name="cout" type="input"/>
-      <port from="combb[0]" name="cin" type="output"/>
-      <pack_pattern name="ADDER" type="carry">
-        <port from="comba[0]" name="cout" type="input"/>
-        <port from="combb[0]" name="cin" type="output"/>
-      </pack_pattern>
+      <port from="adder[6]" name="cout"   type="input"  />
+      <port                 name="a2b[2]" type="output" />
     </direct>
     <direct>
-      <port from="combb[0]" name="sum" type="input"/>
-      <port name="sum[4]" type="output"/>
+      <port from="adder[0]" name="cout"    type="input"  />
+      <port                 name="a2b[3]"  type="output" />
+    </direct>
+
+
+    <!-- cin -> 1st a+b -> 1st c+d -> cout -->
+    <direct>
+      <port                 name="cin[0]"  type="input"  />
+      <port from="adder[2]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port name="c[1]" type="input"/>
-      <port from="combb[1]" name="a" type="output"/>
+      <port from="adder[2]" name="cout"    type="input"  />
+      <port from="adder[3]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port name="d[1]" type="input"/>
-      <port from="combb[1]" name="b" type="output"/>
+      <port from="adder[3]" name="cout"    type="input"  />
+      <port                 name="cout[0]" type="output" />
+    </direct>
+
+    <!-- cin -> 2nd a+b -> 2nd c+d -> cout -->
+    <direct>
+      <port                 name="cin[1]"  type="input"  />
+      <port from="adder[4]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port from="comba[1]" name="cout" type="input"/>
-      <port from="combb[1]" name="cin" type="output"/>
-      <pack_pattern name="ADDER" type="carry">
-        <port from="comba[1]" name="cout" type="input"/>
-        <port from="combb[1]" name="cin" type="output"/>
-      </pack_pattern>
+      <port from="adder[4]" name="cout"    type="input"  />
+      <port from="adder[5]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port from="combb[1]" name="sum" type="input"/>
-      <port name="sum[5]" type="output"/>
+      <port from="adder[5]" name="cout"    type="input"  />
+      <port                 name="cout[1]" type="output" />
+    </direct>
+
+    <!-- cin -> 3rd a+b -> 3rd c+d -> cout -->
+    <direct>
+      <port                 name="cin[2]"  type="input"  />
+      <port from="adder[6]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port name="c[2]" type="input"/>
-      <port from="combb[2]" name="a" type="output"/>
+      <port from="adder[6]" name="cout"    type="input"  />
+      <port from="adder[7]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port name="d[2]" type="input"/>
-      <port from="combb[2]" name="b" type="output"/>
+      <port from="adder[7]" name="cout"    type="input"  />
+      <port                 name="cout[2]" type="output" />
+    </direct>
+
+    <!-- cin -> 4th a+b -> 4th c+d -> cout -->
+    <direct>
+      <port                 name="cin[3]"  type="input"  />
+      <port from="adder[0]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port from="comba[2]" name="cout" type="input"/>
-      <port from="combb[2]" name="cin" type="output"/>
-      <pack_pattern name="ADDER" type="carry">
-        <port from="comba[2]" name="cout" type="input"/>
-        <port from="combb[2]" name="cin" type="output"/>
-      </pack_pattern>
+      <port from="adder[0]" name="cout"    type="input"  />
+      <port from="adder[1]" name="cin"     type="output" />
     </direct>
     <direct>
-      <port from="combb[2]" name="sum" type="input"/>
-      <port name="sum[6]" type="output"/>
+      <port from="adder[1]" name="cout"    type="input"  />
+      <port                 name="cout[3]" type="output" />
     </direct>
-    <direct>
-      <port name="c[3]" type="input"/>
-      <port from="combb[3]" name="a" type="output"/>
-    </direct>
-    <direct>
-      <port name="d[3]" type="input"/>
-      <port from="combb[3]" name="b" type="output"/>
-    </direct>
-    <direct>
-      <port from="comba[3]" name="cout" type="input"/>
-      <port from="combb[3]" name="cin" type="output"/>
-      <pack_pattern name="ADDER" type="carry">
-        <port from="comba[3]" name="cout" type="input"/>
-        <port from="combb[3]" name="cin" type="output"/>
-      </pack_pattern>
-    </direct>
-    <direct>
-      <port from="combb[3]" name="cout" type="input"/>
-      <port name="cout" type="output"/>
-    </direct>
-    <direct>
-      <port from="combb[3]" name="sum" type="input"/>
-      <port name="sum[7]" type="output"/>
-    </direct>
+
+
   </interconnect>
 </pb_type>
diff --git a/tests/multiple_instance/multiple_instance.sim.v b/tests/multiple_instance/multiple_instance.sim.v
index a30de12..12fdeda 100644
--- a/tests/multiple_instance/multiple_instance.sim.v
+++ b/tests/multiple_instance/multiple_instance.sim.v
@@ -1,29 +1,33 @@
 `include "../fig41-full-adder/adder.sim.v"
-module MULTIPLE_INSTANCE (a, b, c, d, cin, cout, sum);
+module MULTIPLE_INSTANCE (a, b, c, d, cin, cout, sum, a2b);
 	localparam DATA_WIDTH = 4;
 
-	input wire [DATA_WIDTH-1:0] a;
-	input wire [DATA_WIDTH-1:0] b;
-	input wire [DATA_WIDTH-1:0] c;
-	input wire [DATA_WIDTH-1:0] d;
-	input wire cin;
-	output wire cout;
+	input  wire [DATA_WIDTH-1:0] a;
+	input  wire [DATA_WIDTH-1:0] b;
+	input  wire [DATA_WIDTH-1:0] c;
+	input  wire [DATA_WIDTH-1:0] d;
 	output wire [DATA_WIDTH*2-1:0] sum;
 
-	wire [DATA_WIDTH-1:0] a2b;
+	input  wire [DATA_WIDTH-1:0] cin;
+	output wire [DATA_WIDTH-1:0] cout;
+
+	/* FIXME: Once carry works make this an internal only wire */
+	output wire [DATA_WIDTH-1:0] a2b;
 
 	genvar i;
+	/* n = 0..DATA_WIDTH
+	 *
+	 *       cin[n]
+	 *        ↓
+	 *   a[n] + b[n] → sum[n]
+	 *        ↓
+	 *   c[n] + d[n] → sum[4+n]
+	 *        ↓
+	 *      cout[n]
+	 */
 	for(i=0; i<DATA_WIDTH; i=i+1) begin
-		ADDER comba (.a(a[i]), .b(b[i]), .cin(cin), .cout(a2b[i]), .sum(sum[i]));
-	end
-
-	genvar j;
-	for(j=0; j<DATA_WIDTH; j=j+1) begin
-		if ( j < DATA_WIDTH-1 ) begin
-			ADDER combb (.a(c[j]), .b(d[j]), .cin(a2b[j]), .sum(sum[DATA_WIDTH+j]));
-		end else begin
-			ADDER combb (.a(c[j]), .b(d[j]), .cin(a2b[j]), .cout(cout), .sum(sum[DATA_WIDTH+j]));
-		end
+		ADDER comb_apb (.a(a[i]), .b(b[i]), .cin(cin[i]), .cout(a2b[i]),  .sum(sum[i]));
+		ADDER comb_cpd (.a(c[i]), .b(d[i]), .cin(a2b[i]), .cout(cout[i]), .sum(sum[DATA_WIDTH+i]));
 	end
 
 endmodule