Changes in tools/checkers/vcc.py [f4057f5:ed63298] in mainline

File:

• tools/checkers/vcc.py (modified) (10 diffs)

tools/checkers/vcc.py

@@ -36 +36 @@
 import subprocess
 import jobfile
-import re
 
 jobs = [
-        "kernel/kernel.job"
+        "kernel/kernel.job",
+        "uspace/srv/clip/clip.job"
 ]
-
-re_attribute = re.compile("__attribute__\s*\(\(.*\)\)")
-re_va_list = re.compile("__builtin_va_list")
-
-specification = ""
 
 def usage(prname):
         "Print usage syntax"
-        print(prname + " <ROOT> [VCC_PATH]")
+        print prname + " <ROOT>"
 
 def cygpath(upath):
@@ -59 +54 @@
         "Preprocess source using GCC preprocessor and compatibility tweaks"
         
-        global specification
-        
         args = ['gcc', '-E']
         args.extend(options.split())
-        args.extend(['-DCONFIG_VERIFY_VCC=1', srcfname])
+        args.append(srcfname)
         
         # Change working directory
@@ -72 +65 @@
         preproc = subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
         
-        tmpf = open(tmpfname, "w")
-        tmpf.write(specification)
+        tmpf = file(tmpfname, "w")
         
         for line in preproc.splitlines():
-                
                 # Ignore preprocessor directives
-                
                 if (line.startswith('#')):
-                        continue
-                
-                # Remove __attribute__((.*)) GCC extension
-                
-                line = re.sub(re_attribute, "", line)
-                
-                # Ignore unsupported __builtin_va_list type
-                # (a better solution replacing __builrin_va_list with
-                # an emulated implementation is needed)
-                
-                line = re.sub(re_va_list, "void *", line)
+                        continue        
                 
                 tmpf.write("%s\n" % line)
@@ -100 +80 @@
         return True
 
-def vcc(vcc_path, root, job):
+def vcc(root, job):
         "Run Vcc on a jobfile"
         
@@ -108 +88 @@
         
         if (not os.path.isfile(inname)):
-                print("Unable to open %s" % inname)
-                print("Did you run \"make precheck\" on the source tree?")
+                print "Unable to open %s" % inname
+                print "Did you run \"make precheck\" on the source tree?"
                 return False
         
-        inf = open(inname, "r")
+        inf = file(inname, "r")
         records = inf.read().splitlines()
         inf.close()
@@ -122 +102 @@
                 
                 if (len(arg) < 6):
-                        print("Not enough jobfile record arguments")
+                        print "Not enought jobfile record arguments"
                         return False
                 
                 srcfname = arg[0]
                 tgtfname = arg[1]
-                tool = arg[2]
-                category = arg[3]
                 base = arg[4]
                 options = arg[5]
@@ -134 +112 @@
                 srcfqname = os.path.join(base, srcfname)
                 if (not os.path.isfile(srcfqname)):
-                        print("Source %s not found" % srcfqname)
+                        print "Source %s not found" % srcfqname
                         return False
                 
@@ -140 +118 @@
                 tmpfqname = os.path.join(base, tmpfname)
                 
-                vccfname = "%s.i" % srcfname
-                vccfqname = os.path.join(base, vccfname);
-                
                 # Only C files are interesting for us
-                if (tool != "cc"):
+                if (arg[2] != "cc"):
                         continue
                 
@@ -153 +128 @@
                 
                 # Run Vcc
-                print(" -- %s --" % srcfname)
-                retval = subprocess.Popen([vcc_path, '/pointersize:32', '/newsyntax', cygpath(tmpfqname)]).wait()
+                
+                retval = subprocess.Popen(['vcc', cygpath(tmpfqname)]).wait()
+                
+                # Cleanup
+                
+                if (os.path.isfile(tmpfqname)):
+                        os.remove(tmpfqname)
                 
                 if (retval != 0):
                         return False
-                
-                # Cleanup, but only if verification was successful
-                # (to be able to examine the preprocessed file)
-                
-                if (os.path.isfile(tmpfqname)):
-                        os.remove(tmpfqname)
-                        os.remove(vccfqname)
         
         return True
 
 def main():
-        global specification
-        
         if (len(sys.argv) < 2):
                 usage(sys.argv[0])
@@ -176 +147 @@
         
         rootdir = os.path.abspath(sys.argv[1])
-        if (len(sys.argv) > 2):
-                vcc_path = sys.argv[2]
-        else:
-                vcc_path = "/cygdrive/c/Program Files (x86)/Microsoft Research/Vcc/Binaries/vcc"
-        
-        if (not os.path.isfile(vcc_path)):
-                print("%s is not a binary." % vcc_path)
-                print("Please supply the full Cygwin path to Vcc as the second argument.")
-                return
-        
         config = os.path.join(rootdir, "HelenOS.config")
         
         if (not os.path.isfile(config)):
-                print("%s not found." % config)
-                print("Please specify the path to HelenOS build tree root as the first argument.")
+                print "%s not found." % config
+                print "Please specify the path to HelenOS build tree root as the first argument."
                 return
         
-        specpath = os.path.join(rootdir, "tools/checkers/vcc.h")
-        if (not os.path.isfile(specpath)):
-                print("%s not found." % config)
-                return
-        
-        specfile = file(specpath, "r")
-        specification = specfile.read()
-        specfile.close()
-        
         for job in jobs:
-                if (not vcc(vcc_path, rootdir, job)):
+                if (not vcc(rootdir, job)):
                         print
-                        print("Failed job: %s" % job)
+                        print "Failed job: %s" % job
                         return
         
         print
-        print("All jobs passed")
+        print "All jobs passed"
 
 if __name__ == '__main__':