svp compiler: hle done?

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

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index 3dbc269..54cd401 100644 (file)
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -7,6 +7,10 @@
 
 
 #include "../../PicoInt.h"
+#include "compiler.h"
+#ifdef __GP2X__
+#include <sys/mman.h>
+#endif
 
 svp_t *svp = NULL;
 int PicoSVPCycles = 1000; // cycles/line
@@ -22,7 +26,7 @@ static carthw_state_chunk svp_states[] =
 {
        { CHUNK_IRAM, 0x800,                 NULL },
        { CHUNK_DRAM, sizeof(svp->dram),     NULL },
-       { CHUNK_SSP,  sizeof(svp->ssp1601),  NULL },
+       { CHUNK_SSP,  sizeof(svp->ssp1601) - sizeof(svp->ssp1601.drc),  NULL },
        { 0,          0,                     NULL }
 };
 
@@ -40,7 +44,6 @@ static void PicoSVPReset(void)
 
 static void PicoSVPLine(int count)
 {
-       // ???
        if (PicoOpt&0x20000)
                ssp1601_run(PicoSVPCycles * count);
        else
@@ -77,6 +80,25 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 
 void PicoSVPInit(void)
+{
+#ifdef __GP2X__
+       int ret;
+       ret = munmap(tcache, TCACHE_SIZE);
+       printf("munmap tcache: %i\n", ret);
+#endif
+}
+
+
+static void PicoSVPShutdown(void)
+{
+#ifdef __GP2X__
+       // also unmap tcache
+       PicoSVPInit();
+#endif
+}
+
+
+void PicoSVPStartup(void)
 {
        void *tmp;
 
@@ -89,13 +111,19 @@ void PicoSVPInit(void)
                return;
        }
 
+       //PicoOpt |= 0x20000;
        Pico.rom = tmp;
        svp = (void *) ((char *)tmp + 0x200000);
        memset(svp, 0, sizeof(*svp));
 
+#ifdef __GP2X__
+       tmp = mmap(tcache, TCACHE_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
        if (!(PicoOpt&0x20000)) {
-               if (ssp1601_dyn_init()) return;
+               if (ssp1601_dyn_startup()) return;
        }
 
        // init ok, setup hooks..
@@ -105,6 +133,7 @@ void PicoSVPInit(void)
        PicoDmaHook = PicoSVPDma;
        PicoResetHook = PicoSVPReset;
        PicoLineHook = PicoSVPLine;
+       PicoCartUnloadHook = PicoSVPShutdown;
 
        // save state stuff
        svp_states[0].ptr = svp->iram_rom;
@@ -113,3 +142,4 @@ void PicoSVPInit(void)
        carthw_chunks = svp_states;
 }
 
+