X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fcarthw%2Fsvp%2Fsvp.c;h=e76c7ce86501c302be4a9c9d7166983b182b8125;hb=b9c1d0129a0842bb545dd30cef73aa975acbb1ac;hp=a196fa1c1a48218852ee9d007d4e3cc140e0ee06;hpb=50483b5330e31812fc75f397ae639f6ab03f7978;p=picodrive.git

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index a196fa1..e76c7ce 100644
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -1,7 +1,35 @@
+// 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 = 1000; // cycles/line
+
+/* 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),  NULL },
+	{ 0,          0,                     NULL }
+};
+
 
 static void PicoSVPReset(void)
 {
@@ -9,15 +37,22 @@ static void PicoSVPReset(void)
 
 	memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
 	ssp1601_reset(&svp->ssp1601);
+	if (!(PicoOpt&0x20000))
+		ssp1601_dyn_reset(&svp->ssp1601);
 }
 
 
 static void PicoSVPLine(int count)
 {
+	static int inited = 0;
+	if (!(svp->ssp1601.gr[SSP_PM0].h & 2) && !inited) return;
+	inited = 1;
+
 	// ???
-	// OSC_NTSC / 3.0 / 60.0 / 262.0 ~= 1139
-	// OSC_PAL  / 3.0 / 50.0 / 312.0 ~= 1137
-	ssp1601_run(PicoSVPCycles * count);
+	if (PicoOpt&0x20000)
+		ssp1601_run(PicoSVPCycles * count);
+	else
+		ssp1601_dyn_run(PicoSVPCycles * count);
 
 	// test mode
 	//if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
@@ -26,7 +61,8 @@ static void PicoSVPLine(int count)
 
 static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp)
 {
-	if (source < Pico.romsize) { // Rom
+	if (source < Pico.romsize) // Rom
+	{
 		source -= 2;
 		*srcp = (unsigned short *)(Pico.rom + (source&~1));
 		*limitp = (unsigned short *)(Pico.rom + Pico.romsize);
@@ -49,6 +85,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;
 
@@ -65,6 +120,16 @@ void PicoSVPInit(void)
 	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_startup()) return;
+	}
+
 	// init ok, setup hooks..
 	PicoRead16Hook = PicoSVPRead16;
 	PicoWrite8Hook = PicoSVPWrite8;
@@ -72,5 +137,13 @@ 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;
 }
 
+