FPGA/myhdl
1
0
Fork 0
mirror of https://github.com/myhdl/myhdl.git synced 2024-12-14 07:44:38 +08:00
Code Issues Projects Releases Wiki Activity

replaced call to buitl-in 'bin'function with call to 'bin function from _bin.py

Browse Source
This commit is contained in:
Josy Boelen 2015-05-23 14:38:16 +02:00
parent 33943723b8
commit 9287256714
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
myhdl/_ShadowSignal.py
View File

@ -30,6 +30,7 @@ from myhdl._Signal import _Signal
from myhdl._Waiter import _SignalWaiter, _SignalTupleWaiter from myhdl._Waiter import _SignalWaiter, _SignalTupleWaiter
from myhdl._intbv import intbv from myhdl._intbv import intbv
from myhdl._simulator import _siglist from myhdl._simulator import _siglist
from myhdl._bin import bin
# shadow signals # shadow signals
@ -200,12 +201,12 @@ class ConcatSignal(_ShadowSignal):
if isinstance(a, _Signal): if isinstance(a, _Signal):
lines.append("%s(%s) <= %s;" % (self._name, lo, a._name)) lines.append("%s(%s) <= %s;" % (self._name, lo, a._name))
else: else:
lines.append("%s(%s) <= '%s';" % (self._name, lo, bin(ini[lo])[2:])) lines.append("%s(%s) <= '%s';" % (self._name, lo, bin(ini[lo])))
else: else:
if isinstance(a, _Signal): if isinstance(a, _Signal):
lines.append("%s(%s-1 downto %s) <= %s;" % (self._name, hi, lo, a._name)) lines.append("%s(%s-1 downto %s) <= %s;" % (self._name, hi, lo, a._name))
else: else:
lines.append('%s(%s-1 downto %s) <= "%s";' % (self._name, hi, lo, bin(ini[hi:lo])[2:])) lines.append('%s(%s-1 downto %s) <= "%s";' % (self._name, hi, lo, bin(ini[hi:lo],w)))
hi = lo hi = lo
return "\n".join(lines) return "\n".join(lines)
@ -223,12 +224,12 @@ class ConcatSignal(_ShadowSignal):
if isinstance(a, _Signal): if isinstance(a, _Signal):
lines.append("assign %s[%s] = %s;" % (self._name, lo, a._name)) lines.append("assign %s[%s] = %s;" % (self._name, lo, a._name))
else: else:
lines.append("assign %s[%s] = 'b%s;" % (self._name, lo, bin(ini[lo])[2:])) lines.append("assign %s[%s] = 'b%s;" % (self._name, lo, bin(ini[lo])))
else: else:
if isinstance(a, _Signal): if isinstance(a, _Signal):
lines.append("assign %s[%s-1:%s] = %s;" % (self._name, hi, lo, a._name)) lines.append("assign %s[%s-1:%s] = %s;" % (self._name, hi, lo, a._name))
else: else:
lines.append("assign %s[%s-1:%s] = 'b%s;" % (self._name, hi, lo, bin(ini[hi:lo])[2:])) lines.append("assign %s[%s-1:%s] = 'b%s;" % (self._name, hi, lo, bin(ini[hi:lo],w)]))
hi = lo hi = lo
return "\n".join(lines) return "\n".join(lines)