#endif\r
\r
\r
-static __inline void AutoIncrement()\r
+static __inline void AutoIncrement(void)\r
{\r
Pico.video.addr=(unsigned short)(Pico.video.addr+Pico.video.reg[0xf]);\r
}\r
Pico.vram [(a>>1)&0x7fff]=d;\r
rendstatus|=0x10; break;\r
case 3: Pico.m.dirtyPal = 1;\r
- //dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone());\r
Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike)\r
case 5: Pico.vsram[(a>>1)&0x003f]=d; break;\r
+ default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break;\r
}\r
\r
//dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone());\r
AutoIncrement();\r
}\r
\r
-static unsigned int VideoRead()\r
+static unsigned int VideoRead(void)\r
{\r
unsigned int a=0,d=0;\r
\r
case 0: d=Pico.vram [a&0x7fff]; break;\r
case 8: d=Pico.cram [a&0x003f]; break;\r
case 4: d=Pico.vsram[a&0x003f]; break;\r
+ default:elprintf(EL_ANOMALY, "VDP read with bad type %i", Pico.video.type); break;\r
}\r
\r
AutoIncrement();\r
return d;\r
}\r
\r
-static int GetDmaLength()\r
+static int GetDmaLength(void)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int len=0;\r
source|=Pico.video.reg[0x16]<<9;\r
source|=Pico.video.reg[0x17]<<17;\r
\r
- dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i] @ %x",\r
+ elprintf(EL_VDPDMA, "DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i] @ %06x",\r
Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40),\r
- Pico.m.scanline, SekCyclesDone(), SekPc);\r
+ SekCyclesDone(), SekPc);\r
\r
if(Pico.m.scanline != -1) {\r
- Pico.m.dma_bytes += len;\r
+ Pico.m.dma_xfers += len;\r
if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA());\r
else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());\r
} else {\r
pd=(u16 *)(Pico.ram+(source&0xfffe));\r
pdend=(u16 *)(Pico.ram+0x10000);\r
} else if(PicoMCD & 1) {\r
- dprintf("DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]);\r
+ elprintf(EL_VDPDMA, "DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]);\r
if(source<0x20000) { // Bios area\r
pd=(u16 *)(Pico_mcd->bios+(source&~1));\r
pdend=(u16 *)(Pico_mcd->bios+0x20000);\r
int bank = Pico_mcd->s68k_regs[3]&1;\r
pd=(u16 *)(Pico_mcd->word_ram1M[bank]+(source&0x1fffe));\r
pdend=(u16 *)(Pico_mcd->word_ram1M[bank]+0x20000);\r
- } else {\r
+ } else {\r
DmaSlowCell(source, a, len, inc);\r
return;\r
- }\r
+ }\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 FIXME: unsupported src");\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow FIXME: unsupported src");\r
return;\r
}\r
} else {\r
pd=(u16 *)(Pico.rom+(source&~1));\r
pdend=(u16 *)(Pico.rom+Pico.romsize);\r
} else {\r
- dprintf("DmaSlow: invalid dma src");\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow: invalid dma src");\r
return;\r
}\r
}\r
// overflow protection, might break something..\r
if (len > pdend - pd) {\r
len = pdend - pd;\r
- dprintf("DmaSlow overflow");\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow overflow");\r
}\r
\r
switch (Pico.video.type)\r
}\r
a=(a&0xff00)|a2;\r
break;\r
+\r
+ default:\r
+ elprintf(EL_VDPDMA|EL_ANOMALY, "DMA with bad type %i", Pico.video.type);\r
+ break;\r
}\r
// remember addr\r
Pico.video.addr=(u16)a;\r
unsigned char *vrs;\r
unsigned char inc=Pico.video.reg[0xf];\r
int source;\r
- dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());\r
+ elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone());\r
\r
- Pico.m.dma_bytes += len;\r
+ Pico.m.dma_xfers += len;\r
if(Pico.m.scanline != -1)\r
Pico.video.status|=2; // dma busy\r
\r
unsigned char inc=Pico.video.reg[0xf];\r
\r
len=GetDmaLength();\r
- dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());\r
+ elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone());\r
\r
- Pico.m.dma_bytes += len;\r
+ Pico.m.dma_xfers += len;\r
if(Pico.m.scanline != -1)\r
Pico.video.status|=2; // dma busy (in accurate mode)\r
\r
rendstatus|=0x10;\r
}\r
\r
-static void CommandDma()\r
+static void CommandDma(void)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int len=0,method=0;\r
if (method==3) DmaCopy(len); // VRAM Copy\r
}\r
\r
-static void CommandChange()\r
+static void CommandChange(void)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
unsigned int cmd=0,addr=0;\r
addr =(cmd>>16)&0x3fff;\r
addr|=(cmd<<14)&0xc000;\r
pvid->addr=(unsigned short)addr;\r
- //dprintf("addr set: %04x", addr);\r
\r
// Check for dma:\r
if (cmd&0x80) CommandDma();\r
\r
if (a==0x00) // Data port 0 or 2\r
{\r
- if (pvid->pending) CommandChange();\r
- pvid->pending=0;\r
+ if (pvid->pending) {\r
+ CommandChange();\r
+ pvid->pending=0;\r
+ }\r
\r
// If a DMA fill has been set up, do it\r
if ((pvid->command&0x80) && (pvid->reg[1]&0x10) && (pvid->reg[0x17]>>6)==2)\r
}\r
else\r
{\r
+ // preliminary FIFO emulation for Chaos Engine, The (E)\r
+ if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1) // active display, accurate mode?\r
+ {\r
+ pvid->status&=~0x200; // FIFO no longer empty\r
+ pvid->lwrite_cnt++;\r
+ if (pvid->lwrite_cnt >= 4) pvid->status|=0x100; // FIFO full\r
+ if (pvid->lwrite_cnt > 4) {\r
+ SekCyclesBurn(32); // penalty // 488/12-8\r
+ if (SekCycleCnt>=SekCycleAim) SekEndRun(0);\r
+ }\r
+ elprintf(EL_ASVDP, "VDP data write: %04x {%i} #%i @ %06x", d, Pico.video.type, pvid->lwrite_cnt, SekPc);\r
+ }\r
VideoWrite(d);\r
}\r
return;\r
\r
if (a==0x04) // Control (command) port 4 or 6\r
{\r
- //dprintf("vdp cw(%04x), p=%i @ %06x [%i]", d, pvid->pending, SekPc, SekCyclesDone());\r
if(pvid->pending)\r
{\r
// Low word of command:\r
{\r
// Register write:\r
int num=(d>>8)&0x1f;\r
- if(num==00) dprintf("hint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, (d&0x10)>>4, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
- if(num==01) dprintf("vint_onoff: %i->%i [%i|%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, (d&0x20)>>5, Pico.m.scanline, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
+ if(num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4,\r
+ (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
+ if(num==01) elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5,\r
+ (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
//if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());\r
- //if(num==05) dprintf("spr_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());\r
//if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());\r
pvid->reg[num]=(unsigned char)d;\r
#if !(defined(EMU_C68K) && defined(EMU_M68K)) // not debugging Cyclone\r
// update IRQ level (Lemmings, Wiz 'n' Liz intro, ... )\r
// may break if done improperly:\r
- // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx), Fatal Rewind (hang), Sesame Street Counting Cafe\r
+ // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx),\r
+ // Fatal Rewind (hang), Sesame Street Counting Cafe\r
if(num < 2) {\r
#ifdef EMU_C68K\r
// hack: make sure we do not touch the irq line if Cyclone is just about to take the IRQ\r
\r
a&=0x1c;\r
\r
+\r
if (a==0x00) // data port\r
{\r
d=VideoRead();\r
\r
if (a==0x04) // control port\r
{\r
- d=Pico.video.status;\r
- if(PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast)\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
+ struct PicoVideo *pv=&Pico.video;\r
+ d=pv->status;\r
+ if (PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast)\r
+ if (!(pv->reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled\r
+ if (SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs)\r
+\r
+ d|=(pv->pending_ints&0x20)<<2; // V-int pending?\r
+ if (d&0x100) pv->status&=~0x100; // FIFO no longer full\r
\r
- Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)\r
+ pv->pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)\r
\r
+ elprintf(EL_SR, "SR read: %04x @ %06x", d, SekPc);\r
goto end;\r
}\r
\r
if (d&0xf00) d|= 1;\r
}\r
\r
- dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);\r
d&=0xff; d<<=8;\r
d|=hc;\r
goto end;\r
notaz.gp2x.de / picodrive.git / blobdiff