From 52f23f8c34bd9f6eacd31e8dff70066ca2aeb4e1 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Thu, 9 Mar 2017 14:25:24 +0100 Subject: compiler: Add compute_int functionality. Fixes #435 --- mesonbuild/compilers.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 8c2bb92..d1a564b 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1010,6 +1010,34 @@ class CCompiler(Compiler): return i raise EnvironmentException('Cross-compile check overflowed') + def cross_compute_int(self, fragment, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: + extra_args = [] + fargs = {'prefix': prefix, 'fragment': fragment} + t = '''#include + {prefix} + int temparray[{size}-({fragment})];''' + return self._bisect_compiles(t, fargs, env, extra_args, dependencies) + + def compute_int(self, fragment, prefix, env, extra_args=None, dependencies=None): + if extra_args is None: + extra_args = [] + fargs = {'prefix': prefix, 'fragment': fragment} + if self.is_cross: + return self.cross_compute_int(fragment, prefix, env, extra_args, dependencies) + t = '''#include + {prefix} + int main(int argc, char **argv) {{ + printf("%ld\\n", (long)({fragment})); + return 0; + }};''' + res = self.run(t.format(**fargs), env, extra_args, dependencies) + if not res.compiled: + return -1 + if res.returncode != 0: + raise EnvironmentException('Could not run compute_int test binary.') + return int(res.stdout) + def cross_sizeof(self, element, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] -- cgit v1.1 From 1e2c914b3c508e1749890be85867e1f51336ece1 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Fri, 10 Mar 2017 11:40:48 +0100 Subject: compiler: Fix compute_int and sizeof for cross compilation. sizeof now uses compute_int which again binary searches for correct value. --- mesonbuild/compilers.py | 60 +++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 29 deletions(-) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index d1a564b..403dda1 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -998,37 +998,43 @@ class CCompiler(Compiler): mlog.debug(se) return RunResult(True, pe.returncode, so, se) - def _bisect_compiles(self, t, fargs, env, extra_args, dependencies): - # FIXME: Does not actually do bisection right now - for i in range(1, 1024): - fargs['size'] = i - if self.compiles(t.format(**fargs), env, extra_args, dependencies): - if self.id == 'msvc': - # MSVC refuses to construct an array of zero size, so - # the test only succeeds when i is sizeof(element) + 1 - return i - 1 - return i - raise EnvironmentException('Cross-compile check overflowed') - - def cross_compute_int(self, fragment, prefix, env, extra_args=None, dependencies=None): - if extra_args is None: - extra_args = [] - fargs = {'prefix': prefix, 'fragment': fragment} + def _compile_int(self, expression, prefix, env, extra_args, dependencies): + fargs = {'prefix': prefix, 'expression': expression} t = '''#include {prefix} - int temparray[{size}-({fragment})];''' - return self._bisect_compiles(t, fargs, env, extra_args, dependencies) + int main() {{ static int a[1-2*!({expression})]; a[0]=0; return 0; }}''' + return self.compiles(t.format(**fargs), env, extra_args, dependencies) + + def cross_compute_int(self, expression, l, h, guess, prefix, env, extra_args, dependencies): + if isinstance(guess, int): + if self._compile_int('%s == %d' % (expression, guess), prefix, env, extra_args, dependencies): + return guess - def compute_int(self, fragment, prefix, env, extra_args=None, dependencies=None): + cur = l + while l < h: + cur = int((l + h) / 2) + if cur == l: + break + + if self._compile_int('%s >= %d' % (expression, cur), prefix, env, extra_args, dependencies): + l = cur + else: + h = cur + + if self._compile_int('%s == %d' % (expression, cur), prefix, env, extra_args, dependencies): + return cur + raise EnvironmentException('Cross-compile check overflowed') + + def compute_int(self, expression, l, h, guess, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'prefix': prefix, 'fragment': fragment} if self.is_cross: - return self.cross_compute_int(fragment, prefix, env, extra_args, dependencies) + return self.cross_compute_int(expression, l, h, guess, prefix, env, extra_args, dependencies) + fargs = {'prefix': prefix, 'expression': expression} t = '''#include {prefix} int main(int argc, char **argv) {{ - printf("%ld\\n", (long)({fragment})); + printf("%ld\\n", (long)({expression})); return 0; }};''' res = self.run(t.format(**fargs), env, extra_args, dependencies) @@ -1049,10 +1055,7 @@ class CCompiler(Compiler): }}''' if not self.compiles(t.format(**fargs), env, extra_args, dependencies): return -1 - t = '''#include - {prefix} - int temparray[{size}-sizeof({name})];''' - return self._bisect_compiles(t, fargs, env, extra_args, dependencies) + return self.cross_compute_int('sizeof(%s)' % element, 1, 128, None, prefix, env, extra_args, dependencies) def sizeof(self, element, prefix, env, extra_args=None, dependencies=None): if extra_args is None: @@ -1087,9 +1090,8 @@ class CCompiler(Compiler): struct tmp {{ char c; {type} target; - }}; - int testarray[{size}-offsetof(struct tmp, target)];''' - return self._bisect_compiles(t, fargs, env, extra_args, dependencies) + }};''' + return self.cross_compute_int('offsetof(struct tmp, target)', 1, 1024, None, t.format(**fargs), env, extra_args, dependencies) def alignment(self, typename, env, extra_args=None, dependencies=None): if extra_args is None: -- cgit v1.1 From c9fe3a3ad4f58e2a263f8fc30c21bc009c109480 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Fri, 10 Mar 2017 11:55:05 +0100 Subject: compiler: Ensure prefix and dependencies are used for alignment. This is now similar to how prefix and dependencies are used in all the other similar checks performed by the compiler. --- mesonbuild/compilers.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 403dda1..65a611f 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1076,31 +1076,34 @@ class CCompiler(Compiler): raise EnvironmentException('Could not run sizeof test binary.') return int(res.stdout) - def cross_alignment(self, typename, env, extra_args=None, dependencies=None): + def cross_alignment(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'type': typename} + fargs = {'prefix': prefix, 'type': typename} t = '''#include + {prefix} int main(int argc, char **argv) {{ {type} something; }}''' if not self.compiles(t.format(**fargs), env, extra_args, dependencies): return -1 t = '''#include + {prefix} struct tmp {{ char c; {type} target; }};''' return self.cross_compute_int('offsetof(struct tmp, target)', 1, 1024, None, t.format(**fargs), env, extra_args, dependencies) - def alignment(self, typename, env, extra_args=None, dependencies=None): + def alignment(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] if self.is_cross: - return self.cross_alignment(typename, env, extra_args, dependencies) - fargs = {'type': typename} + return self.cross_alignment(typename, prefix, env, extra_args, dependencies) + fargs = {'prefix': prefix, 'type': typename} t = '''#include #include + {prefix} struct tmp {{ char c; {type} target; -- cgit v1.1 From 2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Fri, 10 Mar 2017 11:56:45 +0100 Subject: compiler: Rename element argument of sizeof to typename. --- mesonbuild/compilers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mesonbuild/compilers.py') diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 65a611f..1fb9c5a 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1044,29 +1044,29 @@ class CCompiler(Compiler): raise EnvironmentException('Could not run compute_int test binary.') return int(res.stdout) - def cross_sizeof(self, element, prefix, env, extra_args=None, dependencies=None): + def cross_sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'prefix': prefix, 'name': element} + fargs = {'prefix': prefix, 'type': typename} t = '''#include {prefix} int main(int argc, char **argv) {{ - {name} something; + {type} something; }}''' if not self.compiles(t.format(**fargs), env, extra_args, dependencies): return -1 - return self.cross_compute_int('sizeof(%s)' % element, 1, 128, None, prefix, env, extra_args, dependencies) + return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) - def sizeof(self, element, prefix, env, extra_args=None, dependencies=None): + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'prefix': prefix, 'name': element} + fargs = {'prefix': prefix, 'type': typename} if self.is_cross: - return self.cross_sizeof(element, prefix, env, extra_args, dependencies) + return self.cross_sizeof(typename, prefix, env, extra_args, dependencies) t = '''#include {prefix} int main(int argc, char **argv) {{ - printf("%ld\\n", (long)(sizeof({name}))); + printf("%ld\\n", (long)(sizeof({type}))); return 0; }};''' res = self.run(t.format(**fargs), env, extra_args, dependencies) -- cgit v1.1