X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=db7b2b7f742451d989b8c35e38357ac8a55a7fdd;hb=2aa27095f2dbf5b38950fcb1f856d5ffc6a70361;hp=10656184aca771d28ee900abc3e6fd5cd223f317;hpb=f8ef8ff7100baa0ac0ecfcacb47aea3a9e24bc38;p=picodrive.git diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c index 1065618..db7b2b7 100644 --- a/Pico/VideoPort.c +++ b/Pico/VideoPort.c @@ -12,8 +12,6 @@ extern const unsigned char hcounts_32[]; extern const unsigned char hcounts_40[]; -extern const unsigned short vcounts[]; -extern int rendstatus; #ifndef UTYPES_DEFINED typedef unsigned char u8; @@ -22,7 +20,7 @@ typedef unsigned int u32; #define UTYPES_DEFINED #endif -int (*PicoDmaHook)(unsigned int source, unsigned short **srcp, unsigned short **limitp) = NULL; +int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp) = NULL; static __inline void AutoIncrement(void) { @@ -37,14 +35,13 @@ static void VideoWrite(u16 d) { case 1: if(a&1) d=(u16)((d<<8)|(d>>8)); // If address is odd, bytes are swapped (which game needs this?) Pico.vram [(a>>1)&0x7fff]=d; - rendstatus|=0x10; break; + rendstatus |= PDRAW_DIRTY_SPRITES; break; case 3: Pico.m.dirtyPal = 1; Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike) case 5: Pico.vsram[(a>>1)&0x003f]=d; break; - default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break; + //default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break; } - //dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone()); AutoIncrement(); } @@ -93,19 +90,16 @@ static void DmaSlow(int len) Pico.video.type, source, a, len, inc, (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), SekCyclesDone(), SekPc); - if(Pico.m.scanline != -1) { - Pico.m.dma_xfers += len; - if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA()); - else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA()); - } else { - // be approximate in non-accurate mode - SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8)); - } + Pico.m.dma_xfers += len; + if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCyclesBurn(CheckDMA()); + else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA()); if ((source&0xe00000)==0xe00000) { // Ram pd=(u16 *)(Pico.ram+(source&0xfffe)); pdend=(u16 *)(Pico.ram+0x10000); - } else if (PicoMCD & 1) { + } + else if (PicoAHW & PAHW_MCD) + { elprintf(EL_VDPDMA, "DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]); if(source<0x20000) { // Bios area pd=(u16 *)(Pico_mcd->bios+(source&~1)); @@ -133,12 +127,15 @@ static void DmaSlow(int len) elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: FIXME: unsupported src", Pico.video.type, source, a); return; } - } else { - if (source%04x: invalid src", Pico.video.type, source, a); return; @@ -174,7 +171,7 @@ static void DmaSlow(int len) //if(pd >= pdend) pd-=0x8000; // should be good for RAM, bad for ROM } } - rendstatus|=0x10; + rendstatus |= PDRAW_DIRTY_SPRITES; break; case 3: // cram @@ -226,16 +223,15 @@ static void DmaCopy(int len) elprintf(EL_VDPDMA, "DmaCopy len %i [%i]", len, SekCyclesDone()); Pico.m.dma_xfers += len; - if(Pico.m.scanline != -1) - Pico.video.status|=2; // dma busy + Pico.video.status |= 2; // dma busy source =Pico.video.reg[0x15]; source|=Pico.video.reg[0x16]<<8; vrs=vr+source; - if(source+len > 0x10000) len=0x10000-source; // clip?? + if (source+len > 0x10000) len=0x10000-source; // clip?? - for(;len;len--) + for (; len; len--) { vr[a] = *vrs++; // AutoIncrement @@ -243,7 +239,7 @@ static void DmaCopy(int len) } // remember addr Pico.video.addr=a; - rendstatus|=0x10; + rendstatus |= PDRAW_DIRTY_SPRITES; } // check: Contra, Megaman @@ -260,17 +256,16 @@ static void DmaFill(int data) elprintf(EL_VDPDMA, "DmaFill len %i inc %i [%i]", len, inc, SekCyclesDone()); Pico.m.dma_xfers += len; - if(Pico.m.scanline != -1) - Pico.video.status|=2; // dma busy (in accurate mode) + Pico.video.status |= 2; // dma busy // from Charles MacDonald's genvdp.txt: // Write lower byte to address specified vr[a] = (unsigned char) data; a=(u16)(a+inc); - if(!inc) len=1; + if (!inc) len=1; - for(;len;len--) { + for (; len; len--) { // Write upper byte to adjacent address // (here we are byteswapped, so address is already 'adjacent') vr[a] = high; @@ -283,7 +278,7 @@ static void DmaFill(int data) // update length Pico.video.reg[0x13] = Pico.video.reg[0x14] = 0; // Dino Dini's Soccer (E) (by Haze) - rendstatus|=0x10; + rendstatus |= PDRAW_DIRTY_SPRITES; } static void CommandDma(void) @@ -319,14 +314,32 @@ static void CommandChange(void) if (cmd&0x80) CommandDma(); } +static __inline void DrawSync(int blank_on) +{ + if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) && + !PicoSkipFrame && DrawScanline <= Pico.m.scanline) { + //elprintf(EL_ANOMALY, "sync"); + PicoDrawSync(Pico.m.scanline, blank_on); + } +} + PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d) { struct PicoVideo *pvid=&Pico.video; + //if (Pico.m.scanline < 224) + // elprintf(EL_STATUS, "PicoVideoWrite [%06x] %04x", a, d); a&=0x1c; if (a==0x00) // Data port 0 or 2 { + // try avoiding the sync.. + if (Pico.m.scanline < 224 && (pvid->reg[1]&0x40) && + !(!pvid->pending && + ((pvid->command & 0xc00000f0) == 0x40000010 && Pico.vsram[pvid->addr>>1] == d)) + ) + DrawSync(0); + if (pvid->pending) { CommandChange(); pvid->pending=0; @@ -340,7 +353,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d) else { // preliminary FIFO emulation for Chaos Engine, The (E) - if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1 && !(PicoOpt&0x10000)) // active display, accurate mode? + if (!(pvid->status&8) && (pvid->reg[1]&0x40) && !(PicoOpt&POPT_DIS_VDP_FIFO)) // active display? { pvid->status&=~0x200; // FIFO no longer empty pvid->lwrite_cnt++; @@ -358,50 +371,71 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d) if (a==0x04) // Control (command) port 4 or 6 { - if(pvid->pending) + if (pvid->pending) { + if (d & 0x80) DrawSync(0); // only need sync for DMA // Low word of command: pvid->command&=0xffff0000; pvid->command|=d; pvid->pending=0; CommandChange(); - } else { - if((d&0xc000)==0x8000) + } + else + { + if ((d&0xc000)==0x8000) { // Register write: int num=(d>>8)&0x1f; - if(num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4, - (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc); - if(num==01) elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5, - (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc); - //if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone()); - //if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone()); + int dold=pvid->reg[num]; + int update_irq = 0, blank_on = 0; + pvid->type=0; // register writes clear command (else no Sega logo in Golden Axe II) + if (num > 0x0a && !(pvid->reg[1]&4)) { + elprintf(EL_ANOMALY, "%02x written to reg %02x in SMS mode @ %06x", d, num, SekPc); + return; + } + + switch (num) + { + case 0x00: + elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4, + (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc); + update_irq = 1; + break; + case 0x01: + elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5, + (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc); + if (!(d&0x40) && SekCyclesLeft > 390) blank_on = 1; + update_irq = 1; + break; + case 0x05: + if (d^dold) rendstatus |= PDRAW_SPRITES_MOVED; + break; + case 0x0c: + // renderers should update their palettes if sh/hi mode is changed + if ((d^dold)&8) Pico.m.dirtyPal = 2; + break; + } + DrawSync(blank_on); pvid->reg[num]=(unsigned char)d; + if (!update_irq) return; + #ifndef EMU_CORE_DEBUG - // update IRQ level (Lemmings, Wiz 'n' Liz intro, ... ) - // may break if done improperly: - // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx), - // Fatal Rewind (crash), Sesame Street Counting Cafe - if (num < 2) + // update IRQ level + if (!SekShouldInterrupt) // hack { - if (!SekShouldInterrupt) // hack - { - int lines, pints, irq=0; - lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10); - pints = (pvid->pending_ints&lines); - if(pints & 0x20) irq = 6; - else if(pints & 0x10) irq = 4; - SekInterrupt(irq); // update line - - if (irq) SekEndRun(24); // make it delayed - } + int lines, pints, irq=0; + lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10); + pints = (pvid->pending_ints&lines); + if (pints & 0x20) irq = 6; + else if (pints & 0x10) irq = 4; + SekInterrupt(irq); // update line + + if (irq) SekEndRun(24); // make it delayed } - else #endif - if(num == 5) rendstatus|=1; - else if(num == 0xc) Pico.m.dirtyPal = 2; // renderers should update their palettes if sh/hi mode is changed - pvid->type=0; // register writes clear command (else no Sega logo in Golden Axe II) - } else { + } + else + { // High word of command: pvid->command&=0x0000ffff; pvid->command|=d<<16; @@ -413,24 +447,21 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d) PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a) { - unsigned int d=0; - a&=0x1c; - if (a==0x00) // data port { - d=VideoRead(); - goto end; + return VideoRead(); } if (a==0x04) // control port { struct PicoVideo *pv=&Pico.video; + unsigned int d; d=pv->status; - if (PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast) - if (!(pv->reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled - if (SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs) + if (PicoOpt&POPT_ALT_RENDERER) d|=0x0020; // sprite collision (Shadow of the Beast) + if (!(pv->reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled + if (SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs) d|=(pv->pending_ints&0x20)<<2; // V-int pending? if (d&0x100) pv->status&=~0x100; // FIFO no longer full @@ -438,7 +469,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a) pv->pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald) elprintf(EL_SR, "SR read: %04x @ %06x", d, SekPc); - goto end; + return d; } // H-counter info (based on Generator): @@ -458,30 +489,23 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a) // check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune if ((a&0x1c)==0x08) { - unsigned int hc; - - if(Pico.m.scanline != -1) { - int lineCycles=(488-SekCyclesLeft)&0x1ff; - d=Pico.m.scanline; // V-Counter - - if(Pico.video.reg[12]&1) - hc=hcounts_40[lineCycles]; - else hc=hcounts_32[lineCycles]; - - //if(lineCycles > 488-12) d++; // Wheel of Fortune + unsigned int hc, d; + int lineCycles; + + lineCycles = (488-SekCyclesLeft)&0x1ff; + d = Pico.m.scanline; // V-Counter + + if (Pico.video.reg[12]&1) + hc=hcounts_40[lineCycles]; + else hc=hcounts_32[lineCycles]; + + if (Pico.m.pal) { + if (d >= 0x103) d-=56; // based on Gens } else { - // get approximate V-Counter - d=vcounts[SekCyclesDone()>>8]; - hc = Pico.m.rotate&0xff; + if (d >= 0xEB) d-=6; } - if(Pico.m.pal) { - if(d >= 0x103) d-=56; // based on Gens - } else { - if(d >= 0xEB) d-=6; - } - - if((Pico.video.reg[12]&6) == 6) { + if ((Pico.video.reg[12]&6) == 6) { // interlace mode 2 (Combat Cars (UE) [!]) d <<= 1; if (d&0xf00) d|= 1; @@ -490,10 +514,8 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a) elprintf(EL_HVCNT, "hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc); d&=0xff; d<<=8; d|=hc; - goto end; + return d; } -end: - - return d; + return 0; }