From 268f298fad34bb4deb16ed9d9625de9ca89fa5ea Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 12 Mar 2016 09:28:25 +0100 Subject: [PATCH] More elegant workaround for 32-bit architecutres --- .../volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h index a7905d71d..1198044a7 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic.h @@ -61,7 +61,7 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_generic(lv_16sc_t* volk_gnsssdr_free(in_a); } -#endif // Generic +#endif /* Generic */ #ifdef LV_HAVE_SSE2 static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) @@ -83,12 +83,10 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_a_sse2(lv_16sc_t* r volk_gnsssdr_free(in_a); } -#endif // SSE2 +#endif /* SSE2 */ -#define WORKAROUND 1 -#ifdef WORKAROUND -#ifdef LV_HAVE_SSE2 +#if LV_HAVE_SSE2 && LV_HAVE_64 static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, const lv_16sc_t* in, unsigned int num_points) { @@ -108,8 +106,8 @@ static inline void volk_gnsssdr_16ic_x2_dotprodxnpuppet_16ic_u_sse2(lv_16sc_t* r } volk_gnsssdr_free(in_a); } -#endif -#endif // SSE2 + +#endif /* LV_HAVE_SSE2 && LV_HAVE_64 */ #ifdef LV_HAVE_NEON