Bug fixed for default_nettype and case statements with multiple match conditions.

Author: shtaxxx

dataflow/bindvisitor.py

@@ -9,6 +9,7 @@
 
 import sys
 import os
+import re
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) )
 
@@ -65,6 +66,10 @@ def getFrameTable(self):
     def start_visit(self):
         return self.visit(self.moduleinfotable.getDefinition(self.top))
 
+    def visit_ModuleDef(self, node):
+        self.default_nettype = node.default_nettype
+        self.generic_visit(node)
+
     def visit_Input(self, node):
         self.addTerm(node)
 
@@ -1215,12 +1220,12 @@ def getDst(self, left, scope):
         if isinstance(left, Identifier):
             name = self.searchTerminal(left.name, scope)
             if name is None:
-                if self.default_nettype == 'none':
-                    raise verror.FormatError()
-                if self.default_nettype == 'wire':
-                    self.addTerm(Wire(left.name), rscope=scope)
-                if self.default_nettype == 'reg':
-                    self.addTerm(Reg(left.name), rscope=scope)
+                m = re.search('none', self.default_nettype)
+                if m: raise verror.FormatError("No such signal: %s" % left.name)
+                m = re.search('wire', self.default_nettype)
+                if m: self.addTerm(Wire(left.name), rscope=scope)
+                m = re.search('reg', self.default_nettype)
+                if m: self.addTerm(Reg(left.name), rscope=scope)
                 name = self.searchTerminal(left.name, scope)
             if left.scope is not None:
                 name = left.scope + ScopeLabel(left.name, 'signal')

dataflow/signalvisitor.py

@@ -215,7 +215,7 @@ def _case(self, comp, caselist):
             if len(case.cond) > 1:
                 cond = Eq(comp, case.cond[0]) 
                 for c in case.cond[1:]:
-                    cond = Lor(tmp, Eq(comp, c))
+                    cond = Lor(cond, Eq(comp, c))
             else:
                 cond = Eq(comp, case.cond[0])
         label = self.labels.get( self.frames.getLabelKey('if') )

testcode/case.v

@@ -0,0 +1,24 @@
+module TOP(CLK, RST, LED);
+  input CLK, RST;
+  output [7:0] LED;
+  reg [7:0] cnt;
+  always @(posedge CLK) begin
+    if(RST) begin
+      cnt <= 0;
+    end else begin
+      case(cnt)
+        'h0, 'h1, 'h2: begin
+          cnt <= cnt + 1;
+        end
+        'hff: begin
+          cnt <= 0;
+        end
+        default: begin
+          cnt <= cnt + 1;
+        end
+      endcase
+    end
+  end
+  assign LED = cnt;
+endmodule
+

testcode/test.v

@@ -1,8 +1,10 @@
+//`default_nettype none
 
 module TOP(CLK, RST, LED);
   input CLK, RST;
   output [7:0] LED;
   reg [7:0] cnt;
+  //wire enable;
   localparam DELAYSIZE = 5;
   always @(posedge CLK) begin
     if(RST) begin
@@ -11,6 +13,7 @@ module TOP(CLK, RST, LED);
       cnt <= #DELAYSIZE cnt==255? 0 : cnt + 1;
     end
   end
-  assign LED = cnt;
+  assign enable = cnt == 'hff;
+  assign LED = enable? 'hff : 0;
 endmodule
 

vparser/ast.py

@@ -68,11 +68,12 @@ def children(self):
 
 class ModuleDef(Node):
     attr_names = ('name',)
-    def __init__(self, name, paramlist, portlist, items):
+    def __init__(self, name, paramlist, portlist, items, default_nettype='wire'):
         self.name = name
         self.paramlist = paramlist
         self.portlist = portlist
         self.items = items
+        self.default_nettype = default_nettype
     def children(self):
         nodelist = []
         if self.paramlist is not None: nodelist.append(self.paramlist)

vparser/lexer.py

@@ -22,6 +22,7 @@ def __init__(self, error_func):
         self.filename = ''
         self.error_func = error_func
         self.directives = []
+        self.default_nettype = 'wire'
 
     def build(self, **kwargs):
         self.lexer = ply.lex.lex(object=self, **kwargs)
@@ -34,6 +35,9 @@ def reset_lineno(self):
     def get_directives(self):
         return tuple(self.directives)
 
+    def get_default_nettype(self):
+        return self.default_nettype
+
     def token(self):
         return self.lexer.token()
 
@@ -91,6 +95,8 @@ def token(self):
     def t_DIRECTIVE(self, t):
         self.directives.append( (self.lexer.lineno, t.value) )
         t.lexer.lineno += t.value.count("\n")
+        m = re.match("^`default_nettype\s+(.+)\n", t.value)
+        if m: self.default_nettype = m.group(1)
         pass
 
     # Comment

vparser/parser.py

@@ -57,6 +57,9 @@ def _lexer_error_func(self, msg, line, column):
 
     def get_directives(self):
         return self.lexer.get_directives()
+
+    def get_default_nettype(self):
+        return self.lexer.get_default_nettype()
 
     # Returns AST
     def parse(self, text, debug=0):
@@ -101,7 +104,8 @@ def p_pragma(self, p):
     ######################################################################
     def p_moduledef(self,p):
         'moduledef : MODULE modulename paramlist portlist items ENDMODULE'
-        p[0] = ModuleDef(name=p[2], paramlist=p[3], portlist=p[4], items=p[5])
+        p[0] = ModuleDef(name=p[2], paramlist=p[3], portlist=p[4], items=p[5],
+                         default_nettype=self.get_default_nettype())
 
     def p_modulename(self, p):
         'modulename : ID'