From 30431e75ec64d737a4253d56bc1fba7b5215007d Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 17 Nov 2024 04:48:14 +0200 Subject: [PATCH] try another macro for arm vfp --- frontend/main.c | 6 +++--- plugins/gpulib/gpulib_thread_if.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/main.c b/frontend/main.c index 9aeece96..42a90d47 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -513,14 +513,14 @@ int emu_core_init(void) SysPrintf("Starting PCSX-ReARMed " REV "%s\n", get_build_info()); SysPrintf("build time: " __DATE__ " " __TIME__ "\n"); -#if defined(__arm__) && defined(__VFP_FP__) +#if defined(__arm__) && defined(__ARM_FP) // RunFast mode u32 fpscr = ~0; - __asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr)); + __asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr)); SysPrintf("old fpscr = %08x\n", fpscr); fpscr &= ~0x00009f9f; fpscr |= 0x03000000; // DN | FZ - __asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr)); + __asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr)); #endif #ifdef HAVE_RTHREADS diff --git a/plugins/gpulib/gpulib_thread_if.c b/plugins/gpulib/gpulib_thread_if.c index 6f927db6..c625c552 100644 --- a/plugins/gpulib/gpulib_thread_if.c +++ b/plugins/gpulib/gpulib_thread_if.c @@ -76,13 +76,13 @@ static void *video_thread_main(void *arg) { static int processed = 0; #endif /* _3DS */ -#if defined(__arm__) && defined(__VFP_FP__) +#if defined(__arm__) && defined(__ARM_FP) // RunFast mode u32 fpscr = ~0; - __asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr)); + __asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr)); fpscr &= ~0x00009f9f; fpscr |= 0x03000000; // DN | FZ - __asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr)); + __asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr)); #endif while(1) {