Escaped identifier is supported. Instantiation of basic primitives without instance name is allowed.

Author: shtaxxx

pyverilog/ast_code_generator/codegen.py

@@ -36,6 +36,11 @@ def generic_visit(self, node):
 def getfilename(node):
     return node.__class__.__name__.lower() + '.txt'
 
+def escape(s):
+    if s.startswith('\\'):
+        return s + ' '
+    return s
+
 class ASTCodeGenerator(ConvertVisitor):
     def __init__(self):
         self.env = Environment(loader=FileSystemLoader(DEFAULT_TEMPLATE_DIR))
@@ -63,7 +68,7 @@ def visit_ModuleDef(self, node):
         template = self.env.get_template(filename)
         paramlist = self.visit(node.paramlist)
         template_dict = {
-            'modulename' : node.name,
+            'modulename' : escape(node.name),
             'paramlist' : '' if len(node.paramlist.params) == 0 else paramlist,
             'portlist' : self.visit(node.portlist),
             'items' : [ self.visit(item) for item in node.items ],
@@ -97,7 +102,7 @@ def visit_Port(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             }
         rslt = template.render(template_dict)
         return rslt
@@ -126,7 +131,7 @@ def visit_Identifier(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'scope' : '' if node.scope is None else self.visit(node.scope),
             }
         rslt = template.render(template_dict)
@@ -181,7 +186,7 @@ def visit_Variable(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -192,7 +197,7 @@ def visit_Input(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -203,7 +208,7 @@ def visit_Output(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -214,7 +219,7 @@ def visit_Inout(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -225,7 +230,7 @@ def visit_Tri(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -236,7 +241,7 @@ def visit_Wire(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -247,7 +252,7 @@ def visit_Reg(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'signed' : node.signed,
             }
@@ -258,7 +263,7 @@ def visit_WireArray(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'length' : self.visit(node.length),
             'signed' : node.signed,
@@ -270,7 +275,7 @@ def visit_RegArray(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None else self.visit(node.width),
             'length' : self.visit(node.length),
             'signed' : node.signed,
@@ -282,7 +287,7 @@ def visit_Integer(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'signed' : node.signed,
             }
         rslt = template.render(template_dict)
@@ -292,7 +297,7 @@ def visit_Real(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             }
         rslt = template.render(template_dict)
         return rslt
@@ -301,7 +306,7 @@ def visit_Genvar(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             }
         rslt = template.render(template_dict)
         return rslt
@@ -312,7 +317,7 @@ def visit_Ioport(self, node):
         template_dict = {
             'first' : node.first.__class__.__name__.lower(),
             'second' : '' if node.second is None else node.second.__class__.__name__.lower(),
-            'name' : node.first.name,
+            'name' : escape(node.first.name),
             'width' : '' if node.first.width is None else self.visit(node.first.width),
             }
         rslt = template.render(template_dict)
@@ -323,7 +328,7 @@ def visit_Parameter(self, node):
         template = self.env.get_template(filename)
         value = self.visit(node.value)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None or (value.startswith('"') and value.endswith('"')) else self.visit(node.width),
             'value' : value,
             'signed' : node.signed,
@@ -336,7 +341,7 @@ def visit_Localparam(self, node):
         template = self.env.get_template(filename)
         value = self.visit(node.value)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'width' : '' if node.width is None or (value.startswith('"') and value.endswith('"')) else self.visit(node.width),
             'value' : value,
             'signed' : node.signed,
@@ -694,7 +699,7 @@ def visit_Block(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'scope' : '' if node.scope is None else node.scope,
+            'scope' : '' if node.scope is None else escape(node.scope),
             'statements' : [ self.visit(statement) for statement in node.statements ],
             }
         rslt = template.render(template_dict)
@@ -752,7 +757,7 @@ def visit_InstanceList(self, node):
         parameterlist = [ self.visit(param) for param in node.parameterlist ]
         instances = [ self.visit(instance) for instance in node.instances ]
         template_dict = {
-            'module' : node.module,
+            'module' : escape(node.module),
             'parameterlist' : parameterlist,
             'len_parameterlist' : len(parameterlist),
             'instances' : instances,
@@ -767,7 +772,7 @@ def visit_Instance(self, node):
         array = '' if node.array is None else self.visit(node.array)
         portlist = [ self.visit(port) for port in node.portlist ]
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'array' : array,
             'portlist' : portlist,
             'len_portlist' : len(portlist),
@@ -779,7 +784,7 @@ def visit_ParamArg(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'paramname' : '' if node.paramname is None else node.paramname,
+            'paramname' : '' if node.paramname is None else escape(node.paramname),
             'argname' : '' if node.argname is None else self.visit(node.argname),
             }
         rslt = template.render(template_dict)
@@ -789,7 +794,7 @@ def visit_PortArg(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'portname' : '' if node.portname is None else node.portname,
+            'portname' : '' if node.portname is None else escape(node.portname),
             'argname' : '' if node.argname is None else self.visit(node.argname),
             }
         rslt = template.render(template_dict)
@@ -800,7 +805,7 @@ def visit_Function(self, node):
         template = self.env.get_template(filename)
         statement = [ self.visit(s) for s in node.statement ]
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'retwidth' : self.visit(node.retwidth),
             'statement' : statement,
             }
@@ -823,7 +828,7 @@ def visit_Task(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'statement' : self.visit(node.statement),
             }
         rslt = template.render(template_dict)
@@ -855,7 +860,7 @@ def visit_SystemCall(self, node):
         template = self.env.get_template(filename)
         args = [ self.visit(arg) for arg in node.args ]
         template_dict = {
-            'syscall' : node.syscall,
+            'syscall' : escape(node.syscall),
             'args' : args,
             'len_args' : len(args),
             }
@@ -866,7 +871,7 @@ def visit_IdentifierScopeLabel(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'loop' : '' if node.loop is None else self.visit(node.loop),
             }
         rslt = template.render(template_dict)
@@ -895,7 +900,7 @@ def visit_PragmaEntry(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.name,
+            'name' : escape(node.name),
             'value' : '' if node.value is None else self.visit(node.value),
             }
         rslt = template.render(template_dict)
@@ -905,7 +910,7 @@ def visit_Disable(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'name' : node.dest,
+            'name' : escape(node.dest),
             }        
         rslt = template.render(template_dict)
         return rslt
@@ -914,7 +919,7 @@ def visit_ParallelBlock(self, node):
         filename = getfilename(node)
         template = self.env.get_template(filename)
         template_dict = {
-            'scope' : '' if node.scope is None else node.scope,
+            'scope' : '' if node.scope is None else escape(node.scope),
             'statements' : [ self.visit(statement) for statement in node.statements ],
             }
         rslt = template.render(template_dict)

pyverilog/dataflow/bindvisitor.py

@@ -145,6 +145,9 @@ def visit_Instance(self, node):
         return self._visit_Instance_body(node, nodename)
 
     def _visit_Instance_array(self, node):
+        if node.name == '':
+            raise verror.FormatError("Module %s requires an instance name" % node.module)
+        
         current = self.frames.getCurrent()
         msb = self.optimize(self.getTree(node.array.msb, current)).value
         lsb = self.optimize(self.getTree(node.array.lsb, current)).value
@@ -157,6 +160,9 @@ def _visit_Instance_array(self, node):
     def _visit_Instance_body(self, node, nodename, arrayindex=None):
         if node.module in primitives: return self._visit_Instance_primitive(node, arrayindex)
 
+        if nodename == '':
+            raise verror.FormatError("Module %s requires an instance name" % node.module)
+
         current = self.stackInstanceFrame(nodename, node.module)
 
         scope = self.frames.getCurrent()

pyverilog/dataflow/signalvisitor.py

@@ -126,6 +126,9 @@ def visit_Instance(self, node):
         return self._visit_Instance_body(node, nodename)
 
     def _visit_Instance_array(self, node):
+        if node.name == '':
+            raise verror.FormatError("Module %s requires an instance name" % node.module)
+        
         current = self.frames.getCurrent()
         msb = self.optimize(self.getTree(node.array.msb, current)).value
         lsb = self.optimize(self.getTree(node.array.lsb, current)).value
@@ -137,6 +140,9 @@ def _visit_Instance_array(self, node):
     def _visit_Instance_body(self, node, nodename):
         if node.module in primitives: return self._visit_Instance_primitive(node)
 
+        if nodename == '':
+            raise verror.FormatError("Module %s requires an instance name" % node.module)
+        
         current = self.stackInstanceFrame(nodename, node.module)
 
         self.setInstanceSimpleConstantTerms()

pyverilog/testcode/escape.v

@@ -0,0 +1,22 @@
+module \1234 
+  (
+   \CLK~ , // "\CLK~"
+   LE$D, // LE$D
+   \1234RST*%&  // "\1234RST*%&"
+   );
+  
+  input \CLK~ , \1234RST*%& ;
+  output LE$D;
+
+  genvar i, j;
+  generate for(i=0; i<4; i=i+1) begin: \1stLoop
+    for(j=0; j<4; j=j+1) begin: \2ndLoop
+      wire [7:0] tmp;
+      assign tmp = i * j;
+    end
+  end endgenerate
+
+  wire [7:0] rslt;
+  assign rslt = \1stLoop [0].\2ndLoop [1].tmp;
+  
+endmodule

pyverilog/testcode/instance_array.v

@@ -1,11 +1,10 @@
 module TOP
   (
    input [3:0] VAL,
-   output [3:0] LED0,
-   output [3:0] LED1,
-   output [3:0] LED2,
-   output [3:0] LED3,
-   input [3:0] in0, in1, in2
+   input [3:0] in0, in1, in2,
+   input in3, in4, in5,
+   output [3:0] LED0, LED1, LED2, LED3,
+   output LED4, LED5
    );
 
   SUB 
@@ -21,7 +20,7 @@ module TOP
     inst_sub5[3:0] (VAL, LED2);
 
   and U0[3:0] (LED3, in0, in1, in2);
-  
+  and (LED4, in3, in4, in5), (LED5, in3, in4, in5);
 endmodule
 
 module SUB #

pyverilog/vparser/lexer.py

@@ -191,8 +191,7 @@ def t_COMMENTOUT(self, t):
     string_char = r"""([^"\\\n]|"""+escape_sequence+')'    
     string_literal = '"'+string_char+'*"'
 
-    #identifier = r"""[a-zA-Z_][a-zA-Z_0-9$]*"""
-    identifier = r"""([a-zA-Z_]|\\.)([a-zA-Z_0-9$]|\\.)*"""
+    identifier = r"""(([a-zA-Z_])([a-zA-Z_0-9$])*)|((\\\S)(\S)*)"""
 
     @TOKEN(string_literal)
     def t_STRING_LITERAL(self, t):