extern const unsigned short vcounts[];\r
extern int rendstatus;\r
\r
+typedef unsigned char u8;\r
typedef unsigned short u16;\r
\r
\r
return d;\r
}\r
\r
-#if 0\r
-// calculate the number of cycles 68k->VDP dma operation would take\r
-static int DmaSlowBurn(int len)\r
-{\r
- // test: Legend of Galahad, Time Killers\r
- int burn,maxlen,line=Pico.m.scanline;\r
-\r
- if(line == -1) line=vcounts[SekCyclesDone()>>8];\r
- maxlen=(224-line)*18;\r
- if(len <= maxlen)\r
- burn = len*(((488<<8)/18))>>8;\r
- else {\r
- burn = maxlen*(((488<<8)/18))>>8;\r
- burn += (len-maxlen)*(((488<<8)/180))>>8;\r
- }\r
-\r
- return burn;\r
-}\r
-#endif\r
-\r
static int GetDmaLength()\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
u16 *pd=0, *pdend, *r;\r
unsigned int a=Pico.video.addr, a2, d;\r
unsigned char inc=Pico.video.reg[0xf];\r
- unsigned int source; // , burn;\r
+ unsigned int source;\r
\r
source =Pico.video.reg[0x15]<<1;\r
source|=Pico.video.reg[0x16]<<9;\r
Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40),\r
Pico.m.scanline, SekCyclesDone(), SekPc);\r
\r
- if ((source&0xe00000)==0xe00000) { pd=(u16 *)(Pico.ram+(source&0xfffe)); pdend=(u16 *)(Pico.ram+0x10000); } // Ram\r
- else if(source<Pico.romsize) { pd=(u16 *)(Pico.rom+(source&~1)); pdend=(u16 *)(Pico.rom+Pico.romsize); } // Rom\r
- else return; // Invalid source address\r
-\r
-#if 0\r
- // CPU is stopped during DMA, so we burn some cycles to compensate that\r
- if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?\r
- burn = (len*(((488<<8)/167))>>8); // very approximate\r
- if(!(Pico.video.status&8)) burn+=burn>>1; // a hack for Legend of Galahad\r
- } else burn = DmaSlowBurn(len);\r
- SekCyclesBurn(burn);\r
-#else\r
- Pico.m.dma_bytes += len;\r
-#endif\r
- //if(!(Pico.video.status&8))\r
-// SekEndRun(0);\r
- //Pico.m.dma_endcycles = 0;//SekCyclesLeft;\r
- //Pico.m.dma_endcycles -= Pico.m.dma_endcycles>>3; // hack\r
- SekSetCyclesLeft(SekCyclesLeft - CheckDMA());\r
-// CheckDMA();\r
-// dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
+ if(Pico.m.scanline != -1) {\r
+ Pico.m.dma_bytes += len;\r
+ SekSetCyclesLeft(SekCyclesLeft - CheckDMA());\r
+ } else {\r
+ // be approximate in non-accurate mode\r
+ SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8));\r
+ }\r
+\r
+ if ((source&0xe00000)==0xe00000) { // Ram\r
+ pd=(u16 *)(Pico.ram+(source&0xfffe));\r
+ pdend=(u16 *)(Pico.ram+0x10000);\r
+ } else if(PicoMCD & 1) {\r
+ dprintf("DmaSlow CD");\r
+ if(source<0x20000) { // Bios area\r
+ pd=(u16 *)(Pico_mcd->bios+(source&~1));\r
+ pdend=(u16 *)(Pico_mcd->bios+0x20000);\r
+ } else if ((source&0xfc0000)==0x200000 && (!(Pico_mcd->s68k_regs[3]&4))) { // Word Ram\r
+ if (!(Pico_mcd->s68k_regs[3]&4)) { // 2M mode\r
+ source -= 2;\r
+ pd=(u16 *)(Pico_mcd->word_ram+(source&0x3fffe));\r
+ pdend=(u16 *)(Pico_mcd->word_ram+0x40000);\r
+ } else {\r
+ dprintf("DmaSlow: unsupported src");\r
+ return;\r
+ }\r
+ } else if ((source&0xfe0000)==0x020000) { // Prg Ram\r
+ u8 *prg_ram = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
+ pd=(u16 *)(prg_ram+(source&0x1fffe));\r
+ pdend=(u16 *)(prg_ram+0x20000);\r
+ } else {\r
+ dprintf("DmaSlow: unsupported src");\r
+ return;\r
+ }\r
+ } else {\r
+ if(source<Pico.romsize) { // Rom\r
+ pd=(u16 *)(Pico.rom+(source&~1));\r
+ pdend=(u16 *)(Pico.rom+Pico.romsize);\r
+ } else {\r
+ dprintf("DmaSlow: invalid dma src");\r
+ return;\r
+ }\r
+ }\r
+\r
+ // overflow protection, might break something..\r
+ if (len > pdend - pd) {\r
+ len = pdend - pd;\r
+ dprintf("DmaSlow overflow");\r
+ }\r
\r
switch (Pico.video.type)\r
{\r
// AutoIncrement\r
a=(u16)(a+inc);\r
// didn't src overlap?\r
- if(pd >= pdend) pd-=0x8000; // should be good for RAM, bad for ROM\r
+ //if(pd >= pdend) pd-=0x8000; // should be good for RAM, bad for ROM\r
}\r
rendstatus|=0x10;\r
break;\r
// AutoIncrement\r
a2+=inc;\r
// didn't src overlap?\r
- if(pd >= pdend) pd-=0x8000;\r
+ //if(pd >= pdend) pd-=0x8000;\r
// good dest?\r
if(a2 >= 0x80) break; // Todds Adventures in Slime World / Andre Agassi tennis\r
}\r
// AutoIncrement\r
a2+=inc;\r
// didn't src overlap?\r
- if(pd >= pdend) pd-=0x8000;\r
+ //if(pd >= pdend) pd-=0x8000;\r
// good dest?\r
if(a2 >= 0x80) break;\r
}\r
dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());\r
\r
Pico.m.dma_bytes += len;\r
- Pico.video.status|=2; // dma busy\r
+ if(Pico.m.scanline != -1)\r
+ Pico.video.status|=2; // dma busy\r
\r
source =Pico.video.reg[0x15];\r
source|=Pico.video.reg[0x16]<<8;\r
dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());\r
\r
Pico.m.dma_bytes += len;\r
- Pico.video.status|=2; // dma busy\r
+ if(Pico.m.scanline != -1)\r
+ Pico.video.status|=2; // dma busy (in accurate mode)\r
\r
// from Charles MacDonald's genvdp.txt:\r
// Write lower byte to address specified\r
if(Pico.m.rotate++&8) d|=0x0100; else d|=0x0200; // Toggle fifo full empty (who uses that stuff?)\r
if(!(Pico.video.reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled\r
if(SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs)\r
- dprintf("sr_read %04x @ %06x [%i|%i]", d, SekPc, Pico.m.scanline, SekCyclesDone());\r
+ // dprintf("sr_read %04x @ %06x [%i|%i]", d, SekPc, Pico.m.scanline, SekCyclesDone());\r
\r
Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)\r
\r
hc=hcounts_40[lineCycles];\r
else hc=hcounts_32[lineCycles];\r
\r
- if(lineCycles > 488-12) d++; // Wheel of Fortune\r
+ //if(lineCycles > 488-12) d++; // Wheel of Fortune\r
} else {\r
// get approximate V-Counter\r
d=vcounts[SekCyclesDone()>>8];\r
notaz.gp2x.de / picodrive.git / blobdiff