Changes in tools/checkers/vcc.py [33c4f72:958de16] in mainline

File:

• tools/checkers/vcc.py (modified) (8 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
@@ -73 +66 @@
         
         tmpf = file(tmpfname, "w")
-        tmpf.write(specification)
         
         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)
                 
                 tmpf.write("%s\n" % line)
@@ -100 +80 @@
         return True
 
-def vcc(vcc_path, root, job):
+def vcc(root, job):
         "Run Vcc on a jobfile"
         
@@ -140 +120 @@
                 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"):
@@ -153 +130 @@
                 
                 # 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 +149 @@
         
         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")
         
@@ -193 +156 @@
                 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