sim: support eval of nested lists
This commit is contained in:
parent
9556c335ea
commit
5fa7f7414f
10
migen/sim.py
10
migen/sim.py
|
@ -147,6 +147,14 @@ class Simulator:
|
||||||
self.evaluator.execute(self.comb_dependent_statements[signal])
|
self.evaluator.execute(self.comb_dependent_statements[signal])
|
||||||
modified = self.evaluator.commit()
|
modified = self.evaluator.commit()
|
||||||
|
|
||||||
|
def _eval_nested_lists(self, x):
|
||||||
|
if isinstance(x, list):
|
||||||
|
return [self._eval_nested_lists(e) for e in x]
|
||||||
|
elif isinstance(x, Signal):
|
||||||
|
return self.evaluator.eval(x)
|
||||||
|
else:
|
||||||
|
raise ValueError
|
||||||
|
|
||||||
def _process_generators(self, cd):
|
def _process_generators(self, cd):
|
||||||
exhausted = []
|
exhausted = []
|
||||||
for generator in self.generators[cd]:
|
for generator in self.generators[cd]:
|
||||||
|
@ -159,7 +167,7 @@ class Simulator:
|
||||||
elif isinstance(request, tuple):
|
elif isinstance(request, tuple):
|
||||||
self.evaluator.assign(*request)
|
self.evaluator.assign(*request)
|
||||||
else:
|
else:
|
||||||
reply = self.evaluator.eval(request)
|
reply = self._eval_nested_lists(request)
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
exhausted.append(generator)
|
exhausted.append(generator)
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue