Changeset bd48f4c in mainline for tools

Timestamp:

2010-07-12T10:53:30Z (15 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.

Location:

tools

Files:

• autotool.py (modified) (12 diffs)
• checkers/vcc.h (added)
• checkers/vcc.py (modified) (8 diffs)

tools/autotool.py

@@ -54 +54 @@
 COMPILER_FAIL = "The compiler is probably not capable to compile HelenOS."
 
-PROBE_HEAD = """#define AUTOTOOL_DECLARE(category, subcategory, name, value) \\
+PROBE_HEAD = """#define AUTOTOOL_DECLARE(category, subcategory, tag, name, value) \\
         asm volatile ( \\
-                "AUTOTOOL_DECLARE\\t" category "\\t" subcategory "\\t" name "\\t%[val]\\n" \\
+                "AUTOTOOL_DECLARE\\t" category "\\t" subcategory "\\t" tag "\\t" name "\\t%[val]\\n" \\
                 : \\
                 : [val] "n" (value) \\
         )
 
-#define DECLARE_INTSIZE(type) \\
-        AUTOTOOL_DECLARE("intsize", "unsigned", #type, sizeof(unsigned type)); \\
-        AUTOTOOL_DECLARE("intsize", "signed", #type, sizeof(signed type))
+#define DECLARE_INTSIZE(tag, type) \\
+        AUTOTOOL_DECLARE("intsize", "unsigned", tag, #type, sizeof(unsigned type)); \\
+        AUTOTOOL_DECLARE("intsize", "signed", tag, #type, sizeof(signed type))
 
 int main(int argc, char *argv[])
@@ -195 +195 @@
         
         for typedef in sizes:
-                outf.write("\tDECLARE_INTSIZE(%s);\n" % typedef)
+                outf.write("\tDECLARE_INTSIZE(\"%s\", %s);\n" % (typedef['tag'], typedef['type']))
         
         outf.write(PROBE_TAIL)
@@ -228 +228 @@
         signed_sizes = {}
         
+        unsigned_tags = {}
+        signed_tags = {}
+        
         for j in range(len(lines)):
                 tokens = lines[j].strip().split("\t")
@@ -238 +241 @@
                                 category = tokens[1]
                                 subcategory = tokens[2]
-                                name = tokens[3]
-                                value = tokens[4]
+                                tag = tokens[3]
+                                name = tokens[4]
+                                value = tokens[5]
                                 
                                 if (category == "intsize"):
@@ -258 +262 @@
                                         if (subcategory == "unsigned"):
                                                 unsigned_sizes[name] = value_int
+                                                unsigned_tags[tag] = value_int
                                         elif (subcategory == "signed"):
                                                 signed_sizes[name] = value_int
+                                                signed_tags[tag] = value_int
                                         else:
                                                 print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_OUTPUT, j), COMPILER_FAIL])
         
-        return {'unsigned_sizes' : unsigned_sizes, 'signed_sizes' : signed_sizes}
-
-def detect_uints(unsigned_sizes, signed_sizes, bytes):
+        return {'unsigned_sizes' : unsigned_sizes, 'signed_sizes' : signed_sizes, 'unsigned_tags': unsigned_tags, 'signed_tags': signed_tags}
+
+def detect_uints(probe, bytes):
         "Detect correct types for fixed-size integer types"
         
+        macros = []
         typedefs = []
         
@@ -274 +281 @@
                 newtype = "uint%s_t" % (b * 8)
                 
-                for name, value in unsigned_sizes.items():
+                for name, value in probe['unsigned_sizes'].items():
                         if (value == b):
                                 oldtype = "unsigned %s" % name
@@ -289 +296 @@
                 newtype = "int%s_t" % (b * 8)
                 
-                for name, value in signed_sizes.items():
+                for name, value in probe['signed_sizes'].items():
                         if (value == b):
                                 oldtype = "signed %s" % name
@@ -300 +307 @@
                                      COMPILER_FAIL])
         
-        return typedefs
+        for tag in ['CHAR', 'SHORT', 'INT', 'LONG', 'LLONG']:
+                fnd = False;
+                newmacro = "U%s" % tag
+                
+                for name, value in probe['unsigned_tags'].items():
+                        if (name == tag):
+                                oldmacro = "UINT%s" % (value * 8)
+                                macros.append({'oldmacro': "%s_MIN" % oldmacro, 'newmacro': "%s_MIN" % newmacro})
+                                macros.append({'oldmacro': "%s_MAX" % oldmacro, 'newmacro': "%s_MAX" % newmacro})
+                                fnd = True
+                                break
+                
+                if (not fnd):
+                        print_error(['Unable to find appropriate size macro for %s' % newmacro,
+                                     COMPILER_FAIL])
+                
+                fnd = False;
+                newmacro = tag
+                
+                for name, value in probe['signed_tags'].items():
+                        if (name == tag):
+                                oldmacro = "INT%s" % (value * 8)
+                                macros.append({'oldmacro': "%s_MIN" % oldmacro, 'newmacro': "%s_MIN" % newmacro})
+                                macros.append({'oldmacro': "%s_MAX" % oldmacro, 'newmacro': "%s_MAX" % newmacro})
+                                fnd = True
+                                break
+                
+                if (not fnd):
+                        print_error(['Unable to find appropriate size macro for %s' % newmacro,
+                                     COMPILER_FAIL])
+        
+        return {'macros': macros, 'typedefs': typedefs}
 
 def create_makefile(mkname, common):
@@ -316 +354 @@
         outmk.close()
 
-def create_header(hdname, typedefs):
+def create_header(hdname, maps):
         "Create header output"
         
@@ -328 +366 @@
         outhd.write('#define %s\n\n' % GUARD)
         
-        for typedef in typedefs:
+        for macro in maps['macros']:
+                outhd.write('#define %s  %s\n' % (macro['newmacro'], macro['oldmacro']))
+        
+        outhd.write('\n')
+        
+        for typedef in maps['typedefs']:
                 outhd.write('typedef %s %s;\n' % (typedef['oldtype'], typedef['newtype']))
         
@@ -465 +508 @@
                 probe = probe_compiler(common,
                         [
-                                "char",
-                                "short int",
-                                "int",
-                                "long int",
-                                "long long int",
+                                {'type': 'char', 'tag': 'CHAR'},
+                                {'type': 'short int', 'tag': 'SHORT'},
+                                {'type': 'int', 'tag': 'INT'},
+                                {'type': 'long int', 'tag': 'LONG'},
+                                {'type': 'long long int', 'tag': 'LLONG'}
                         ]
                 )
                 
-                typedefs = detect_uints(probe['unsigned_sizes'], probe['signed_sizes'], [1, 2, 4, 8])
+                maps = detect_uints(probe, [1, 2, 4, 8])
                 
         finally:
@@ -479 +522 @@
         
         create_makefile(MAKEFILE, common)
-        create_header(HEADER, typedefs)
+        create_header(HEADER, maps)
         
         return 0

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