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

make always_comb inherit from always

Browse Source
This commit is contained in:
Keerthan Jaic 2015-07-13 08:02:19 -04:00
parent 63d7fce2af
commit 9fda87bbec
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
myhdl/_always_comb.py
View File

@ -32,6 +32,7 @@ from myhdl._util import _isGenFunc, _dedent
from myhdl._cell_deref import _cell_deref from myhdl._cell_deref import _cell_deref
from myhdl._Waiter import _Waiter, _SignalWaiter, _SignalTupleWaiter from myhdl._Waiter import _Waiter, _SignalWaiter, _SignalTupleWaiter
from myhdl._instance import _Instantiator from myhdl._instance import _Instantiator
from myhdl._always import _Always
from myhdl._resolverefs import _AttrRefTransformer from myhdl._resolverefs import _AttrRefTransformer
from myhdl._visitors import _SigNameVisitor from myhdl._visitors import _SigNameVisitor
@ -68,7 +69,8 @@ def always_comb(func):
return c return c
class _AlwaysComb(_Instantiator): # class _AlwaysComb(_Instantiator):
class _AlwaysComb(_Always):
# def __init__(self, func, symdict): # def __init__(self, func, symdict):
# self.func = func # self.func = func
@ -100,7 +102,6 @@ class _AlwaysComb(_Instantiator):
# self.waiter = W(self.gen) # self.waiter = W(self.gen)
def __init__(self, func, symdict): def __init__(self, func, symdict):
self.func = func
self.symdict = symdict self.symdict = symdict
s = inspect.getsource(func) s = inspect.getsource(func)
s = _dedent(s) s = _dedent(s)
@ -128,16 +129,10 @@ class _AlwaysComb(_Instantiator):
else: # list of sigs else: # list of sigs
senslist.extend(s) senslist.extend(s)
self.senslist = tuple(senslist) self.senslist = tuple(senslist)
self.gen = self.genfunc()
if len(self.senslist) == 0: if len(self.senslist) == 0:
raise AlwaysCombError(_error.EmptySensitivityList) raise AlwaysCombError(_error.EmptySensitivityList)
if len(self.senslist) == 1:
W = _SignalWaiter
else:
W = _SignalTupleWaiter
self.waiter = W(self.gen)
super(_AlwaysComb, self).__init__(func, senslist)
def genfunc(self): def genfunc(self):
senslist = self.senslist senslist = self.senslist