Changeset bd48f4c in mainline for tools/checkers/vcc.py

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

tools/checkers/vcc.py

@@ -36 +36 @@
 import subprocess
 import jobfile
+import re
 
 jobs = [
-        "kernel/kernel.job",
-        "uspace/srv/clip/clip.job"
+        "kernel/kernel.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>"
+        print prname + " <ROOT> [VCC_PATH]"
 
 def cygpath(upath):
@@ -54 +59 @@
         "Preprocess source using GCC preprocessor and compatibility tweaks"
         
+        global specification
+        
         args = ['gcc', '-E']
         args.extend(options.split())
-        args.append(srcfname)
+        args.extend(['-DCONFIG_VERIFY_VCC=1', srcfname])
         
         # Change working directory
@@ -66 +73 @@
         
         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)
         
@@ -80 +100 @@
         return True
 
-def vcc(root, job):
+def vcc(vcc_path, root, job):
         "Run Vcc on a jobfile"
         
@@ -120 +140 @@
                 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"):
@@ -130 +153 @@
                 
                 # Run Vcc
-                
-                retval = subprocess.Popen(['vcc', cygpath(tmpfqname)]).wait()
-                
-                # Cleanup
+                print " -- %s --" % srcfname            
+                retval = subprocess.Popen([vcc_path, '/pointersize:32', '/newsyntax', cygpath(tmpfqname)]).wait()
+                
+                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)
-                
-                if (retval != 0):
-                        return False
+                        os.remove(vccfqname)
         
         return True
 
 def main():
+        global specification
+        
         if (len(sys.argv) < 2):
                 usage(sys.argv[0])
@@ -149 +176 @@
         
         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")
         
@@ -156 +193 @@
                 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(rootdir, job)):
+                if (not vcc(vcc_path, rootdir, job)):
                         print
                         print "Failed job: %s" % job