Changes in tools/autotool.py [9539be6:a4125fb1] in mainline

File:

• tools/autotool.py (modified) (12 diffs)

tools/autotool.py

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