merge

3 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/stanza.zip b/src/lib/stanza.zip
index 5fd5ff6d..aed19c22 100644
--- a/src/lib/stanza.zip
+++ b/src/lib/stanza.zip
diff --git a/src/main/stanza/errors.stanza b/src/main/stanza/errors.stanza
index 3e1d2cb4..b0dbca68 100644
--- a/src/main/stanza/errors.stanza
+++ b/src/main/stanza/errors.stanza
@@ -149,6 +149,7 @@ defn is-prefix? (s1:Symbol,s2:Symbol) -> True|False :
 ; * A module has the same name as main of circuit
 ; * mems cannot be a bundle with flips
 ; o instance module must be a reference with same name as defined module
+; o reset must be UInt<1>
 
 public defn check-high-form (c:Circuit) -> Circuit : 
    val errors = Vector<HighFormException>()
diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index e3e22f56..b5c3b22c 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -772,7 +772,14 @@ defn lower (body:Stmt) -> Stmt :
          (s:DefRegister) : Begin{_} $
             for x in generate-entry(name(s),type(s)) map :
                DefRegister(name(x),type(x))
-         (s:DefInstance) : s
+         (s:DefInstance) : 
+            val fields = 
+               for f in fields(type(module(s)) as BundleType) map-append :
+                  val etfs = generate-entry(name(f),type(f))
+                  for etf in etfs map : 
+                     Field(name(etf),flip(etf) * flip(f),type(etf))
+            val m = module(s) as WRef
+            DefInstance(name(s),WRef(name(m),BundleType(fields),kind(m),gender(m)))
          (s:DefNode) : Begin $
             for x in expand-expr(value(s)) map : 
                DefNode(name(s),exp(x))