Skip to content

Commit 30431e7

Browse files
committed
try another macro for arm vfp
1 parent 22346d4 commit 30431e7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

frontend/main.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -513,14 +513,14 @@ int emu_core_init(void)
513513
SysPrintf("Starting PCSX-ReARMed " REV "%s\n", get_build_info());
514514
SysPrintf("build time: " __DATE__ " " __TIME__ "\n");
515515

516-
#if defined(__arm__) && defined(__VFP_FP__)
516+
#if defined(__arm__) && defined(__ARM_FP)
517517
// RunFast mode
518518
u32 fpscr = ~0;
519-
__asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr));
519+
__asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr));
520520
SysPrintf("old fpscr = %08x\n", fpscr);
521521
fpscr &= ~0x00009f9f;
522522
fpscr |= 0x03000000; // DN | FZ
523-
__asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr));
523+
__asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr));
524524
#endif
525525

526526
#ifdef HAVE_RTHREADS

plugins/gpulib/gpulib_thread_if.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ static void *video_thread_main(void *arg) {
7676
static int processed = 0;
7777
#endif /* _3DS */
7878

79-
#if defined(__arm__) && defined(__VFP_FP__)
79+
#if defined(__arm__) && defined(__ARM_FP)
8080
// RunFast mode
8181
u32 fpscr = ~0;
82-
__asm__ volatile("fmrx %0, fpscr" : "=r"(fpscr));
82+
__asm__ volatile("vmrs %0, fpscr" : "=r"(fpscr));
8383
fpscr &= ~0x00009f9f;
8484
fpscr |= 0x03000000; // DN | FZ
85-
__asm__ volatile("fmxr fpscr, %0" :: "r"(fpscr));
85+
__asm__ volatile("vmsr fpscr, %0" :: "r"(fpscr));
8686
#endif
8787

8888
while(1) {

0 commit comments

Comments
 (0)