diff options
author | hayati ayguen <h_ayguen@web.de> | 2020-08-28 04:07:44 +0200 |
---|---|---|
committer | hayati ayguen <h_ayguen@web.de> | 2020-08-28 04:07:44 +0200 |
commit | 794551766bcaeeed75a65ec836e61ac6d573dc4f (patch) | |
tree | fe2d05b659086b10c6a1875c6b3841024932b0d5 | |
parent | a748cde6e596bef575ba559b1097afab7e69711f (diff) | |
download | pffft-794551766bcaeeed75a65ec836e61ac6d573dc4f.tar.gz |
fix compilation with MSVC "CL 19.00"
Signed-off-by: hayati ayguen <h_ayguen@web.de>
-rw-r--r-- | pffft_priv_impl.h | 13 | ||||
-rw-r--r-- | simd/pf_altivec_float.h | 2 | ||||
-rw-r--r-- | simd/pf_avx_double.h | 2 | ||||
-rw-r--r-- | simd/pf_double.h | 2 | ||||
-rw-r--r-- | simd/pf_float.h | 2 | ||||
-rw-r--r-- | simd/pf_neon_float.h | 4 | ||||
-rw-r--r-- | simd/pf_scalar_double.h | 8 | ||||
-rw-r--r-- | simd/pf_scalar_float.h | 8 | ||||
-rw-r--r-- | simd/pf_sse1_float.h | 4 |
9 files changed, 23 insertions, 22 deletions
diff --git a/pffft_priv_impl.h b/pffft_priv_impl.h index 36cae59..2d22aab 100644 --- a/pffft_priv_impl.h +++ b/pffft_priv_impl.h @@ -1825,15 +1825,16 @@ static void pffft_assert1( float result, float ref, const char * vartxt, const c } } -static void pffft_assert4( const v4sf_union V, float a, float b, float c, float d, const char * functxt, int * numErrs, const char * f, int lineNo ) +static void pffft_assert4( vsfscalar v0, vsfscalar v1, vsfscalar v2, vsfscalar v3, + float a, float b, float c, float d, const char * functxt, int * numErrs, const char * f, int lineNo ) { - pffft_assert1( V.f[0], a, "[0]", functxt, numErrs, f, lineNo ); - pffft_assert1( V.f[1], b, "[1]", functxt, numErrs, f, lineNo ); - pffft_assert1( V.f[2], c, "[2]", functxt, numErrs, f, lineNo ); - pffft_assert1( V.f[3], d, "[3]", functxt, numErrs, f, lineNo ); + pffft_assert1( v0, a, "[0]", functxt, numErrs, f, lineNo ); + pffft_assert1( v1, b, "[1]", functxt, numErrs, f, lineNo ); + pffft_assert1( v2, c, "[2]", functxt, numErrs, f, lineNo ); + pffft_assert1( v3, d, "[3]", functxt, numErrs, f, lineNo ); } -#define PFFFT_ASSERT4( V, a, b, c, d, FUNCTXT ) pffft_assert4( V, a, b, c, d, FUNCTXT, &numErrs, __FILE__, __LINE__ ) +#define PFFFT_ASSERT4( V, a, b, c, d, FUNCTXT ) pffft_assert4( (V).f[0], (V).f[1], (V).f[2], (V).f[3], a, b, c, d, FUNCTXT, &numErrs, __FILE__, __LINE__ ) int FUNC_VALIDATE_SIMD_EX(FILE * DbgOut) diff --git a/simd/pf_altivec_float.h b/simd/pf_altivec_float.h index 30e3f18..ef2526d 100644 --- a/simd/pf_altivec_float.h +++ b/simd/pf_altivec_float.h @@ -37,7 +37,7 @@ Altivec support macros */ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__)) -#pragma message __FILE__ ": ALTIVEC float macros are defined" +#pragma message( __FILE__ ": ALTIVEC float macros are defined" ) typedef vector float v4sf; # define SIMD_SZ 4 diff --git a/simd/pf_avx_double.h b/simd/pf_avx_double.h index 62c9123..fe0efa8 100644 --- a/simd/pf_avx_double.h +++ b/simd/pf_avx_double.h @@ -47,7 +47,7 @@ AVX support macros */ #if !defined(SIMD_SZ) && !defined(PFFFT_SIMD_DISABLE) && defined(__AVX__) -#pragma message __FILE__ ": AVX macros are defined" +#pragma message( __FILE__ ": AVX macros are defined" ) #include <immintrin.h> typedef __m256d v4sf; diff --git a/simd/pf_double.h b/simd/pf_double.h index c6bac31..2052bbd 100644 --- a/simd/pf_double.h +++ b/simd/pf_double.h @@ -63,7 +63,7 @@ typedef double vsfscalar; #ifndef SIMD_SZ # if !defined(PFFFT_SIMD_DISABLE) -# warning "building double with simd disabled !\n"; +# pragma message( "building double with simd disabled !" ) # define PFFFT_SIMD_DISABLE /* fallback to scalar code */ # endif #endif diff --git a/simd/pf_float.h b/simd/pf_float.h index 1798194..eab2723 100644 --- a/simd/pf_float.h +++ b/simd/pf_float.h @@ -65,7 +65,7 @@ typedef float vsfscalar; #ifndef SIMD_SZ # if !defined(PFFFT_SIMD_DISABLE) -# warning "building float with simd disabled !\n"; +# pragma message( "building float with simd disabled !" ) # define PFFFT_SIMD_DISABLE /* fallback to scalar code */ # endif #endif diff --git a/simd/pf_neon_float.h b/simd/pf_neon_float.h index 1bdd370..c7a547f 100644 --- a/simd/pf_neon_float.h +++ b/simd/pf_neon_float.h @@ -37,7 +37,7 @@ ARM NEON support macros */ #if !defined(PFFFT_SIMD_DISABLE) && defined(PFFFT_ENABLE_NEON) && (defined(__arm__) || defined(__aarch64__) || defined(__arm64__)) -#pragma message __FILE__ ": ARM NEON macros are defined" +#pragma message( __FILE__ ": ARM NEON macros are defined" ) # include <arm_neon.h> typedef float32x4_t v4sf; @@ -80,7 +80,7 @@ typedef union v4sf_union { # define VALIGNED(ptr) ((((uintptr_t)(ptr)) & 0x3) == 0) #else -/* #pragma message __FILE__ ": ARM NEON macros are not defined" */ +/* #pragma message( __FILE__ ": ARM NEON macros are not defined" ) */ #endif #endif /* PF_NEON_FLT_H */ diff --git a/simd/pf_scalar_double.h b/simd/pf_scalar_double.h index 8c88c05..b7a1cae 100644 --- a/simd/pf_scalar_double.h +++ b/simd/pf_scalar_double.h @@ -39,7 +39,7 @@ */ #if !defined(SIMD_SZ) && defined(PFFFT_SCALVEC_ENABLED) -#pragma message __FILE__ ": double SCALAR4 macros are defined" +#pragma message( __FILE__ ": double SCALAR4 macros are defined" ) typedef struct { vsfscalar a; @@ -149,12 +149,12 @@ typedef union v4sf_union { } #else -/* #pragma message __FILE__ ": double SCALAR4 macros are not defined" */ +/* #pragma message( __FILE__ ": double SCALAR4 macros are not defined" ) */ #endif #if !defined(SIMD_SZ) -#pragma message __FILE__ ": float SCALAR1 macros are defined" +#pragma message( __FILE__ ": float SCALAR1 macros are defined" ) typedef vsfscalar v4sf; # define SIMD_SZ 1 @@ -177,7 +177,7 @@ typedef union v4sf_union { # define VALIGNED(ptr) ((((uintptr_t)(ptr)) & (sizeof(vsfscalar)-1) ) == 0) #else -/* #pragma message __FILE__ ": double SCALAR1 macros are not defined" */ +/* #pragma message( __FILE__ ": double SCALAR1 macros are not defined" ) */ #endif diff --git a/simd/pf_scalar_float.h b/simd/pf_scalar_float.h index 7e5e894..4588588 100644 --- a/simd/pf_scalar_float.h +++ b/simd/pf_scalar_float.h @@ -39,7 +39,7 @@ */ #if !defined(SIMD_SZ) && defined(PFFFT_SCALVEC_ENABLED) -#pragma message __FILE__ ": float SCALAR4 macros are defined" +#pragma message( __FILE__ ": float SCALAR4 macros are defined" ) typedef struct { vsfscalar a; @@ -149,12 +149,12 @@ typedef union v4sf_union { } #else -/* #pragma message __FILE__ ": float SCALAR4 macros are not defined" */ +/* #pragma message( __FILE__ ": float SCALAR4 macros are not defined" ) */ #endif #if !defined(SIMD_SZ) -#pragma message __FILE__ ": float SCALAR1 macros are defined" +#pragma message( __FILE__ ": float SCALAR1 macros are defined" ) typedef vsfscalar v4sf; # define SIMD_SZ 1 @@ -177,7 +177,7 @@ typedef union v4sf_union { # define VALIGNED(ptr) ((((uintptr_t)(ptr)) & (sizeof(vsfscalar)-1) ) == 0) #else -/* #pragma message __FILE__ ": float SCALAR1 macros are not defined" */ +/* #pragma message( __FILE__ ": float SCALAR1 macros are not defined" ) */ #endif diff --git a/simd/pf_sse1_float.h b/simd/pf_sse1_float.h index 808350a..ac649db 100644 --- a/simd/pf_sse1_float.h +++ b/simd/pf_sse1_float.h @@ -37,7 +37,7 @@ SSE1 support macros */ #if !defined(SIMD_SZ) && !defined(PFFFT_SIMD_DISABLE) && (defined(__x86_64__) || defined(_M_X64) || defined(i386) || defined(_M_IX86)) -#pragma message __FILE__ ": SSE1 float macros are defined" +#pragma message( __FILE__ ": SSE1 float macros are defined" ) #include <xmmintrin.h> typedef __m128 v4sf; @@ -75,7 +75,7 @@ typedef union v4sf_union { # define VALIGNED(ptr) ((((uintptr_t)(ptr)) & 0xF) == 0) #else -/* #pragma message __FILE__ ": SSE1 float macros are not defined" */ +/* #pragma message( __FILE__ ": SSE1 float macros are not defined" ) */ #endif #endif /* PF_SSE1_FLT_H */ |