Merge branch 'master' into libretro

notaz · Dec 18, 2024 · b0c8040 · b0c8040
2 parents c3f78cc + 86a5ff1
commit b0c8040
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
@@ -24,6 +24,9 @@
 #include "../../frontend/libretro-rthreads.h"
 #include "features/features_cpu.h"
 #include "retro_timers.h"
+#ifdef VITA
+#include <psp2/kernel/sysmem.h>
+#endif
 #endif
 #ifdef _3DS
 #include <3ds_utils.h>
@@ -446,6 +449,10 @@ static void ari64_compile_thread(void *unused)
 	void *target;
 	u32 addr;
 
+#ifdef VITA
+	int ret = sceKernelOpenVMDomain();
+	if (ret) SysPrintf("thread: sceKernelOpenVMDomain: %x\n", ret);
+#endif
 	slock_lock(ndrc_g.thread.lock);
 	while (!ndrc_g.thread.exit)
 	{

diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -6334,9 +6334,11 @@ void new_dynarec_init(void)
   if (sceBlock <= 0)
     SysPrintf("getVMBlock failed: %x\n", sceBlock);
   int ret = sceKernelGetMemBlockBase(sceBlock, (void **)&ndrc);
-  if (ret < 0)
-    SysPrintf("sceKernelGetMemBlockBase failed: %x\n", ret);
-  sceKernelOpenVMDomain();
+  if (ret)
+    SysPrintf("sceKernelGetMemBlockBase: %x\n", ret);
+  ret = sceKernelOpenVMDomain();
+  if (ret)
+    SysPrintf("sceKernelOpenVMDomain: %x\n", ret);
   #elif defined(_MSC_VER)
   ndrc = VirtualAlloc(NULL, sizeof(*ndrc), MEM_COMMIT | MEM_RESERVE,
     PAGE_EXECUTE_READWRITE);