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

naming changes

Browse Source
This commit is contained in:
jand 2003-11-24 21:54:04 +00:00
parent 284fe6f929
commit ba5d61d7b5
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myhdl/_extractHierarchy.py
View File

@ -116,7 +116,7 @@ class _HierExtr(object):
self.names = [] self.names = []
self.instNamesStack = [Set()] self.instNamesStack = [Set()]
self.hierarchy = hierarchy = [] self.hierarchy = hierarchy = []
self.gennames = gennames = {} self.genNames = genNames = {}
self.level = 0 self.level = 0
# handle special case of a top-level generator separately # handle special case of a top-level generator separately
if _isGenFunc(dut): if _isGenFunc(dut):
@ -185,7 +185,7 @@ class _HierExtr(object):
absgname = gname absgname = gname
if prefix: if prefix:
absgname = prefix + "_" + gname absgname = prefix + "_" + gname
self.gennames[id(g)] = absgname self.genNames[id(g)] = absgname
inst = [self.level, name, sigdict] inst = [self.level, name, sigdict]
self.hierarchy.append(inst) self.hierarchy.append(inst)
self.level -= 1 self.level -= 1

38
myhdl/_toVerilog.py
View File

@ -85,7 +85,7 @@ def toVerilog(func, *args, **kwargs):
siglist = _analyzeSigs(h.hierarchy) siglist = _analyzeSigs(h.hierarchy)
arglist = _flatten(h.top) arglist = _flatten(h.top)
_checkArgs(arglist) _checkArgs(arglist)
genlist = _analyzeGens(arglist, h.gennames) genlist = _analyzeGens(arglist, h.genNames)
intf = _analyzeTopFunc(func, *args, **kwargs) intf = _analyzeTopFunc(func, *args, **kwargs)
intf.name = name intf.name = name
@ -137,7 +137,7 @@ def LabelGenerator():
genLabel = LabelGenerator() genLabel = LabelGenerator()
def _analyzeGens(top, gennames): def _analyzeGens(top, genNames):
genlist = [] genlist = []
for g in top: for g in top:
f = g.gi_frame f = g.gi_frame
@ -149,7 +149,7 @@ def _analyzeGens(top, gennames):
symdict = f.f_globals.copy() symdict = f.f_globals.copy()
symdict.update(f.f_locals) symdict.update(f.f_locals)
ast.symdict = symdict ast.symdict = symdict
ast.name = gennames.get(id(g), genLabel.next() + "_BLOCK") ast.name = genNames.get(id(g), genLabel.next() + "_BLOCK")
v = _AnalyzeBlockVisitor(symdict, ast.sourcefile, ast.lineoffset) v = _AnalyzeBlockVisitor(symdict, ast.sourcefile, ast.lineoffset)
compiler.walk(ast, v) compiler.walk(ast, v)
ast.sigdict = v.sigdict ast.sigdict = v.sigdict
@ -188,63 +188,44 @@ class _ToVerilogMixin(object):
class _NotSupportedVisitor(_ToVerilogMixin): class _NotSupportedVisitor(_ToVerilogMixin):
def visitAssList(self, node, *args): def visitAssList(self, node, *args):
self.raiseError(node, _error.NotSupported, "list assignment") self.raiseError(node, _error.NotSupported, "list assignment")
def visitAssTuple(self, node, *args): def visitAssTuple(self, node, *args):
self.raiseError(node, _error.NotSupported, "tuple assignment") self.raiseError(node, _error.NotSupported, "tuple assignment")
def visitBackquote(self, node, *args): def visitBackquote(self, node, *args):
self.raiseError(node, _error.NotSupported, "backquote") self.raiseError(node, _error.NotSupported, "backquote")
def visitBreak(self, node, *args): def visitBreak(self, node, *args):
self.raiseError(node, _error.NotSupported, "break statement") self.raiseError(node, _error.NotSupported, "break statement")
def visitClass(self, node, *args): def visitClass(self, node, *args):
self.raiseError(node, _error.NotSupported, "class statement") self.raiseError(node, _error.NotSupported, "class statement")
def visitContinue(self, node, *args): def visitContinue(self, node, *args):
self.raiseError(node, _error.NotSupported, "continue statement") self.raiseError(node, _error.NotSupported, "continue statement")
def visitDict(self, node, *args): def visitDict(self, node, *args):
self.raiseError(node, _error.NotSupported, "dictionary") self.raiseError(node, _error.NotSupported, "dictionary")
def visitDiv(self, node, *args): def visitDiv(self, node, *args):
self.raiseError(node, _error.NotSupported, "true division - consider '//'") self.raiseError(node, _error.NotSupported, "true division - consider '//'")
def visitEllipsis(self, node, *args): def visitEllipsis(self, node, *args):
self.raiseError(node, _error.NotSupported, "ellipsis") self.raiseError(node, _error.NotSupported, "ellipsis")
def visitExec(self, node, *args): def visitExec(self, node, *args):
self.raiseError(node, _error.NotSupported, "exec statement") self.raiseError(node, _error.NotSupported, "exec statement")
def visitExpression(self, node, *args): def visitExpression(self, node, *args):
self.raiseError(node, _error.NotSupported, "Expression node") self.raiseError(node, _error.NotSupported, "Expression node")
def visitFrom(self, node, *args): def visitFrom(self, node, *args):
self.raiseError(node, _error.NotSupported, "from statement") self.raiseError(node, _error.NotSupported, "from statement")
def visitGlobal(self, node, *args): def visitGlobal(self, node, *args):
self.raiseError(node, _error.NotSupported, "global statement") self.raiseError(node, _error.NotSupported, "global statement")
def visitImport(self, node, *args): def visitImport(self, node, *args):
self.raiseError(node, _error.NotSupported, "import statement") self.raiseError(node, _error.NotSupported, "import statement")
def visitLambda(self, node, *args): def visitLambda(self, node, *args):
self.raiseError(node, _error.NotSupported, "lambda statement") self.raiseError(node, _error.NotSupported, "lambda statement")
def visitListComp(self, node, *args): def visitListComp(self, node, *args):
self.raiseError(node, _error.NotSupported, "list comprehension") self.raiseError(node, _error.NotSupported, "list comprehension")
def visitList(self, node, *args): def visitList(self, node, *args):
self.raiseError(node, _error.NotSupported, "list") self.raiseError(node, _error.NotSupported, "list")
def visitSliceObj(self, node):
self.raiseError(node, _error.NotSupported, "slice object")
def visitTryExcept(self, node, *args): def visitTryExcept(self, node, *args):
self.raiseError(node, _error.NotSupported, "try-except statement") self.raiseError(node, _error.NotSupported, "try-except statement")
def visitTryFinally(self, node, *args): def visitTryFinally(self, node, *args):
self.raiseError(node, _error.NotSupported, "try-finally statement") self.raiseError(node, _error.NotSupported, "try-finally statement")
@ -794,7 +775,7 @@ class _ConvertVisitor(_ToVerilogMixin):
} }
if node.op not in opmap: if node.op not in opmap:
self.raiseError(node, _error.NotSupported, self.raiseError(node, _error.NotSupported,
"augmented assignment %s" % op) "augmented assignment %s" % node.op)
op = opmap[node.op] op = opmap[node.op]
self.writeline() self.writeline()
self.visit(node.node) self.visit(node.node)
@ -1048,9 +1029,6 @@ class _ConvertVisitor(_ToVerilogMixin):
self.visit(node.upper) self.visit(node.upper)
self.write("]") self.write("]")
def visitSliceObj(self, node):
# XXX
pass
def visitSub(self, node): def visitSub(self, node):
self.binaryOp(node, "-") self.binaryOp(node, "-")
@ -1194,7 +1172,3 @@ class _ConvertFunctionVisitor(_ConvertVisitor):
self.write("disable __MYHDL__;") self.write("disable __MYHDL__;")