Changeset 270bf4f in mainline

Timestamp:

2015-03-15T00:05:49Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a420203

Parents:

7f9d97f3

Message:

use intrinsic 128-bit integer type if available

Files:

• kernel/generic/include/typedefs.h (modified) (1 diff)
• tools/autotool.py (modified) (6 diffs)
• uspace/lib/c/arch/ia64/include/libarch/types.h (modified) (1 diff)

kernel/generic/include/typedefs.h

@@ -47 +47 @@
 
 typedef struct {
-        uint64_t lo;
-        int64_t hi;
-} __attribute__ ((aligned(16))) int128_t;
-
-typedef struct {
-        uint64_t lo;
-        uint64_t hi;
-} __attribute__ ((aligned(16))) uint128_t;
-
-typedef struct {
         volatile atomic_count_t count;
 } atomic_t;

tools/autotool.py

@@ -99 +99 @@
 
 PROBE_TAIL = """}
+"""
+
+PROBE_INT128_HEAD = """#define AUTOTOOL_DECLARE(category, subcategory, tag, name, strc, conc, value) \\
+        asm volatile ( \\
+                "AUTOTOOL_DECLARE\\t" category "\\t" subcategory "\\t" tag "\\t" name "\\t" strc "\\t" conc "\\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));
+
+int main(int argc, char *argv[])
+{
+"""
+
+PROBE_INT128_TAIL = """}
 """
 
@@ -510 +528 @@
         return {'unsigned_sizes': unsigned_sizes, 'signed_sizes': signed_sizes, 'unsigned_tags': unsigned_tags, 'signed_tags': signed_tags, 'unsigned_strcs': unsigned_strcs, 'signed_strcs': signed_strcs, 'unsigned_concs': unsigned_concs, 'signed_concs': signed_concs, 'float_tags': float_tags, 'builtin_sizes': builtin_sizes, 'builtin_signs': builtin_signs}
 
+def probe_int128(common):
+        "Generate, compile and parse probing source for 128-bit integers"
+        
+        check_common(common, "CC")
+        
+        outf = open(PROBE_SOURCE, 'w')
+        outf.write(PROBE_INT128_HEAD)
+        outf.write("\tDECLARE_INTSIZE(\"INT128\", int __attribute((mode(TI))));\n")
+        outf.write(PROBE_INT128_TAIL)
+        outf.close()
+        
+        args = [common['CC']]
+        args.extend(common['CC_ARGS'])
+        args.extend(["-S", "-o", PROBE_OUTPUT, PROBE_SOURCE])
+        
+        try:
+                sys.stderr.write("Checking whether the compiler has intrinsic support for 128-bit integers ... ")
+                output = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.PIPE).communicate()
+        except:
+                sys.stderr.write("no\n")
+                return False
+        
+        if (not os.path.isfile(PROBE_OUTPUT)):
+                sys.stderr.write("no\n")
+                return False
+        
+        inf = open(PROBE_OUTPUT, 'r')
+        lines = inf.readlines()
+        inf.close()
+        
+        for j in range(len(lines)):
+                tokens = lines[j].strip().split("\t")
+                
+                if (len(tokens) > 0):
+                        if (tokens[0] == "AUTOTOOL_DECLARE"):
+                                if (len(tokens) < 7):
+                                        print_error(["Malformed declaration in \"%s\" on line %s." % (PROBE_OUTPUT, j), COMPILER_FAIL])
+                                
+                                category = tokens[1]
+                                subcategory = tokens[2]
+                                tag = tokens[3]
+                                name = tokens[4]
+                                strc = tokens[5]
+                                conc = tokens[6]
+                                value = tokens[7]
+                                
+                                if (category == "intsize"):
+                                        try:
+                                                value_int = decode_value(value)
+                                        except:
+                                                print_error(["Integer value expected in \"%s\" on line %s." % (PROBE_OUTPUT, j), COMPILER_FAIL])
+                                        
+                                        if (subcategory == "unsigned"):
+                                                if (value_int != 16):
+                                                        sys.stderr.write("no\n")
+                                                        return False
+                                        elif (subcategory == "signed"):
+                                                if (value_int != 16):
+                                                        sys.stderr.write("no\n")
+                                                        return False
+                                        else:
+                                                print_error(["Unexpected keyword \"%s\" in \"%s\" on line %s." % (subcategory, PROBE_OUTPUT, j), COMPILER_FAIL])
+        
+        sys.stderr.write("yes\n")
+        return True
+
 def detect_sizes(probe, bytes, inttags, floattags):
         "Detect correct types for fixed-size types"
@@ -683 +767 @@
         outmk.close()
 
-def create_header(hdname, maps):
+def create_header(hdname, maps, int128):
         "Create header output"
         
@@ -703 +787 @@
         for typedef in maps['typedefs']:
                 outhd.write('typedef %s %s;\n' % (typedef['oldtype'], typedef['newtype']))
+        
+        if (int128):
+                outhd.write('typedef unsigned int __attribute((mode(TI))) uint128_t;\n')
+                outhd.write('typedef signed int __attribute((mode(TI))) int128_t;\n')
         
         outhd.write('\n#endif\n')
@@ -845 +933 @@
                 )
                 
+                int128 = probe_int128(common)
+                
                 maps = detect_sizes(probe, [1, 2, 4, 8], ['CHAR', 'SHORT', 'INT', 'LONG', 'LLONG'], ['LONG_DOUBLE', 'DOUBLE', 'FLOAT'])
                 
@@ -851 +941 @@
         
         common['AUTOGEN'] = "%s/autogen.py" % os.path.dirname(os.path.abspath(sys.argv[0]))
-
+        
         create_makefile(MAKEFILE, common)
-        create_header(HEADER, maps)
+        create_header(HEADER, maps, int128)
         
         return 0

uspace/lib/c/arch/ia64/include/libarch/types.h

@@ -46 +46 @@
 #define SSIZE_MAX  INT64_MAX
 
-typedef struct {
-        uint64_t lo;
-        int64_t hi;
-} __attribute__((aligned(16))) int128_t;
-
-typedef struct {
-        uint64_t lo;
-        uint64_t hi;
-} __attribute__((aligned(16))) uint128_t;
-
 typedef uint64_t sysarg_t;
 typedef int64_t native_t;