Add Tuple5

Author: VonTum

std/util.sus

@@ -259,60 +259,86 @@ module RotateRight#(T, int ARRAY_LEN) {
 
 /// Temporary module for creating and deconstructing tuples, until we have structs
 module Tuple2 #(T1, T2) {
-    gen int SIZE1 = sizeof#(T: type T1)
-    gen int SIZE2 = sizeof#(T: type T2)
+    gen int TO1 = sizeof#(T: type T1)
+    gen int TO2 = TO1 + sizeof#(T: type T2)
     domain clk
 
     domain pack_dom
-    interface pack : T1 v1_i'0, T2 v2_i'0 -> bool[SIZE1 + SIZE2] packed_o'0
-    packed_o[:SIZE1] = ToBits(v1_i)
-    packed_o[SIZE1:] = ToBits(v2_i)
+    interface pack : T1 v1_i'0, T2 v2_i'0 -> bool[TO2] packed_o'0
+    packed_o[:TO1] = ToBits(v1_i)
+    packed_o[TO1:] = ToBits(v2_i)
 
     domain unpack_dom
-    interface unpack : bool[SIZE1 + SIZE2] packed_i'0 -> T1 v1_o'0, T2 v2_o'0
-    v1_o = FromBits(packed_i[:SIZE1])
-    v2_o = FromBits(packed_i[SIZE1:])
+    interface unpack : bool[TO2] packed_i'0 -> T1 v1_o'0, T2 v2_o'0
+    v1_o = FromBits(packed_i[:TO1])
+    v2_o = FromBits(packed_i[TO1:])
 }
 
 /// Temporary module for creating and deconstructing tuples, until we have structs
 module Tuple3 #(T1, T2, T3) {
-    gen int SIZE1 = sizeof#(T: type T1)
-    gen int SIZE2 = sizeof#(T: type T2)
-    gen int SIZE3 = sizeof#(T: type T3)
+    gen int TO1 = sizeof#(T: type T1)
+    gen int TO2 = TO1 + sizeof#(T: type T2)
+    gen int TO3 = TO2 + sizeof#(T: type T3)
     domain clk
 
     domain pack_dom
-    interface pack : T1 v1_i'0, T2 v2_i'0, T3 v3_i'0 -> bool[SIZE1 + SIZE2 + SIZE3] packed_o'0
-    packed_o[:SIZE1] = ToBits(v1_i)
-    packed_o[SIZE1:SIZE1+SIZE2] = ToBits(v2_i)
-    packed_o[SIZE1+SIZE2:] = ToBits(v3_i)
+    interface pack : T1 v1_i'0, T2 v2_i'0, T3 v3_i'0 -> bool[TO3] packed_o'0
+    packed_o[:TO1] = ToBits(v1_i)
+    packed_o[TO1:TO2] = ToBits(v2_i)
+    packed_o[TO2:] = ToBits(v3_i)
 
     domain unpack_dom
-    interface unpack : bool[SIZE1 + SIZE2 + SIZE3] packed_i'0 -> T1 v1_o'0, T2 v2_o'0, T3 v3_o'0
-    v1_o = FromBits(packed_i[:SIZE1])
-    v2_o = FromBits(packed_i[SIZE1:SIZE1+SIZE2])
-    v3_o = FromBits(packed_i[SIZE1+SIZE2:])
+    interface unpack : bool[TO3] packed_i'0 -> T1 v1_o'0, T2 v2_o'0, T3 v3_o'0
+    v1_o = FromBits(packed_i[:TO1])
+    v2_o = FromBits(packed_i[TO1:TO2])
+    v3_o = FromBits(packed_i[TO2:])
 }
 
 /// Temporary module for creating and deconstructing tuples, until we have structs
 module Tuple4 #(T1, T2, T3, T4) {
-    gen int SIZE1 = sizeof#(T: type T1)
-    gen int SIZE2 = sizeof#(T: type T2)
-    gen int SIZE3 = sizeof#(T: type T3)
-    gen int SIZE4 = sizeof#(T: type T4)
+    gen int TO1 = sizeof#(T: type T1)
+    gen int TO2 = TO1 + sizeof#(T: type T2)
+    gen int TO3 = TO2 + sizeof#(T: type T3)
+    gen int TO4 = TO3 + sizeof#(T: type T4)
     domain clk
 
     domain pack_dom
-    interface pack : T1 v1_i'0, T2 v2_i'0, T3 v3_i'0, T4 v4_i'0 -> bool[SIZE1 + SIZE2 + SIZE3 + SIZE4] packed_o'0
-    packed_o[:SIZE1] = ToBits(v1_i)
-    packed_o[SIZE1:SIZE1+SIZE2] = ToBits(v2_i)
-    packed_o[SIZE1+SIZE2:SIZE1+SIZE2+SIZE3] = ToBits(v3_i)
-    packed_o[SIZE1+SIZE2+SIZE3:] = ToBits(v4_i)
+    interface pack : T1 v1_i'0, T2 v2_i'0, T3 v3_i'0, T4 v4_i'0 -> bool[TO4] packed_o'0
+    packed_o[:TO1] = ToBits(v1_i)
+    packed_o[TO1:TO2] = ToBits(v2_i)
+    packed_o[TO2:TO3] = ToBits(v3_i)
+    packed_o[TO3:] = ToBits(v4_i)
 
     domain unpack_dom
-    interface unpack : bool[SIZE1 + SIZE2 + SIZE3 + SIZE4] packed_i'0 -> T1 v1_o'0, T2 v2_o'0, T3 v3_o'0, T4 v4_o'0
-    v1_o = FromBits(packed_i[:SIZE1])
-    v2_o = FromBits(packed_i[SIZE1:SIZE1+SIZE2])
-    v3_o = FromBits(packed_i[SIZE1+SIZE2:SIZE1+SIZE2+SIZE3])
-    v4_o = FromBits(packed_i[SIZE1+SIZE2+SIZE3:])
+    interface unpack : bool[TO4] packed_i'0 -> T1 v1_o'0, T2 v2_o'0, T3 v3_o'0, T4 v4_o'0
+    v1_o = FromBits(packed_i[:TO1])
+    v2_o = FromBits(packed_i[TO1:TO2])
+    v3_o = FromBits(packed_i[TO2:TO3])
+    v4_o = FromBits(packed_i[TO3:])
+}
+
+/// Temporary module for creating and deconstructing tuples, until we have structs
+module Tuple5 #(T1, T2, T3, T4, T5) {
+    gen int TO1 = sizeof#(T: type T1)
+    gen int TO2 = TO1 + sizeof#(T: type T2)
+    gen int TO3 = TO2 + sizeof#(T: type T3)
+    gen int TO4 = TO3 + sizeof#(T: type T4)
+    gen int TO5 = TO4 + sizeof#(T: type T5)
+    domain clk
+
+    domain pack_dom
+    interface pack : T1 v1_i'0, T2 v2_i'0, T3 v3_i'0, T4 v4_i'0, T5 v5_i'0 -> bool[TO5] packed_o'0
+    packed_o[:TO1] = ToBits(v1_i)
+    packed_o[TO1:TO2] = ToBits(v2_i)
+    packed_o[TO2:TO3] = ToBits(v3_i)
+    packed_o[TO3:TO4] = ToBits(v4_i)
+    packed_o[TO4:] = ToBits(v5_i)
+
+    domain unpack_dom
+    interface unpack : bool[TO4] packed_i'0 -> T1 v1_o'0, T2 v2_o'0, T3 v3_o'0, T4 v4_o'0, T5 v5_o'0
+    v1_o = FromBits(packed_i[:TO1])
+    v2_o = FromBits(packed_i[TO1:TO2])
+    v3_o = FromBits(packed_i[TO2:TO3])
+    v4_o = FromBits(packed_i[TO3:TO4])
+    v5_o = FromBits(packed_i[TO4:])
 }