From: notaz <notasas@gmail.com>
Date: Thu, 14 Jul 2022 22:35:48 +0000 (+0300)
Subject: libnx: try to enable the ari64 dynarec
X-Git-Tag: r24l~447
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;h=80bf8832784199adf6eb5ab5a63dafed086d3401;p=pcsx_rearmed.git

libnx: try to enable the ari64 dynarec

If it crashes please report (logs required).
---

diff --git a/Makefile.libretro b/Makefile.libretro
index 33e87084..e17f2960 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -191,7 +191,7 @@ else ifeq ($(platform), libnx)
    ARCH := arm64
    BUILTIN_GPU = unai
    HAVE_VFS_FD = 0
-   CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition -include $(LIBNX)/include/switch.h
+   CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition # -include $(LIBNX)/include/switch.h
    CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs -DNO_OS -DNO_DYLIB -DNO_SOCKET -D__arm64__ -D__ARM_NEON__
    CFLAGS += -D__SWITCH__
    CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -DHAVE_INTTYPES -DLSB_FIRST -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
@@ -199,8 +199,7 @@ else ifeq ($(platform), libnx)
    CFLAGS += -Ifrontend/switch -ftree-vectorize
    LIBPTHREAD :=
    STATIC_LINKING=1
-   # Lightning requires rw/rx patches first
-   DYNAREC := 0
+   DYNAREC = ari64
 
 # Lakka Switch (arm64)
 else ifeq ($(platform), arm64)
diff --git a/frontend/switch/sys/mman.h b/frontend/switch/sys/mman.h
index 5e8d22ef..211e09d5 100644
--- a/frontend/switch/sys/mman.h
+++ b/frontend/switch/sys/mman.h
@@ -23,8 +23,8 @@ extern "C" {
 
 #define MAP_FAILED      ((void *)-1)
 
-static void* dynarec_cache = NULL;
-static void* dynarec_cache_mapping = NULL;
+//static void* dynarec_cache = NULL;
+//static void* dynarec_cache_mapping = NULL;
 
 static inline void* mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {