X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcarthw%2Fsvp%2Fsvp.c;h=3dbc269cb0ee07a5e7dcc61d6d994eb4c304b45c;hb=726bbb3e08e3d4e7ed086a3c98dec0e21a386d75;hp=985343916b2483eb3c9f10af25e721e8fc19823d;hpb=689fb2c0898deb6f87006dc5755516eb0ff6e647;p=picodrive.git

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index 9853439..3dbc269 100644
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -1,6 +1,31 @@
+// 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"
 
 svp_t *svp = NULL;
+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)
 {
@@ -8,15 +33,18 @@ 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(void)
+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(800);
+	if (PicoOpt&0x20000)
+		ssp1601_run(PicoSVPCycles * count);
+	else
+		ssp1601_dyn_run(PicoSVPCycles * count);
 
 	// test mode
 	//if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
@@ -25,7 +53,14 @@ static void PicoSVPLine(void)
 
 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;
@@ -58,6 +93,11 @@ void PicoSVPInit(void)
 	svp = (void *) ((char *)tmp + 0x200000);
 	memset(svp, 0, sizeof(*svp));
 
+	// init SVP compiler
+	if (!(PicoOpt&0x20000)) {
+		if (ssp1601_dyn_init()) return;
+	}
+
 	// init ok, setup hooks..
 	PicoRead16Hook = PicoSVPRead16;
 	PicoWrite8Hook = PicoSVPWrite8;
@@ -65,5 +105,11 @@ void PicoSVPInit(void)
 	PicoDmaHook = PicoSVPDma;
 	PicoResetHook = PicoSVPReset;
 	PicoLineHook = PicoSVPLine;
+
+	// 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;
 }