From: Twinaphex <libretro@gmail.com>
Date: Mon, 26 Sep 2016 23:43:09 +0000 (+0200)
Subject: Merge pull request #71 from frangarcj/master
X-Git-Tag: r24l~827
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ee47f3f4d639d551b187e3eef39490fa859758;hp=1024d6ba608b718ce33d559b7b433e948b4d0e9a;p=pcsx_rearmed.git

Merge pull request #71 from frangarcj/master

Optimizations and quit error
---

diff --git a/Makefile b/Makefile
index 7360770a..600a1d3a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ifeq ($(DEBUG), 1)
 CFLAGS += -O0 -ggdb
 else
 ifeq ($(platform), vita)
-CFLAGS += -O1 -DNDEBUG
+CFLAGS += -O3 -DNDEBUG
 else
 CFLAGS += -O2 -DNDEBUG
 endif
diff --git a/Makefile.libretro b/Makefile.libretro
index 1aae08e3..a7fa0ebb 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -120,6 +120,7 @@ else ifeq ($(platform), vita)
 	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
 	CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables 
 	CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
+	CFLAGS +=  -fno-optimize-sibling-calls
 	CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
 	CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
 	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 2efccfac..81afc30d 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -281,15 +281,16 @@ psx_map_t custom_psx_maps[] = {
 
 int init_vita_mmap(){
   int n;
+  void * tmpaddr;
   addr = malloc(64*1024*1024);
   if(addr==NULL)
     return -1;
-  addr = ((u32)(addr+0xFFFFFF))&~0xFFFFFF;
-  custom_psx_maps[0].buffer=addr+0x2000000;
-  custom_psx_maps[1].buffer=addr+0x1800000;
-  custom_psx_maps[2].buffer=addr+0x1c00000;
-  custom_psx_maps[3].buffer=addr+0x0000000;
-  custom_psx_maps[4].buffer=addr+0x1000000;
+  tmpaddr = ((u32)(addr+0xFFFFFF))&~0xFFFFFF;
+  custom_psx_maps[0].buffer=tmpaddr+0x2000000;
+  custom_psx_maps[1].buffer=tmpaddr+0x1800000;
+  custom_psx_maps[2].buffer=tmpaddr+0x1c00000;
+  custom_psx_maps[3].buffer=tmpaddr+0x0000000;
+  custom_psx_maps[4].buffer=tmpaddr+0x1000000;
 #if 0
   for(n = 0; n < 5; n++){
     sceClibPrintf("addr reserved %x\n",custom_psx_maps[n].buffer);