Fixed a bug of delay statement

Author: shtaxxx

testcode/test.v

@@ -1,37 +1,16 @@
-module TOP(CLK, RST_X, IN, OUT);
-  input CLK, RST_X;
-  input [7:0] IN;
-  output [7:0] OUT;
 
-  reg [7:0] state;
-  reg [7:0] nstate;
+module TOP(CLK, RST, LED);
+  input CLK, RST;
+  output [7:0] LED;
   reg [7:0] cnt;
-
-  integer i;
-
-  parameter W_DIR = 5;
-  parameter W_FLIT = 8;
-
-  function isvalid;
-    input [W_FLIT-1:0] in;
-    isvalid = in[W_FLIT-1];
-  endfunction
-  
-  always @* begin
-    nstate = 0;
-    if( !(isvalid(nstate)) )
-      nstate = nstate + 1;
-  end
-  
+  localparam DELAYSIZE = 5;
   always @(posedge CLK) begin
-    if(!RST_X) begin
-      state <= 0;
+    if(RST) begin
       cnt <= 0;
     end else begin
-      state <= nstate;
-      cnt <= cnt + 1;
+      cnt <= #DELAYSIZE cnt==255? 0 : cnt + 1;
     end
   end
-  
+  assign LED = cnt;
 endmodule
 

vparser/Makefile

@@ -5,7 +5,8 @@ PREPROCESS=preprocessor.py
 LEXER=lexer.py
 PARSER=parser.py
 
-SRCS=../testcode/generate.v
+SRCS=../testcode/test.v
+#SRCS=../testcode/generate.v
 
 .PHONY: parse
 parse:

vparser/lexer.py

@@ -262,7 +262,7 @@ def my_error_func(msg, a, b):
         sys.write(msg + "\n")
         sys.exit()
 
-    filename = '../test/generate.v'
+    filename = '../testcode/test.v'
     text = open(filename, 'r').read()
 
     lexer = VerilogLexer(error_func = my_error_func)

vparser/parser.py

@@ -1073,9 +1073,21 @@ def p_nonblocking_substitution(self, p):
 
     ######################################################################
     def p_delays(self, p):
-        """delays : DELAY expression"""
+        """delays : DELAY LPAREN expression RPAREN"""
+        p[0] = DelayStatement(p[3])
+
+    def p_delays_identifier(self, p):
+        """delays : DELAY identifier"""
         p[0] = DelayStatement(p[2])
 
+    def p_delays_intnumber(self, p):
+        """delays : DELAY intnumber"""
+        p[0] = DelayStatement(IntConst(p[2]))
+
+    def p_delays_floatnumber(self, p):
+        """delays : DELAY floatnumber"""
+        p[0] = DelayStatement(FloatConst(p[2]))
+
     def p_delays_empty(self, p):
         """delays : empty"""
         p[0] = None

vparser/preprocessor.py

@@ -40,7 +40,7 @@ def preprocess(self):
         subprocess.call(cmd, shell=True)
 
 if __name__ == '__main__':
-    filelist = ('../test/generate.v',)
+    filelist = ('../testcode/test.v',)
     pp_outputfile = 'pp.out'
     vp = VerilogPreprocessor(filelist, pp_outputfile, include=('./'))
     vp.preprocess()