add important detection ArrayProxy and workaround in eq()

diff --git a/src/add/singlepipe.py b/src/add/singlepipe.py
index 206f815ff6bac777f81c3a2e737bc92a2ee7466b..6d73b862a2b6f4db0f9a665664ba95e7029b6e72 100644 (file)
--- a/src/add/singlepipe.py
+++ b/src/add/singlepipe.py
@@ -150,8 +150,9 @@
     it's quite a complex state machine!
 """
 
-from nmigen import Signal, Cat, Const, Mux, Module
+from nmigen import Signal, Cat, Const, Mux, Module, Value
 from nmigen.cli import verilog, rtlil
+from nmigen.hdl.ast import ArrayProxy
 from nmigen.hdl.rec import Record, Layout
 
 from abc import ABCMeta, abstractmethod
@@ -255,6 +256,14 @@ def eq(o, i):
                     val = val[field_name] # dictionary-style specification
                 rres = eq(ao.fields[field_name], val)
                 res += rres
+        elif isinstance(ao, ArrayProxy) and not isinstance(ai, Value):
+            for p in ai.ports():
+                op = getattr(ao, p.name)
+                print (op, p, p.name)
+                rres = op.eq(p)
+                if not isinstance(rres, Sequence):
+                    rres = [rres]
+                res += rres
         else:
             rres = ao.eq(ai)
             if not isinstance(rres, Sequence):