bump version, since this is not the same as last released binary

[picodrive.git] / platform / libretro.c

diff --git a/platform/libretro.c b/platform/libretro.c
index 40dc394..0521f18 100644 (file)
--- a/platform/libretro.c
+++ b/platform/libretro.c
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <errno.h>
 #ifdef __MACH__
 #include <libkern/OSCacheControl.h>
 #endif
@@ -71,8 +72,10 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
 
        req = (void *)addr;
        ret = mmap(req, size, PROT_READ | PROT_WRITE, flags, -1, 0);
-       if (ret == MAP_FAILED)
+       if (ret == MAP_FAILED) {
+               lprintf("mmap(%08lx, %zd) failed: %d\n", addr, size, errno);
                return NULL;
+       }
 
        if (addr != 0 && ret != (void *)addr) {
                lprintf("warning: wanted to map @%08lx, got %p\n",
@@ -102,6 +105,15 @@ void plat_munmap(void *ptr, size_t size)
                munmap(ptr, size);
 }
 
+int plat_mem_set_exec(void *ptr, size_t size)
+{
+       int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC);
+       if (ret != 0)
+               lprintf("mprotect(%p, %zd) failed: %d\n", ptr, size, errno);
+
+       return ret;
+}
+
 void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 {
        memset(vout_buf, 0, 320 * 240 * 2);
@@ -559,9 +571,12 @@ void retro_init(void)
        environ_cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE, &disk_control);
 
        PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80
-               | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC
-               | POPT_ACC_SPRITES|POPT_EN_32X|POPT_EN_PWM
-               | POPT_DIS_32C_BORDER;
+               | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX
+               | POPT_EN_32X|POPT_EN_PWM
+               | POPT_ACC_SPRITES|POPT_DIS_32C_BORDER;
+#ifdef __arm__
+       PicoOpt |= POPT_EN_SVP_DRC;
+#endif
        PsndRate = 44100;
        PicoAutoRgnOrder = 0x184; // US, EU, JP
        PicoCDBuffers = 0;