From: frangarcj <frangarcj@gmail.com>
Date: Tue, 6 Sep 2016 11:54:38 +0000 (+0200)
Subject: (VITA) Another dynarec fix
X-Git-Tag: r24l~839^2~2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e6b42f224f10d8b6f2454da1f5d80735f8e0d6;p=pcsx_rearmed.git

(VITA) Another dynarec fix
---

diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
index 1c0ab56e..56c8a0b4 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -7980,17 +7980,18 @@ void new_dynarec_clear_full()
 void new_dynarec_init()
 {
   SysPrintf("Init new dynarec\n");
-  out=(u_char *)BASE_ADDR;
-#if defined(VITA)
 
-  if (mmap (out, 1<<TARGET_SIZE_2,
+#if defined(VITA)
+  BASE_ADDR=mmap(BASE_ADDR, 1<<TARGET_SIZE_2,
             0,
             0,
-            -1, 0) <= 0) {
+            -1, 0);
+  if (out<=0) {
     SysPrintf("mmap() failed: %s\n", strerror(errno));
   }
-
+  out=(u_char *)BASE_ADDR;
 #else
+  out=(u_char *)BASE_ADDR;
   #if BASE_ADDR_FIXED
     if (mmap (out, 1<<TARGET_SIZE_2,
               PROT_READ | PROT_WRITE | PROT_EXEC,
@@ -8068,7 +8069,7 @@ void new_dynarec_init()
 void new_dynarec_cleanup()
 {
   int n;
-  #if BASE_ADDR_FIXED
+  #if BASE_ADDR_FIXED || defined(VITA)
   if (munmap ((void *)BASE_ADDR, 1<<TARGET_SIZE_2) < 0) {SysPrintf("munmap() failed\n");}
   #endif
   for(n=0;n<4096;n++) ll_clear(jump_in+n);