From c7b746f050d33e3bb5b06707dcc52f8699858e40 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 1 Apr 2013 01:23:59 +0300
Subject: libretro/ios: enable dynarec, update target names

---
 Makefile.libretro                     | 24 ++++++++++++------------
 libpcsxcore/new_dynarec/new_dynarec.c |  8 ++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index bb07fc3..8e756c9 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -19,61 +19,61 @@ AS ?= as
 CC_AS ?= $(CC)
 
 ifeq ($(platform), unix)
-   TARGET := snes9x_next_libretro.so
+   TARGET := libretro_pcsx_rearmed.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=libretro/link.T
 else ifeq ($(platform), osx)
-   TARGET := snes9x_next_libretro.dylib
+   TARGET := libretro_pcsx_rearmed.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 else ifeq ($(platform), ios)
 ARCH := arm
-   TARGET := snes9x_next_libretro.dylib
+   TARGET := libretro_pcsx_rearmed.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 
    CC = clang -arch armv7 -isysroot $(IOSSDK)
    CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
    CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
    ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
    HAVE_NEON = 1
 #TODO
 #   BUILTIN_GPU = neon
-#   USE_DYNAREC = 1
+   USE_DYNAREC = 1
    CFLAGS += -DIOS
 else ifeq ($(platform), ps3)
-   TARGET := snes9x_next_libretro_ps3.a
+   TARGET := libretro_pcsx_rearmed_ps3.a
    CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
    AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), sncps3)
-   TARGET := snes9x_next_libretro_ps3.a
+   TARGET := libretro_pcsx_rearmed_ps3.a
    CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
    AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), psl1ght)
-   TARGET := snes9x_next_libretro_psl1ght.a
+   TARGET := libretro_pcsx_rearmed_psl1ght.a
    CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
    AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
    CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), psp1)
-	TARGET := snes9x_next_libretro_psp1.a
+	TARGET := libretro_pcsx_rearmed_psp1.a
 	CC = psp-gcc$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
 	CFLAGS += -DPSP -G0
 else ifeq ($(platform), xenon)
-   TARGET := snes9x_next_libretro_xenon360.a
+   TARGET := libretro_pcsx_rearmed_xenon360.a
    CC = xenon-gcc$(EXE_EXT)
    AR = xenon-ar$(EXE_EXT)
    CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
 else ifeq ($(platform), ngc)
-   TARGET := snes9x_next_libretro_ngc.a
+   TARGET := libretro_pcsx_rearmed_ngc.a
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
    CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), wii)
-   TARGET := snes9x_next_libretro_wii.a
+   TARGET := libretro_pcsx_rearmed_wii.a
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
    CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
index 4255917..8437008 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -44,6 +44,14 @@
 #ifdef __BLACKBERRY_QNX__
 #undef __clear_cache
 #define __clear_cache(start,end) msync(start, (size_t)((void*)end - (void*)start), MS_SYNC | MS_CACHE_ONLY | MS_INVALIDATE_ICACHE);
+#elif defined(__MACH__)
+#include <libkern/OSCacheControl.h>
+#define __clear_cache mach_clear_cache
+static void __clear_cache(void *start, void *end) {
+  size_t len = (char *)end - (char *)start;
+  sys_dcache_flush(start, len);
+  sys_icache_invalidate(start, len);
+}
 #endif
 
 #define MAXBLOCK 4096
-- 
cgit v1.2.3