From 48ac9384af98fb942780aa33b51912e8ded49f74 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sun, 27 Sep 2020 22:57:31 +0200 Subject: [PATCH] Update ScopedFTZ asm for arm64 --- src/sfizz/ScopedFTZ.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sfizz/ScopedFTZ.cpp b/src/sfizz/ScopedFTZ.cpp index 1f5b1c58..22c2c1e4 100644 --- a/src/sfizz/ScopedFTZ.cpp +++ b/src/sfizz/ScopedFTZ.cpp @@ -19,10 +19,14 @@ ScopedFTZ::ScopedFTZ() unsigned mask = _MM_DENORMALS_ZERO_MASK | _MM_FLUSH_ZERO_MASK; registerState = _mm_getcsr(); _mm_setcsr((registerState & (~mask)) | mask); -#elif SFIZZ_HAVE_NEON +#elif SFIZZ_HAVE_NEON && SFIZZ_CPU_FAMILY_ARM intptr_t mask = (1 << 24); asm volatile("vmrs %0, fpscr" : "=r"(registerState)); - asm volatile("vmsr fpscr, %0" : : "ri"((registerState & (~mask)) | mask)); + asm volatile("vmsr fpscr, %0" : : "r"((registerState & (~mask)) | mask)); +#elif SFIZZ_HAVE_NEON && SFIZZ_CPU_FAMILY_AARCH64 + intptr_t mask = (1 << 24); + asm volatile("mrs %0, fpcr" : "=r"(registerState)); + asm volatile("msr fpcr, %0" : : "r"((registerState & (~mask)) | mask)); #endif } @@ -30,7 +34,9 @@ ScopedFTZ::~ScopedFTZ() { #if SFIZZ_HAVE_SSE _mm_setcsr(registerState); -#elif SFIZZ_HAVE_NEON - asm volatile("vmrs %0, fpscr" : : "ri"(registerState)); +#elif SFIZZ_HAVE_NEON && SFIZZ_CPU_FAMILY_ARM + asm volatile("vmrs %0, fpscr" : : "r"(registerState)); +#elif SFIZZ_HAVE_NEON && SFIZZ_CPU_FAMILY_AARCH64 + asm volatile("mrs %0, fpcr" : : "r"(registerState)); #endif }