Merge branch 'master' into libretro

notaz · Nov 17, 2024 · e3d7ea4 · e3d7ea4
2 parents 9ee9a7b + 30431e7
commit e3d7ea4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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) {