Merge branch 'master' into libretro
Some checks failed
CI (Linux arm64) / build-linux (push) Has been cancelled
CI (Linux armhf) / build-linux (push) Has been cancelled
CI (Linux) / build-linux (push) Has been cancelled

This commit is contained in:
notaz 2024-11-17 04:53:44 +02:00
commit e3d7ea45c7
2 changed files with 6 additions and 6 deletions

View File

@ -513,14 +513,14 @@ int emu_core_init(void)
SysPrintf("Starting PCSX-ReARMed " REV "%s\n", get_build_info()); SysPrintf("Starting PCSX-ReARMed " REV "%s\n", get_build_info());
SysPrintf("build time: " __DATE__ " " __TIME__ "\n"); SysPrintf("build time: " __DATE__ " " __TIME__ "\n");
#if defined(__arm__) && defined(__VFP_FP__) #if defined(__arm__) && defined(__ARM_FP)
// RunFast mode // RunFast mode
u32 fpscr = ~0; u32 fpscr = ~0;
__asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr)); __asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr));
SysPrintf("old fpscr = %08x\n", fpscr); SysPrintf("old fpscr = %08x\n", fpscr);
fpscr &= ~0x00009f9f; fpscr &= ~0x00009f9f;
fpscr |= 0x03000000; // DN | FZ fpscr |= 0x03000000; // DN | FZ
__asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr)); __asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr));
#endif #endif
#ifdef HAVE_RTHREADS #ifdef HAVE_RTHREADS

View File

@ -76,13 +76,13 @@ static void *video_thread_main(void *arg) {
static int processed = 0; static int processed = 0;
#endif /* _3DS */ #endif /* _3DS */
#if defined(__arm__) && defined(__VFP_FP__) #if defined(__arm__) && defined(__ARM_FP)
// RunFast mode // RunFast mode
u32 fpscr = ~0; u32 fpscr = ~0;
__asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr)); __asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr));
fpscr &= ~0x00009f9f; fpscr &= ~0x00009f9f;
fpscr |= 0x03000000; // DN | FZ fpscr |= 0x03000000; // DN | FZ
__asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr)); __asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr));
#endif #endif
while(1) { while(1) {