notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added zram clearing on reset for Psycho Pinball (does it happen on hw?)
[picodrive.git]
/
Pico
/
carthw
/
svp
/
svp.c
diff --git
a/Pico/carthw/svp/svp.c
b/Pico/carthw/svp/svp.c
index
3dbc269
..
0c7585a
100644
(file)
--- a/
Pico/carthw/svp/svp.c
+++ b/
Pico/carthw/svp/svp.c
@@
-7,9
+7,14
@@
#include "../../PicoInt.h"
#include "../../PicoInt.h"
+#include "compiler.h"
+#ifdef __GP2X__
+#include <sys/mman.h>
+#endif
svp_t *svp = NULL;
svp_t *svp = NULL;
-int PicoSVPCycles = 1000; // cycles/line
+int PicoSVPCycles = 850; // cycles/line, just a guess
+static int svp_dyn_ready = 0;
/* save state stuff */
typedef enum {
/* save state stuff */
typedef enum {
@@
-22,7
+27,7
@@
static carthw_state_chunk svp_states[] =
{
{ CHUNK_IRAM, 0x800, NULL },
{ CHUNK_DRAM, sizeof(svp->dram), NULL },
{
{ CHUNK_IRAM, 0x800, NULL },
{ CHUNK_DRAM, sizeof(svp->dram), NULL },
- { CHUNK_SSP, sizeof(svp->ssp1601), NULL },
+ { CHUNK_SSP, sizeof(svp->ssp1601)
- sizeof(svp->ssp1601.drc)
, NULL },
{ 0, 0, NULL }
};
{ 0, 0, NULL }
};
@@
-33,18
+38,24
@@
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 (!(PicoOpt&0x20000))
+#ifndef PSP
+ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
ssp1601_dyn_reset(&svp->ssp1601);
ssp1601_dyn_reset(&svp->ssp1601);
+#endif
}
static void PicoSVPLine(int count)
{
}
static void PicoSVPLine(int count)
{
- // ???
- if (PicoOpt&0x20000)
- ssp1601_run(PicoSVPCycles * count);
- else
+#ifndef PSP
+ if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
ssp1601_dyn_run(PicoSVPCycles * count);
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;
// test mode
//if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
@@
-77,6
+88,25
@@
static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
void PicoSVPInit(void)
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;
{
void *tmp;
@@
-89,14
+119,24
@@
void PicoSVPInit(void)
return;
}
return;
}
+ //PicoOpt &= ~0x20000;
Pico.rom = tmp;
svp = (void *) ((char *)tmp + 0x200000);
memset(svp, 0, sizeof(*svp));
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
// init SVP compiler
- if (!(PicoOpt&0x20000)) {
- if (ssp1601_dyn_init()) return;
+ 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;
// init ok, setup hooks..
PicoRead16Hook = PicoSVPRead16;
@@
-105,11
+145,14
@@
void PicoSVPInit(void)
PicoDmaHook = PicoSVPDma;
PicoResetHook = PicoSVPReset;
PicoLineHook = PicoSVPLine;
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;
// 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;
}
}
+