From b4a08d0815342b6238d307864f0823d0f07bb691 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 26 May 2020 22:04:20 +0200 Subject: k1c -> kvx changes --- runtime/include/ccomp_k1c_fixes.h | 45 --------------------------------------- runtime/include/ccomp_kvx_fixes.h | 45 +++++++++++++++++++++++++++++++++++++++ runtime/include/math.h | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 runtime/include/ccomp_k1c_fixes.h create mode 100644 runtime/include/ccomp_kvx_fixes.h (limited to 'runtime/include') diff --git a/runtime/include/ccomp_k1c_fixes.h b/runtime/include/ccomp_k1c_fixes.h deleted file mode 100644 index c884ae23..00000000 --- a/runtime/include/ccomp_k1c_fixes.h +++ /dev/null @@ -1,45 +0,0 @@ -/* *************************************************************/ -/* */ -/* The Compcert verified compiler */ -/* */ -/* Sylvain Boulmé Grenoble-INP, VERIMAG */ -/* David Monniaux CNRS, VERIMAG */ -/* Cyril Six Kalray */ -/* */ -/* Copyright Kalray. Copyright VERIMAG. All rights reserved. */ -/* This file is distributed under the terms of the INRIA */ -/* Non-Commercial License Agreement. */ -/* */ -/* *************************************************************/ - - -#ifndef __CCOMP_KIC_FIXES_H -#define __CCOMP_KIC_FIXES_H - -#if ! (defined(__COMPCERT__) && defined (__K1C__)) -#error This header is solely for CompCert on K1C -#endif - -#undef __GNUC__ -#define __thread _Thread_local - -struct __int128_ccomp { long __int128_ccomp_low; long __int128_ccomp_high; }; - -#define __int128 struct __int128_ccomp - -#define __builtin_k1_acswapd __compcert_acswapd -extern __int128 __compcert_acswapd(void *address, unsigned long long new_value, unsigned long long old_value); - -#define __builtin_k1_acswapw __compcert_acswapw -extern __int128 __compcert_acswapw(void *address, unsigned long long new_value, unsigned long long old_value); - -#define __builtin_k1_afaddd __compcert_afaddd -extern long long __compcert_afaddd(void *address, unsigned long long incr); - -#define __builtin_k1_afaddw __compcert_afaddw -extern int __compcert_afaddw(void *address, unsigned int incr); -#endif - -/* #define __builtin_expect(x, y) (x) */ -#define __builtin_ctz(x) __builtin_k1_ctzw(x) -#define __builtin_clz(x) __builtin_k1_clzw(x) diff --git a/runtime/include/ccomp_kvx_fixes.h b/runtime/include/ccomp_kvx_fixes.h new file mode 100644 index 00000000..65d65e7b --- /dev/null +++ b/runtime/include/ccomp_kvx_fixes.h @@ -0,0 +1,45 @@ +/* *************************************************************/ +/* */ +/* The Compcert verified compiler */ +/* */ +/* Sylvain Boulmé Grenoble-INP, VERIMAG */ +/* David Monniaux CNRS, VERIMAG */ +/* Cyril Six Kalray */ +/* */ +/* Copyright Kalray. Copyright VERIMAG. All rights reserved. */ +/* This file is distributed under the terms of the INRIA */ +/* Non-Commercial License Agreement. */ +/* */ +/* *************************************************************/ + + +#ifndef __CCOMP_KIC_FIXES_H +#define __CCOMP_KIC_FIXES_H + +#if ! (defined(__COMPCERT__) && defined (__KVX__)) +#error This header is solely for CompCert on KVX +#endif + +#undef __GNUC__ +#define __thread _Thread_local + +struct __int128_ccomp { long __int128_ccomp_low; long __int128_ccomp_high; }; + +#define __int128 struct __int128_ccomp + +#define __builtin_kvx_acswapd __compcert_acswapd +extern __int128 __compcert_acswapd(void *address, unsigned long long new_value, unsigned long long old_value); + +#define __builtin_kvx_acswapw __compcert_acswapw +extern __int128 __compcert_acswapw(void *address, unsigned long long new_value, unsigned long long old_value); + +#define __builtin_kvx_afaddd __compcert_afaddd +extern long long __compcert_afaddd(void *address, unsigned long long incr); + +#define __builtin_kvx_afaddw __compcert_afaddw +extern int __compcert_afaddw(void *address, unsigned int incr); +#endif + +/* #define __builtin_expect(x, y) (x) */ +#define __builtin_ctz(x) __builtin_kvx_ctzw(x) +#define __builtin_clz(x) __builtin_kvx_clzw(x) diff --git a/runtime/include/math.h b/runtime/include/math.h index 422787e1..e7c9e475 100644 --- a/runtime/include/math.h +++ b/runtime/include/math.h @@ -15,7 +15,7 @@ #ifndef _COMPCERT_MATH_H #define _COMPCERT_MATH_H -#ifdef __K1C__ +#ifdef __KVX__ #define isfinite(__y) (fpclassify((__y)) >= FP_ZERO) -- cgit