32x: interpreter-wrap drc works (demos only). SVP drc refactoring.

[picodrive.git] / pico / carthw / svp / svp.c

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 17d4aea..d1e7f8f 100644 (file)
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -8,9 +8,6 @@
 
 #include "../../pico_int.h"
 #include "compiler.h"
-#if defined(__linux__) && defined(ARM)
-#include <sys/mman.h>
-#endif
 
 svp_t *svp = NULL;
 int PicoSVPCycles = 850; // cycles/line, just a guess
@@ -100,19 +97,12 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#if defined(__linux__) && defined(ARM)
-       int ret;
-       ret = munmap(tcache, SSP_DRC_SIZE);
-       printf("munmap tcache: %i\n", ret);
-#endif
 }
 
-
-static void PicoSVPShutdown(void)
+static void PicoSVPExit(void)
 {
-#if defined(__linux__) && defined(ARM)
-       // also unmap tcache
-       PicoSVPInit();
+#ifndef PSP
+       ssp1601_dyn_exit();
 #endif
 }
 
@@ -121,7 +111,7 @@ void PicoSVPStartup(void)
 {
        void *tmp;
 
-       elprintf(EL_SVP, "SVP init");
+       elprintf(EL_STATUS, "SVP startup");
 
        tmp = realloc(Pico.rom, 0x200000 + sizeof(*svp));
        if (tmp == NULL)
@@ -135,28 +125,22 @@ void PicoSVPStartup(void)
        svp = (void *) ((char *)tmp + 0x200000);
        memset(svp, 0, sizeof(*svp));
 
-#if defined(__linux__) && defined(ARM)
-       tmp = mmap(tcache, SSP_DRC_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
-       printf("mmap tcache: %p, asked %p\n", tmp, tcache);
-#endif
-
        // init SVP compiler
        svp_dyn_ready = 0;
 #ifndef PSP
-       if (PicoOpt&POPT_EN_SVP_DRC) {
-               if (ssp1601_dyn_startup()) return;
+       if (PicoOpt & POPT_EN_SVP_DRC) {
+               if (ssp1601_dyn_startup())
+                       return;
                svp_dyn_ready = 1;
        }
 #endif
 
        // init ok, setup hooks..
-       PicoRead16Hook = PicoSVPRead16;
-       PicoWrite8Hook = PicoSVPWrite8;
-       PicoWrite16Hook = PicoSVPWrite16;
+       PicoCartMemSetup = PicoSVPMemSetup;
        PicoDmaHook = PicoSVPDma;
        PicoResetHook = PicoSVPReset;
        PicoLineHook = PicoSVPLine;
-       PicoCartUnloadHook = PicoSVPShutdown;
+       PicoCartUnloadHook = PicoSVPExit;
 
        // save state stuff
        svp_states[0].ptr = svp->iram_rom;