minor bugfixes

diff --git a/migen/fhdl/structure.py b/migen/fhdl/structure.py
index 07de92dd426f80178ea4b0f1dbb85b917de63812..e3faae51d77ddd2e4cb2026bc61e0d4ece9fd761 100644 (file)
--- a/migen/fhdl/structure.py
+++ b/migen/fhdl/structure.py
@@ -432,7 +432,7 @@ class _Assign(_Statement):
 
 
 def _check_statement(s):
-    if isinstance(s, Iterable):
+    if isinstance(s, _collections.Iterable):
         return all(_check_statement(ss) for ss in s)
     else:
         return isinstance(s, _Statement)

diff --git a/migen/sim.py b/migen/sim.py
index 7f2035d1575a88012b901a7d0ec2abcf79ff7959..cd8d8d122c51ab54fae16ac45caa8f792c9ae203 100644 (file)
--- a/migen/sim.py
+++ b/migen/sim.py
@@ -80,7 +80,7 @@ class Evaluator:
             try:
                 return self.signal_values[node]
             except KeyError:
-                return node.reset
+                return node.reset.value
         elif isinstance(node, _Operator):
             operands = [self.eval(o) for o in node.operands]
             if node.op == "-":