X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fsvp.c;h=38e7a4f5ba929935f7b07d315f6815e5b3abea29;hb=d4d626658a7a999f48009f408b4a22d280ab80ea;hp=76904ae1c89a5114cd0ac3bb61ef66eb4c773a84;hpb=72f63cf06ca04f5619205d9b0cedebd84037f969;p=picodrive.git

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 76904ae..38e7a4f 100644
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -1,10 +1,30 @@
-// The SVP chip emulator
-
-// (c) Copyright 2008, Grazvydas "notaz" Ignotas
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * The SVP chip emulator
+ *
+ * Copyright (c) Gražvydas "notaz" Ignotas, 2008
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the organization nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "../../pico_int.h"
 #include "../../cpu/drc/cmn.h"
@@ -36,7 +56,7 @@ static void PicoSVPReset(void)
 
 	memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
 	ssp1601_reset(&svp->ssp1601);
-#ifndef PSP
+#ifdef __arm__
 	if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
 		ssp1601_dyn_reset(&svp->ssp1601);
 #endif
@@ -46,7 +66,7 @@ static void PicoSVPReset(void)
 static void PicoSVPLine(void)
 {
 	int count = 1;
-#if defined(ARM) || defined(PSP)
+#if defined(__arm__) || defined(PSP)
 	// performance hack
 	static int delay_lines = 0;
 	delay_lines++;
@@ -56,7 +76,7 @@ static void PicoSVPLine(void)
 	delay_lines = 0;
 #endif
 
-#ifndef PSP
+#ifdef __arm__
 	if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
 		ssp1601_dyn_run(PicoSVPCycles * count);
 	else
@@ -98,7 +118,7 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#ifndef PSP
+#ifdef __arm__
 	// this is to unmap tcache and make
 	// mem available for large ROMs, MCD, etc.
 	drc_cmn_cleanup();
@@ -107,7 +127,7 @@ void PicoSVPInit(void)
 
 static void PicoSVPExit(void)
 {
-#ifndef PSP
+#ifdef __arm__
 	ssp1601_dyn_exit();
 #endif
 }
@@ -115,25 +135,22 @@ static void PicoSVPExit(void)
 
 void PicoSVPStartup(void)
 {
-	void *tmp;
+	int ret;
 
 	elprintf(EL_STATUS, "SVP startup");
 
-	tmp = realloc(Pico.rom, 0x200000 + sizeof(*svp));
-	if (tmp == NULL)
-	{
+	ret = PicoCartResize(Pico.romsize + sizeof(*svp));
+	if (ret != 0) {
 		elprintf(EL_STATUS|EL_SVP, "OOM for SVP data");
 		return;
 	}
 
-	//PicoOpt &= ~0x20000;
-	Pico.rom = tmp;
-	svp = (void *) ((char *)tmp + 0x200000);
+	svp = (void *) ((char *)Pico.rom + Pico.romsize);
 	memset(svp, 0, sizeof(*svp));
 
 	// init SVP compiler
 	svp_dyn_ready = 0;
-#ifndef PSP
+#ifdef __arm__
 	if (PicoOpt & POPT_EN_SVP_DRC) {
 		if (ssp1601_dyn_startup())
 			return;
@@ -156,4 +173,3 @@ void PicoSVPStartup(void)
 	PicoAHW |= PAHW_SVP;
 }
 
-