Merge 340836f into 7655fb6

magma/array.py

@@ -93,7 +93,7 @@ def __init__(self, *largs, **kwargs):
             for t in largs:
                 if isinstance(t, IntegerTypes):
                     t = VCC if t else GND
-                assert type(t) == self.T, (type(t), self.T)
+                assert isinstance(type(t), type(self.T)), (type(t), self.T)
                 self.ts.append(t)
         elif len(largs) == 1 and isinstance(largs[0], int):
             self.ts = []

magma/conversions.py

@@ -13,6 +13,7 @@
 from .tuple import TupleType, tuple_ as tuple_imported, TupleKind, namedtuple
 from .bitutils import int2seq
 import magma as m
+import hwtypes
 
 __all__ = ['bit']
 __all__ += ['clock', 'reset', 'enable', 'asyncreset']
@@ -180,7 +181,12 @@ def bfloat(value, n=None):
 
 
 def concat(*arrays):
-    ts = [t for a in arrays for t in a.ts]  # flatten
+    ts = []
+    for a in arrays:
+        if isinstance(a, hwtypes.BitVector):
+            ts.extend(a.bits())
+        else:
+            ts.extend(a.ts)
     return array(ts)
 
 

magma/syntax/sequential.py

@@ -40,8 +40,13 @@ def visit_Call(self, node):
             self.calls_seen.extend(ret)
             func = astor.to_source(node.func).rstrip()
             outputs = self.initial_value_map[attr][3].interface.outputs()
-            assert len(outputs) == 1, f"Expected one output: {outputs}"
-            return ast.Name(f"self_{attr}_{outputs[0]}", ast.Load())
+            if len(outputs) == 1:
+                return ast.Name(f"self_{attr}_{outputs[0]}", ast.Load())
+            else:
+                assert outputs, "Expected module with at least one output"
+                return ast.Tuple([ast.Name(f"self_{attr}_{output}",
+                                           ast.Load()) for output in outputs],
+                                 ast.Load())
         return node
 
     def visit_If(self, node):