(VITA) Dynarec working

5 files changed, 47 insertions, 335 deletions

diff --git a/Makefile b/Makefile
index 29f02fd..7360770 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,12 @@ CFLAGS += -Wall -Iinclude -ffast-math
 ifeq ($(DEBUG), 1)
 CFLAGS += -O0 -ggdb
 else
+ifeq ($(platform), vita)
+CFLAGS += -O1 -DNDEBUG
+else
 CFLAGS += -O2 -DNDEBUG
 endif
+endif
 CXXFLAGS += $(CFLAGS)
 #DRC_DBG = 1
 #PCNT = 1
diff --git a/Makefile.libretro b/Makefile.libretro
index 0f6608d..1aae08e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -118,6 +118,8 @@ else ifeq ($(platform), vita)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
 	CFLAGS += -DVITA
 	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 += -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 17b57d9..5594062 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -269,6 +269,8 @@ typedef struct
    enum psxMapTag tag;
 }psx_map_t;
 
+void* addr = NULL;
+
 psx_map_t custom_psx_maps[] = {
    {NULL, NULL, 0x210000, MAP_TAG_RAM},   // 0x80000000
    {NULL, NULL, 0x010000, MAP_TAG_OTHER}, // 0x1f800000
@@ -277,6 +279,29 @@ psx_map_t custom_psx_maps[] = {
    {NULL, NULL, 0x200000, MAP_TAG_VRAM},  // 0x00000000
 };
 
+int init_vita_mmap(){
+  int n;
+  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;
+#if 0
+  for(n = 0; n < 5; n++){
+    sceClibPrintf("addr reserved %x\n",custom_psx_maps[n].buffer);
+  }
+#endif
+  return 0;
+}
+
+void deinit_vita_mmap(){
+  free(addr);
+}
+
 void* pl_vita_mmap(unsigned long addr, size_t size, int is_fixed,
 	enum psxMapTag tag)
 {
@@ -290,26 +315,6 @@ void* pl_vita_mmap(unsigned long addr, size_t size, int is_fixed,
     {
        if ((custom_map->size == size) && (custom_map->tag == tag))
        {
-          int block, ret;
-          char blockname[32];
-          sprintf(blockname, "CODE 0x%08X",tag);
-
-          block = sceKernelAllocMemBlock(blockname, 0x0c20d060, size + 0x1000, 0);
-          if(block<=0){
-            sceClibPrintf("could not alloc mem block @0x%08X 0x%08X \n", block, tag);
-            exit(1);
-          }
-
-          // get base address
-          ret = sceKernelGetMemBlockBase(block, &custom_map->buffer);
-          if (ret < 0)
-          {
-            sceClibPrintf("could get address @0x%08X 0x%08X 0x%08X \n", block, ret, tag);
-            exit(1);
-          }
-          custom_map->buffer = (((u32)custom_map->buffer) + 0xFFF) & ~0xFFF;
-          custom_map->target_map = block;
-
           return custom_map->buffer;
        }
     }
@@ -328,9 +333,6 @@ void pl_vita_munmap(void *ptr, size_t size, enum psxMapTag tag)
   {
      if ((custom_map->buffer == ptr))
      {
-        sceKernelFreeMemBlock(custom_map->target_map);
-        custom_map->buffer = NULL;
-        custom_map->target_map = NULL;
         return;
      }
   }
@@ -1564,15 +1566,19 @@ void retro_init(void)
    psxUnmapHook = pl_3ds_munmap;
 #endif
 #ifdef VITA
+   if(init_vita_mmap()<0)
+      abort();
    psxMapHook = pl_vita_mmap;
    psxUnmapHook = pl_vita_munmap;
 #endif
 	ret = emu_core_preinit();
-#ifdef _3DS
+#ifdef _3DS 
    /* emu_core_preinit sets the cpu to dynarec */
    if(!__ctr_svchax)
       Config.Cpu = CPU_INTERPRETER;
 #endif
+  Config.Cpu = CPU_INTERPRETER;
+
 	ret |= emu_core_init();
 	if (ret != 0) {
 		SysPrintf("PCSX init failed.\n");
@@ -1652,6 +1658,8 @@ void retro_deinit(void)
 	free(vout_buf);
 #endif
 	vout_buf = NULL;
+  
+  deinit_vita_mmap();
 }
 
 #ifdef VITA
diff --git a/frontend/vita/pthread.h b/frontend/vita/pthread.h
deleted file mode 100644
index e1afdc5..0000000
--- a/frontend/vita/pthread.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (psp_pthread.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* FIXME: unfinished on PSP, mutexes and condition variables basically a stub. */
-#ifndef _PSP_PTHREAD_WRAP__
-#define _PSP_PTHREAD_WRAP__
-
-#ifdef VITA
-#include <psp2/kernel/threadmgr.h>
-#include <sys/time.h>
-#else
-#include <pspkernel.h>
-#include <pspthreadman.h>
-#include <pspthreadman_kernel.h>
-#endif
-#include <stdio.h>
-#include <retro_inline.h>
-
-#define STACKSIZE (8 * 1024)
-
-typedef SceUID pthread_t;
-typedef SceUID pthread_mutex_t;
-typedef void* pthread_mutexattr_t;
-typedef int pthread_attr_t;
-
-typedef struct
-{
-	SceUID mutex;
-	SceUID sema;
-	int waiting;
-} pthread_cond_t;
-
-typedef SceUID pthread_condattr_t;
-
-/* Use pointer values to create unique names for threads/mutexes */
-char name_buffer[256];
-
-typedef void* (*sthreadEntry)(void *argp);
-
-typedef struct
-{
-   void* arg;
-   sthreadEntry start_routine;
-} sthread_args_struct;
-
-
-static int psp_thread_wrap(SceSize args, void *argp)
-{
-   sthread_args_struct* sthread_args = (sthread_args_struct*)argp;
-
-   return (int)sthread_args->start_routine(sthread_args->arg);
-}
-
-static INLINE int pthread_create(pthread_t *thread,
-      const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
-{
-   sprintf(name_buffer, "0x%08X", (unsigned int) thread);
-
-#ifdef VITA
-   *thread = sceKernelCreateThread(name_buffer, psp_thread_wrap,
-         0x10000100, 0x10000, 0, 0, NULL);
-#else
-   *thread = sceKernelCreateThread(name_buffer,
-         psp_thread_wrap, 0x20, STACKSIZE, 0, NULL);
-#endif
-
-   sthread_args_struct sthread_args;
-   sthread_args.arg = arg;
-   sthread_args.start_routine = start_routine;
-
-   return sceKernelStartThread(*thread, sizeof(sthread_args), &sthread_args);
-}
-
-static INLINE int pthread_mutex_init(pthread_mutex_t *mutex,
-      const pthread_mutexattr_t *attr)
-{
-   sprintf(name_buffer, "0x%08X", (unsigned int) mutex);
-
-#ifdef VITA
-   *mutex = sceKernelCreateMutex(name_buffer, 0, 0, 0);
-	 if(*mutex<0)
-	 		return *mutex;
-	 return 0;
-#else
-   return *mutex = sceKernelCreateSema(name_buffer, 0, 1, 1, NULL);
-#endif
-}
-
-static INLINE int pthread_mutex_destroy(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   return sceKernelDeleteMutex(*mutex);
-#else
-   return sceKernelDeleteSema(*mutex);
-#endif
-}
-
-static INLINE int pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-	 int ret = sceKernelLockMutex(*mutex, 1, 0);
-	 return ret;
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_mutex_unlock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-	int ret = sceKernelUnlockMutex(*mutex, 1);
-	return ret;
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-
-static INLINE int pthread_join(pthread_t thread, void **retval)
-{
-#ifdef VITA
-   int res = sceKernelWaitThreadEnd(thread, 0, 0);
-   if (res < 0)
-      return res;
-   return sceKernelDeleteThread(thread);
-#else
-   SceUInt timeout = (SceUInt)-1;
-   sceKernelWaitThreadEnd(thread, &timeout);
-   exit_status = sceKernelGetThreadExitStatus(thread);
-   sceKernelDeleteThread(thread);
-   return exit_status;
-#endif
-}
-
-static INLINE int pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   return sceKernelTryLockMutex(*mutex, 1 /* not sure about this last param */);
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_wait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   int ret = pthread_mutex_lock(&cond->mutex);
-   if (ret < 0)
-      return ret;
-   ++cond->waiting;
-   pthread_mutex_unlock(mutex);
-   pthread_mutex_unlock(&cond->mutex);
-
-   ret = sceKernelWaitSema(cond->sema, 1, 0);
-   if (ret < 0)
-      sceClibPrintf("Premature wakeup: %08X", ret);
-   pthread_mutex_lock(mutex);
-   return ret;
-#else
-   /* FIXME: stub */
-   sceKernelDelayThread(10000);
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_timedwait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex, const struct timespec *abstime)
-{
-#ifdef VITA
-   int ret = pthread_mutex_lock(&cond->mutex);
-   if (ret < 0)
-      return ret;
-   ++cond->waiting;
-   pthread_mutex_unlock(mutex);
-   pthread_mutex_unlock(&cond->mutex);
-
-   SceUInt timeout = 0;
-
-   timeout  = abstime->tv_sec;
-   timeout += abstime->tv_nsec / 1.0e6;
-
-   ret = sceKernelWaitSema(cond->sema, 1, &timeout);
-   if (ret < 0)
-      sceClibPrintf("Premature wakeup: %08X", ret);
-   pthread_mutex_lock(mutex);
-   return ret;
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_init(pthread_cond_t *cond,
-      const pthread_condattr_t *attr)
-{
-#ifdef VITA
-
-	pthread_mutex_init(&cond->mutex,NULL);
-  if(cond->mutex<0){
-    return cond->mutex;
-	}
-  sprintf(name_buffer, "0x%08X", (unsigned int) cond);
-  //cond->sema = sceKernelCreateCond(name_buffer, 0, cond->mutex, 0);
-	cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0);
-	if(cond->sema<0){
-		pthread_mutex_destroy(&cond->mutex);
-  	return cond->sema;
-	}
-
-	cond->waiting = 0;
-
-
-	return 0;
-
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_signal(pthread_cond_t *cond)
-{
-#ifdef VITA
-	pthread_mutex_lock(&cond->mutex);
-	if (cond->waiting)
-   {
-		--cond->waiting;
-		sceKernelSignalSema(cond->sema, 1);
-	}
-	pthread_mutex_unlock(&cond->mutex);
-	return 0;
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-   /* FIXME: stub */
-   return 1;
-}
-
-static INLINE int pthread_cond_destroy(pthread_cond_t *cond)
-{
-#ifdef VITA
-   int ret = sceKernelDeleteSema(cond->sema);
-   if(ret < 0)
-    return ret;
-
-   return sceKernelDeleteMutex(cond->mutex);
-#else
-  /* FIXME: stub */
-  return 1;
-#endif
-}
-
-
-static INLINE int pthread_detach(pthread_t thread)
-{
-   return 0;
-}
-
-static INLINE void pthread_exit(void *retval)
-{
-#ifdef VITA
-   sceKernelExitDeleteThread(sceKernelGetThreadId());
-#endif
-}
-
-static INLINE pthread_t pthread_self(void)
-{
-   /* zero 20-mar-2016: untested */
-   return sceKernelGetThreadId();
-}
-
-static INLINE int pthread_equal(pthread_t t1, pthread_t t2)
-{
-	 return t1 == t2;
-}
-
-#endif //_PSP_PTHREAD_WRAP__
diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
index 1618b0f..d8c2372 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -32,6 +32,7 @@
 #ifdef VITA
 #include <psp2/kernel/sysmem.h>
 static int sceBlock;
+int getVMBlock();
 #endif
 
 #include "new_dynarec_config.h"
@@ -53,6 +54,10 @@ static int sceBlock;
 #include "assem_arm.h"
 #endif
 
+#ifdef VITA
+int _newlib_vm_size_user = 1 << TARGET_SIZE_2;
+#endif
+
 #define MAXBLOCK 4096
 #define MAX_OUTPUT_BLOCK_SIZE 262144
 
@@ -7054,12 +7059,13 @@ void new_dynarec_init()
   }
 #elif defined(BASE_ADDR_DYNAMIC)
   #ifdef VITA
-  sceBlock = sceKernelAllocMemBlockForVM("code", 1 << TARGET_SIZE_2);
+  sceBlock = getVMBlock();//sceKernelAllocMemBlockForVM("code", 1 << TARGET_SIZE_2);
   if (sceBlock < 0)
     SysPrintf("sceKernelAllocMemBlockForVM failed\n");
   int ret = sceKernelGetMemBlockBase(sceBlock, (void **)&translation_cache);
   if (ret < 0)
     SysPrintf("sceKernelGetMemBlockBase failed\n");
+  sceClibPrintf("translation_cache = 0x%08X \n ", translation_cache);
   #else
   translation_cache = mmap (NULL, 1 << TARGET_SIZE_2,
             PROT_READ | PROT_WRITE | PROT_EXEC,
@@ -7097,8 +7103,8 @@ void new_dynarec_cleanup()
   int n;
 #if defined(BASE_ADDR_FIXED) || defined(BASE_ADDR_DYNAMIC)
   #ifdef VITA
-  sceKernelFreeMemBlock(sceBlock);
-  sceBlock = -1;
+  //sceKernelFreeMemBlock(sceBlock);
+  //sceBlock = -1;
   #else
   if (munmap ((void *)BASE_ADDR, 1<<TARGET_SIZE_2) < 0)
     SysPrintf("munmap() failed\n");