build: use our own fhdl/verilog code (needed to avoid combinatorial loop in simulation)
This commit is contained in:
parent
121eaba722
commit
c3652935d9
|
@ -3,7 +3,8 @@ import os
|
||||||
from migen.fhdl.structure import Signal
|
from migen.fhdl.structure import Signal
|
||||||
from migen.genlib.record import Record
|
from migen.genlib.record import Record
|
||||||
from migen.genlib.io import CRG
|
from migen.genlib.io import CRG
|
||||||
from migen.fhdl import verilog
|
|
||||||
|
from litex.gen.fhdl import verilog
|
||||||
|
|
||||||
from litex.build import tools
|
from litex.build import tools
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,8 @@ import subprocess
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
from migen.fhdl.structure import _Fragment
|
from migen.fhdl.structure import _Fragment
|
||||||
from migen.fhdl.verilog import DummyAttrTranslate
|
|
||||||
|
from litex.gen.fhdl.verilog import DummyAttrTranslate
|
||||||
|
|
||||||
from litex.build.generic_platform import *
|
from litex.build.generic_platform import *
|
||||||
from litex.build import tools
|
from litex.build import tools
|
||||||
|
|
|
@ -118,17 +118,6 @@ def _printexpr(ns, node):
|
||||||
def _printnode(ns, at, level, node, target_filter=None):
|
def _printnode(ns, at, level, node, target_filter=None):
|
||||||
if target_filter is not None and target_filter not in list_targets(node):
|
if target_filter is not None and target_filter not in list_targets(node):
|
||||||
return ""
|
return ""
|
||||||
elif isinstance(node, Display):
|
|
||||||
s = "\"" + node.s + "\""
|
|
||||||
for arg in node.args:
|
|
||||||
s += ", "
|
|
||||||
if isinstance(arg, Signal):
|
|
||||||
s += ns.get_name(arg)
|
|
||||||
else:
|
|
||||||
s += str(arg)
|
|
||||||
return "\t"*level + "$display(" + s + ");\n"
|
|
||||||
elif isinstance(node, Finish):
|
|
||||||
return "\t"*level + "$finish;\n"
|
|
||||||
elif isinstance(node, _Assign):
|
elif isinstance(node, _Assign):
|
||||||
if at == _AT_BLOCKING:
|
if at == _AT_BLOCKING:
|
||||||
assignment = " = "
|
assignment = " = "
|
||||||
|
|
Loading…
Reference in New Issue