bugfix, sprites adjustment

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

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index bc7cddb..0c7585a 100644 (file)
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -1,7 +1,36 @@
+// The SVP chip emulator
+
+// (c) Copyright 2008, Grazvydas "notaz" Ignotas
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
+
 #include "../../PicoInt.h"
+#include "compiler.h"
+#ifdef __GP2X__
+#include <sys/mman.h>
+#endif
 
 svp_t *svp = NULL;
-int PicoSVPCycles = 800; // cycles/line
+int PicoSVPCycles = 850; // cycles/line, just a guess
+static int svp_dyn_ready = 0;
+
+/* save state stuff */
+typedef enum {
+       CHUNK_IRAM = CHUNK_CARTHW,
+       CHUNK_DRAM,
+       CHUNK_SSP
+} chunk_name_e;
+
+static carthw_state_chunk svp_states[] =
+{
+       { CHUNK_IRAM, 0x800,                 NULL },
+       { CHUNK_DRAM, sizeof(svp->dram),     NULL },
+       { CHUNK_SSP,  sizeof(svp->ssp1601) - sizeof(svp->ssp1601.drc),  NULL },
+       { 0,          0,                     NULL }
+};
+
 
 static void PicoSVPReset(void)
 {
@@ -9,15 +38,24 @@ static void PicoSVPReset(void)
 
        memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
        ssp1601_reset(&svp->ssp1601);
+#ifndef PSP
+       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+               ssp1601_dyn_reset(&svp->ssp1601);
+#endif
 }
 
 
 static void PicoSVPLine(int count)
 {
-       // ???
-       // OSC_NTSC / 3.0 / 60.0 / 262.0 ~= 1139
-       // OSC_PAL  / 3.0 / 50.0 / 312.0 ~= 1137
-       ssp1601_run(PicoSVPCycles * count);
+#ifndef PSP
+       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+               ssp1601_dyn_run(PicoSVPCycles * count);
+       else
+#endif
+       {
+               ssp1601_run(PicoSVPCycles * count);
+               svp_dyn_ready = 0; // just in case
+       }
 
        // test mode
        //if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
@@ -26,7 +64,14 @@ static void PicoSVPLine(int count)
 
 static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp)
 {
-       if ((source & 0xfe0000) == 0x300000)
+       if (source < Pico.romsize) // Rom
+       {
+               source -= 2;
+               *srcp = (unsigned short *)(Pico.rom + (source&~1));
+               *limitp = (unsigned short *)(Pico.rom + Pico.romsize);
+               return 1;
+       }
+       else if ((source & 0xfe0000) == 0x300000)
        {
                elprintf(EL_VDPDMA|EL_SVP, "SVP DmaSlow from %06x, len=%i", source, len);
                source &= 0x1fffe;
@@ -43,6 +88,25 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 
 void PicoSVPInit(void)
+{
+#ifdef __GP2X__
+       int ret;
+       ret = munmap(tcache, SSP_DRC_SIZE);
+       printf("munmap tcache: %i\n", ret);
+#endif
+}
+
+
+static void PicoSVPShutdown(void)
+{
+#ifdef __GP2X__
+       // also unmap tcache
+       PicoSVPInit();
+#endif
+}
+
+
+void PicoSVPStartup(void)
 {
        void *tmp;
 
@@ -55,10 +119,25 @@ void PicoSVPInit(void)
                return;
        }
 
+       //PicoOpt &= ~0x20000;
        Pico.rom = tmp;
        svp = (void *) ((char *)tmp + 0x200000);
        memset(svp, 0, sizeof(*svp));
 
+#ifdef __GP2X__
+       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;
+               svp_dyn_ready = 1;
+       }
+#endif
+
        // init ok, setup hooks..
        PicoRead16Hook = PicoSVPRead16;
        PicoWrite8Hook = PicoSVPWrite8;
@@ -66,5 +145,14 @@ void PicoSVPInit(void)
        PicoDmaHook = PicoSVPDma;
        PicoResetHook = PicoSVPReset;
        PicoLineHook = PicoSVPLine;
+       PicoCartUnloadHook = PicoSVPShutdown;
+
+       // save state stuff
+       svp_states[0].ptr = svp->iram_rom;
+       svp_states[1].ptr = svp->dram;
+       svp_states[2].ptr = &svp->ssp1601;
+       carthw_chunks = svp_states;
+       PicoAHW |= PAHW_SVP;
 }
 
+