Merge branch 'work2'

Author: fukatani

pyverilog/dataflow/bindvisitor.py

@@ -1095,9 +1095,9 @@ def makeDFTree(self, node, scope):
 
         if isinstance(node, SystemCall):
             if node.syscall == 'unsigned':
-                return self.makeDFTree(node.args[0])
+                return self.makeDFTree(node.args[0], scope)
             if node.syscall == 'signed':
-                return self.makeDFTree(node.args[0])
+                return self.makeDFTree(node.args[0], scope)
             return DFIntConst('0')
 
         raise verror.FormatError("unsupported AST node type: %s %s" %

pyverilog/testcode/signed_task.v

@@ -0,0 +1,14 @@
+module TOP(CLK, RST);
+  input CLK, RST;
+  reg [7:0] cnt;
+
+  always @(posedge CLK or negedge RST) begin
+    if(RST) begin
+      cnt <= $signed(cnt);
+    end else begin
+      cnt <= $unsigned(cnt);
+    end
+  end
+
+
+endmodule

pyverilog/testcode/test_sd.py

@@ -1,7 +1,7 @@
 #-------------------------------------------------------------------------------
 # test_sd.py
 #
-# Lexical analyzer
+#
 #
 # Copyright (C) 2015, ryosuke fukatani
 # License: Apache 2.0
@@ -32,6 +32,11 @@ def test_signed(self):
         self.assertEqual(binddict.values()[0][0].tostr(),
         "(Bind dest:TOP.cnt tree:(Branch Cond:(Terminal TOP.RST) True:(IntConst 'd0) False:(Operator Plus Next:(Terminal TOP.cnt),(IntConst 1'sd1))))")
 
+    def test_signed_task(self):
+        terms, binddict = self.dataflow_wrapper("signed_task.v")
+        self.assertEqual(binddict.values()[0][0].tostr(),
+        "(Bind dest:TOP.cnt tree:(Branch Cond:(Terminal TOP.RST) True:(Terminal TOP.cnt) False:(Terminal TOP.cnt)))")
+
     def test_casex(self):
         self.dataflow_wrapper("casex.v")
 

pyverilog/vparser/parser.py

@@ -4,7 +4,7 @@
 # Parser
 #
 # Copyright (C) 2013, Shinya Takamaeda-Yamazaki
-# edited by ryosuke fukatani
+# modified by ryosuke fukatani
 # License: Apache 2.0
 #-------------------------------------------------------------------------------
 
@@ -1550,6 +1550,10 @@ def p_systemcall(self, p):
         'systemcall : DOLLER ID LPAREN sysargs RPAREN'
         p[0] = SystemCall(p[2], p[4])
 
+    def p_systemcall_signed(self, p):#for $signed system task
+        'systemcall : DOLLER SIGNED LPAREN sysargs RPAREN'
+        p[0] = SystemCall(p[2], p[4])
+
     def p_sysargs(self, p):
         'sysargs : sysargs COMMA sysarg'
         p[0] = p[1] + (p[3],)