notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some dma improvements
[picodrive.git]
/
pico
/
carthw
/
svp
/
svp.c
diff --git
a/pico/carthw/svp/svp.c
b/pico/carthw/svp/svp.c
index
d09ebeb
..
8861de0
100644
(file)
--- a/
pico/carthw/svp/svp.c
+++ b/
pico/carthw/svp/svp.c
@@
-26,8
+26,8
@@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include
"../../pico_int.h"
-#include
"../../cpu/drc/cmn.h"
+#include
<pico/pico_int.h>
+#include
<cpu/drc/cmn.h>
#include "compiler.h"
svp_t *svp = NULL;
#include "compiler.h"
svp_t *svp = NULL;
@@
-56,8
+56,8
@@
static void PicoSVPReset(void)
memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
ssp1601_reset(&svp->ssp1601);
memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
ssp1601_reset(&svp->ssp1601);
-#if
ndef PSP
- if ((PicoOpt
&POPT_EN_SVP
_DRC) && svp_dyn_ready)
+#if
def _SVP_DRC
+ if ((PicoOpt
& POPT_EN
_DRC) && svp_dyn_ready)
ssp1601_dyn_reset(&svp->ssp1601);
#endif
}
ssp1601_dyn_reset(&svp->ssp1601);
#endif
}
@@
-66,7
+66,7
@@
static void PicoSVPReset(void)
static void PicoSVPLine(void)
{
int count = 1;
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++;
// performance hack
static int delay_lines = 0;
delay_lines++;
@@
-76,8
+76,8
@@
static void PicoSVPLine(void)
delay_lines = 0;
#endif
delay_lines = 0;
#endif
-#if
ndef PSP
- if ((PicoOpt
&POPT_EN_SVP
_DRC) && svp_dyn_ready)
+#if
def _SVP_DRC
+ if ((PicoOpt
& POPT_EN
_DRC) && svp_dyn_ready)
ssp1601_dyn_run(PicoSVPCycles * count);
else
#endif
ssp1601_dyn_run(PicoSVPCycles * count);
else
#endif
@@
-91,23
+91,20
@@
static void PicoSVPLine(void)
}
}
-static int PicoSVPDma(unsigned int source, int len, unsigned short **
srcp, unsigned short **limitp
)
+static int PicoSVPDma(unsigned int source, int len, unsigned short **
base, unsigned int *mask
)
{
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);
- return 1;
+ *base = (unsigned short *)(Pico.rom + (source & 0xfe0000));
+ *mask = 0x1ffff;
+ return source - 2;
}
else if ((source & 0xfe0000) == 0x300000)
{
elprintf(EL_VDPDMA|EL_SVP, "SVP DmaSlow from %06x, len=%i", source, len);
}
else if ((source & 0xfe0000) == 0x300000)
{
elprintf(EL_VDPDMA|EL_SVP, "SVP DmaSlow from %06x, len=%i", source, len);
- source &= 0x1fffe;
- source -= 2;
- *srcp = (unsigned short *)(svp->dram + source);
- *limitp = (unsigned short *)(svp->dram + sizeof(svp->dram));
- return 1;
+ *base = (unsigned short *)svp->dram;
+ *mask = 0x1ffff;
+ return source - 2;
}
else
elprintf(EL_VDPDMA|EL_SVP|EL_ANOMALY, "SVP FIXME unhandled DmaSlow from %06x, len=%i", source, len);
}
else
elprintf(EL_VDPDMA|EL_SVP|EL_ANOMALY, "SVP FIXME unhandled DmaSlow from %06x, len=%i", source, len);
@@
-118,7
+115,7
@@
static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
void PicoSVPInit(void)
{
void PicoSVPInit(void)
{
-#if
ndef PSP
+#if
def _SVP_DRC
// this is to unmap tcache and make
// mem available for large ROMs, MCD, etc.
drc_cmn_cleanup();
// this is to unmap tcache and make
// mem available for large ROMs, MCD, etc.
drc_cmn_cleanup();
@@
-127,7
+124,7
@@
void PicoSVPInit(void)
static void PicoSVPExit(void)
{
static void PicoSVPExit(void)
{
-#if
ndef PSP
+#if
def _SVP_DRC
ssp1601_dyn_exit();
#endif
}
ssp1601_dyn_exit();
#endif
}
@@
-150,8
+147,8
@@
void PicoSVPStartup(void)
// init SVP compiler
svp_dyn_ready = 0;
// init SVP compiler
svp_dyn_ready = 0;
-#if
ndef PSP
- if (PicoOpt & POPT_EN_
SVP_
DRC) {
+#if
def _SVP_DRC
+ if (PicoOpt & POPT_EN_DRC) {
if (ssp1601_dyn_startup())
return;
svp_dyn_ready = 1;
if (ssp1601_dyn_startup())
return;
svp_dyn_ready = 1;