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

Timestamp:

2010-06-29T17:43:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (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 mainlnie changes.

File:

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

tools/checkers/vcc.py

@@ -45 +45 @@
 re_va_list = re.compile("__builtin_va_list")
 
+specification = ""
+
 def usage(prname):
         "Print usage syntax"
@@ -57 +59 @@
         "Preprocess source using GCC preprocessor and compatibility tweaks"
         
+        global specification
+        
         args = ['gcc', '-E']
         args.extend(options.split())
@@ -69 +73 @@
         
         tmpf = file(tmpfname, "w")
-        
-        tmpf.write("__specification(const char * const \\declspec_atomic_inline;)\n\n");
-        
-        tmpf.write("#define __spec_attr(key, value) \\\n");
-        tmpf.write("    __declspec(System.Diagnostics.Contracts.CodeContract.StringVccAttr, \\\n");
-        tmpf.write("        key, value)\n\n");
+        tmpf.write(specification)
         
         for line in preproc.splitlines():
@@ -155 +154 @@
                 # Run Vcc
                 print " -- %s --" % srcfname            
-                retval = subprocess.Popen([vcc_path, '/pointersize:32', cygpath(tmpfqname)]).wait()
+                retval = subprocess.Popen([vcc_path, '/pointersize:32', '/newsyntax', cygpath(tmpfqname)]).wait()
                 
                 if (retval != 0):
@@ -170 +169 @@
 
 def main():
+        global specification
+        
         if (len(sys.argv) < 2):
                 usage(sys.argv[0])
@@ -192 +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(vcc_path, rootdir, job)):