// some dumb detection is used, but that should be enough to make things work\r
if ((a>>22) == 1 && Pico.romsize >= 512*1024) {\r
if (*(int *)(Pico.rom+0x123e4) == 0x00550c39 && *(int *)(Pico.rom+0x123e8) == 0x00000040) { // Super Bubble Bobble (Unl) [!]\r
- if (a == 0x400000) { d=0x55<<8; goto end; }\r
- else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
- }\r
- else if (*(int *)(Pico.rom+0x008c4) == 0x66240055 && *(int *)(Pico.rom+0x008c8) == 0x00404df9) { // Smart Mouse (Unl)\r
- if (a == 0x400000) { d=0x55<<8; goto end; }\r
- else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
- else if (a == 0x400004) { d=0xaa<<8; goto end; }\r
- else if (a == 0x400006) { d=0xf0<<8; goto end; }\r
- }\r
- else if (*(int *)(Pico.rom+0x00404) == 0x00a90600 && *(int *)(Pico.rom+0x00408) == 0x6708b013) { // King of Fighters '98, The (Unl) [!]\r
- if (a == 0x480000 || a == 0x4800e0 || a == 0x4824a0 || a == 0x488880) { d=0xaa<<8; goto end; }\r
- else if (a == 0x4a8820) { d=0x0a<<8; goto end; }\r
- // there is also a read @ 0x4F8820 which needs 0, but that is returned in default case\r
- }\r
- else if (*(int *)(Pico.rom+0x01b24) == 0x004013f9 && *(int *)(Pico.rom+0x01b28) == 0x00ff0000) { // Mahjong Lover (Unl) [!]\r
- if (a == 0x400000) { d=0x90<<8; goto end; }\r
- else if (a == 0x401000) { d=0xd3<<8; goto end; } // this one doesn't seem to be needed, the code does 2 comparisons and only then\r
- // checks the result, which is of the above one. Left it just in case.\r
- }\r
- else if (*(int *)(Pico.rom+0x05254) == 0x0c3962d0 && *(int *)(Pico.rom+0x05258) == 0x00400055) { // Elf Wor (Unl)\r
- if (a == 0x400000) { d=0x55<<8; goto end; }\r
- else if (a == 0x400004) { d=0xc9<<8; goto end; } // this check is done if the above one fails\r
- else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
- else if (a == 0x400006) { d=0x18<<8; goto end; } // similar to above\r
- }\r
+ if (a == 0x400000) { d=0x55<<8; goto end; }\r
+ else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
+ }\r
+ else if (*(int *)(Pico.rom+0x008c4) == 0x66240055 && *(int *)(Pico.rom+0x008c8) == 0x00404df9) { // Smart Mouse (Unl)\r
+ if (a == 0x400000) { d=0x55<<8; goto end; }\r
+ else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
+ else if (a == 0x400004) { d=0xaa<<8; goto end; }\r
+ else if (a == 0x400006) { d=0xf0<<8; goto end; }\r
+ }\r
+ else if (*(int *)(Pico.rom+0x00404) == 0x00a90600 && *(int *)(Pico.rom+0x00408) == 0x6708b013) { // King of Fighters '98, The (Unl) [!]\r
+ if (a == 0x480000 || a == 0x4800e0 || a == 0x4824a0 || a == 0x488880) { d=0xaa<<8; goto end; }\r
+ else if (a == 0x4a8820) { d=0x0a<<8; goto end; }\r
+ // there is also a read @ 0x4F8820 which needs 0, but that is returned in default case\r
+ }\r
+ else if (*(int *)(Pico.rom+0x01b24) == 0x004013f9 && *(int *)(Pico.rom+0x01b28) == 0x00ff0000) { // Mahjong Lover (Unl) [!]\r
+ if (a == 0x400000) { d=0x90<<8; goto end; }\r
+ else if (a == 0x401000) { d=0xd3<<8; goto end; } // this one doesn't seem to be needed, the code does 2 comparisons and only then\r
+ // checks the result, which is of the above one. Left it just in case.\r
+ }\r
+ else if (*(int *)(Pico.rom+0x05254) == 0x0c3962d0 && *(int *)(Pico.rom+0x05258) == 0x00400055) { // Elf Wor (Unl)\r
+ if (a == 0x400000) { d=0x55<<8; goto end; }\r
+ else if (a == 0x400004) { d=0xc9<<8; goto end; } // this check is done if the above one fails\r
+ else if (a == 0x400002) { d=0x0f<<8; goto end; }\r
+ else if (a == 0x400006) { d=0x18<<8; goto end; } // similar to above\r
+ }\r
// our default behaviour is to return whatever was last written a 0x400000-0x7fffff range (used by Squirrel King (R) [!])\r
- // Lion King II, The (Unl) [!] writes @ 400000 and wants to get that val @ 400002 and wites another val\r
- // @ 400004 which is expected @ 400006, so we really remember 2 values here\r
+ // Lion King II, The (Unl) [!] writes @ 400000 and wants to get that val @ 400002 and wites another val\r
+ // @ 400004 which is expected @ 400006, so we really remember 2 values here\r
d = Pico.m.prot_bytes[(a>>2)&1]<<8;\r
}\r
else if (a == 0xa13000 && Pico.romsize >= 1024*1024) {\r
if (*(int *)(Pico.rom+0xc8af0) == 0x30133013 && *(int *)(Pico.rom+0xc8af4) == 0x000f0240) { // Rockman X3 (Unl) [!]\r
- d=0x0c; goto end;\r
- }\r
+ d=0x0c; goto end;\r
+ }\r
else if (*(int *)(Pico.rom+0x28888) == 0x07fc0000 && *(int *)(Pico.rom+0x2888c) == 0x4eb94e75) { // Bug's Life, A (Unl) [!]\r
- d=0x28; goto end; // does the check from RAM\r
- }\r
+ d=0x28; goto end; // does the check from RAM\r
+ }\r
else if (*(int *)(Pico.rom+0xc8778) == 0x30133013 && *(int *)(Pico.rom+0xc877c) == 0x000f0240) { // Super Mario Bros. (Unl) [!]\r
- d=0x0c; goto end; // seems to be the same code as in Rockman X3 (Unl) [!]\r
- }\r
+ d=0x0c; goto end; // seems to be the same code as in Rockman X3 (Unl) [!]\r
+ }\r
else if (*(int *)(Pico.rom+0xf20ec) == 0x30143013 && *(int *)(Pico.rom+0xf20f0) == 0x000f0200) { // Super Mario 2 1998 (Unl) [!]\r
- d=0x0a; goto end;\r
- }\r
+ d=0x0a; goto end;\r
+ }\r
}\r
else if (a == 0xa13002) { // Pocket Monsters (Unl)\r
d=0x01; goto end;\r
}\r
else if (a == 0x30fe02) {\r
// Virtua Racing - just for fun\r
- // this seems to be some flag that SVP is ready or something similar\r
+ // this seems to be some flag that SVP is ready or something similar\r
d=1; goto end;\r
}\r
\r
\r
if ((a&0xff0000)==0xa00000) {\r
if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)\r
- if ((a&0x6000)==0x4000) { if(PicoOpt&1) d=YM2612Read(); else d=Pico.m.rotate++&3; goto end; } // 0x4000-0x5fff, Fudge if disabled\r
- d=0xffff; goto end;\r
+ if ((a&0x6000)==0x4000) { if(PicoOpt&1) d=YM2612Read(); else d=Pico.m.rotate++&3; dprintf("read ym2612: %04x", d); goto end; } // 0x4000-0x5fff, Fudge if disabled\r
+ d=0xffff; goto end;\r
}\r
if ((a&0xffffe0)==0xa10000) { // I/O ports\r
a=(a>>1)&0xf;\r
goto end;\r
}\r
// |=0x80 for Shadow of the Beast & Super Offroad; rotate fakes next fetched instruction for Time Killers\r
- if (a==0xa11100) { d=((Pico.m.z80Run&1)<<8)|0x8000|Pico.m.rotate++; goto end; }\r
+ if (a==0xa11100) {\r
+ extern int z80stopCycle; // TODO: tidy\r
+ d=Pico.m.z80Run&1;\r
+ if (!d) {\r
+ int stop_before = SekCyclesDone() - z80stopCycle;\r
+ if (stop_before > 0 && stop_before <= 16*2) // Gens uses 16 here\r
+ d = 1; // bus not yet available\r
+ }\r
+ d=(d<<8)|0x8000|Pico.m.rotate++;\r
+ dprintf("get_zrun: %04x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), SekPc);\r
+ goto end; }\r
\r
#ifndef _ASM_MEMORY_C\r
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }\r
return;\r
}\r
if (a==0xa11100) {\r
- extern int z80startCycle, z80stopCycle;\r
+ extern int z80startCycle, z80stopCycle;\r
//int lineCycles=(488-SekCyclesLeft)&0x1ff;\r
d&=1; d^=1;\r
- if(!d) {\r
- // hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)\r
- if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20);\r
- z80stopCycle = SekCyclesDone();\r
- //z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()\r
- } else {\r
- z80startCycle = SekCyclesDone();\r
- //if(Pico.m.scanline != -1)\r
- //z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;\r
- }\r
- //dprintf("set_zrun: %i [%i|%i] zPC=%04x @%06x", d, Pico.m.scanline, SekCyclesDone(), mz80GetRegisterValue(NULL, 0), SekPc);\r
- Pico.m.z80Run=(u8)d; return;\r
- }\r
- if (a==0xa11200) { if(!(d&1)) z80_reset(); return; }\r
+ if(!d) {\r
+ // hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)\r
+ // if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20); // FIXME: movies\r
+ z80stopCycle = SekCyclesDone();\r
+ //z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()\r
+ } else {\r
+ z80startCycle = SekCyclesDone();\r
+ //if(Pico.m.scanline != -1)\r
+ //z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;\r
+ }\r
+ dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);\r
+ Pico.m.z80Run=(u8)d; return;\r
+ }\r
+ if (a==0xa11200) { dprintf("write z80Reset: %02x", d); if(!(d&1)) z80_reset(); return; }\r
\r
if ((a&0xff7f00)==0xa06000) // Z80 BANK register\r
{\r
if(a >= SRam.start && a <= SRam.end) {\r
unsigned int sreg = Pico.m.sram_reg;\r
if(!(sreg & 0x10)) {\r
- // not detected SRAM\r
- if((a&~1)==0x200000) {\r
+ // not detected SRAM\r
+ if((a&~1)==0x200000) {\r
Pico.m.sram_reg|=4; // this should be a game with EEPROM (like NBA Jam)\r
SRam.start=0x200000; SRam.end=SRam.start+1;\r
}\r
- Pico.m.sram_reg|=0x10;\r
- }\r
+ Pico.m.sram_reg|=0x10;\r
+ }\r
if(sreg & 4) { // EEPROM write\r
- if(SekCyclesDoneT()-lastSSRamWrite < 46) {\r
- // just update pending state\r
- SRAMUpdPending(a, d);\r
- } else {\r
- SRAMWriteEEPROM(sreg>>6); // execute pending\r
- SRAMUpdPending(a, d);\r
+ if(SekCyclesDoneT()-lastSSRamWrite < 46) {\r
+ // just update pending state\r
+ SRAMUpdPending(a, d);\r
+ } else {\r
+ SRAMWriteEEPROM(sreg>>6); // execute pending\r
+ SRAMUpdPending(a, d);\r
lastSSRamWrite = SekCyclesDoneT();\r
- }\r
+ }\r
} else if(!(sreg & 2)) {\r
u8 *pm=(u8 *)(SRam.data-SRam.start+a);\r
if(*pm != (u8)d) {\r
SRam.changed = 1;\r
*pm=(u8)d;\r
}\r
- }\r
+ }\r
return;\r
}\r
\r
\r
if(a >= 0xA13004 && a < 0xA13040) {\r
// dumb 12-in-1 or 4-in-1 banking support\r
- int len;\r
- a &= 0x3f; a <<= 16;\r
- len = Pico.romsize - a;\r
- if (len <= 0) return; // invalid/missing bank\r
- if (len > 0x200000) len = 0x200000; // 2 megs\r
- memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.\r
+ int len;\r
+ a &= 0x3f; a <<= 16;\r
+ len = Pico.romsize - a;\r
+ if (len <= 0) return; // invalid/missing bank\r
+ if (len > 0x200000) len = 0x200000; // 2 megs\r
+ memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.\r
return;\r
}\r
\r
return;\r
}\r
if (a==0xa11100) { OtherWrite8(a, d>>8, 16); return; }\r
- if (a==0xa11200) { if(!(d&0x100)) z80_reset(); return; }\r
+ if (a==0xa11200) { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }\r
\r
OtherWrite8(a, d>>8, 16);\r
OtherWrite8(a+1,d&0xff, 16);\r
if(a >= SRam.start && a <= SRam.end) {\r
unsigned int sreg = Pico.m.sram_reg;\r
if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM\r
- Pico.m.sram_reg|=0x10; // should be normal SRAM\r
- }\r
+ Pico.m.sram_reg|=0x10; // should be normal SRAM\r
+ }\r
if(sreg & 4) { // EEPROM read\r
d = SRAMReadEEPROM();\r
goto end;\r
\r
unsigned int m68k_read_memory_8(unsigned int address)\r
{\r
- return (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
+ return (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);\r
}\r
\r
unsigned int m68k_read_memory_16(unsigned int address)\r
{\r
- return (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
+ return (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);\r
}\r
\r
unsigned int m68k_read_memory_32(unsigned int address)\r
{\r
- return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
+ return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);\r
}\r
\r
void m68k_write_memory_8(unsigned int address, unsigned int value)\r
{\r
- if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
+ if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);\r
}\r
\r
void m68k_write_memory_16(unsigned int address, unsigned int value)\r
{\r
- if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
+ if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);\r
}\r
\r
void m68k_write_memory_32(unsigned int address, unsigned int value)\r
{\r
- if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
+ if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);\r
}\r
#endif\r
#endif // EMU_M68K\r
return 0;\r
}\r
\r
+static int dma_timings[] = {\r
+83, 167, 166, 83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy\r
+102, 205, 204, 102, // vblank: 40cell:\r
+8, 16, 15, 8, // active: 32cell:\r
+9, 18, 17, 9 // ...\r
+};\r
+\r
+static void CheckDMA(void)\r
+{\r
+ int burn = 0, bytes_can = 0, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes\r
+ int bytes = Pico.m.dma_bytes;\r
+\r
+ if(dma_op & 2) bytes_can = dma_op;\r
+ else if(Pico.video.type!=1) bytes_can = 1; // setting dma_timings offset here according to Gens\r
+ if(Pico.video.reg[12] & 1) bytes_can += 4; // 40 cell mode?\r
+ if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) { dma_op|=4; bytes_can += 8; } // active display?\r
+ bytes_can = dma_timings[bytes_can];\r
+\r
+ if(bytes <= bytes_can) {\r
+ if(dma_op&2) Pico.video.status&=~2; // dma no longer busy\r
+ else {\r
+ if(dma_op&4) burn = bytes*(((488<<8)/18 ))>>8; // have to be approximate because can't afford division..\r
+ else burn = bytes*(((488<<8)/205))>>8;\r
+ }\r
+ Pico.m.dma_bytes = 0;\r
+ } else {\r
+ if(!(dma_op&2)) burn = 488;\r
+ Pico.m.dma_bytes -= bytes_can;\r
+ }\r
+\r
+ SekCycleCnt+=burn;\r
+ dprintf("~Dma %i op=%i can=%i burn=%i [%i|%i]", Pico.m.dma_bytes, dma_op, bytes_can, burn, Pico.m.scanline, SekCyclesDone());\r
+}\r
+\r
static __inline void SekRun(int cyc)\r
{\r
int cyc_do;\r
SekCycleAim+=cyc;\r
- if((cyc_do=SekCycleAim-SekCycleCnt) < 0) return;\r
+#if 0\r
+ if(Pico.m.dma_bytes) {\r
+ int burn=0;\r
+ if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?\r
+ if(Pico.m.dma_bytes < 205) {\r
+ burn = Pico.m.dma_bytes*(((488<<8)/205))>>8;\r
+ Pico.m.dma_bytes = 0;\r
+ } else {\r
+ burn += 488;\r
+ Pico.m.dma_bytes -= 205;\r
+ }\r
+ } else {\r
+ if(Pico.m.dma_bytes < 18) {\r
+ burn = Pico.m.dma_bytes*(((488<<8)/18))>>8;\r
+ Pico.m.dma_bytes = 0;\r
+ } else {\r
+ burn += 488;\r
+ Pico.m.dma_bytes -= 18;\r
+ }\r
+ }\r
+ SekCycleCnt+=burn;\r
+ dprintf("~DmaSlow %i burn=%i do=%i [%i|%i]", Pico.m.dma_bytes, burn, SekCycleAim-SekCycleCnt,\r
+ Pico.m.scanline, SekCyclesDone());\r
+ }\r
+#endif\r
+ if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;\r
#if defined(EMU_C68K) && defined(EMU_M68K)\r
// this means we do run-compare Cyclone vs Musashi\r
SekCycleCnt+=CM_compareRun(cyc_do);\r
{\r
//dprintf("vint: @ %06x [%i|%i]", SekPc, y, SekCycleCnt);\r
pv->status|=0x88; // V-Int happened, go into vblank\r
- SekRun(128); SekCycleAim-=128; // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)\r
- /*if(Pico.m.z80Run && (PicoOpt&4)) {\r
- z80CycleAim+=cycles_z80/2;\r
- total_z80+=z80_run(z80CycleAim-total_z80);\r
- z80CycleAim-=cycles_z80/2;\r
- }*/\r
+ if(!Pico.m.dma_bytes||(Pico.video.reg[0x17]&0x80)) {\r
+ // there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)\r
+ SekRun(128); SekCycleAim-=128;\r
+ }\r
pv->pending_ints|=0x20;\r
if(pv->reg[1]&0x20) SekInterrupt(6);\r
if(Pico.m.z80Run && (PicoOpt&4)) // ?\r
getSamples(y);\r
\r
// Run scanline:\r
+ if(Pico.m.dma_bytes) CheckDMA();\r
SekRun(cycles_68k);\r
if((PicoOpt&4) && Pico.m.z80Run) {\r
Pico.m.z80Run|=2;\r
case 8: d=Pico.cram [a&0x003f]; break;\r
case 4: d=Pico.vsram[a&0x003f]; break;\r
}\r
- \r
+\r
AutoIncrement();\r
return d;\r
}\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]", Pico.video.type, source, a, len, inc,\r
- // (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\r
+ dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,\r
+ (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\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
- //dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
+// dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);\r
\r
switch (Pico.video.type)\r
{\r
}\r
rendstatus|=0x10;\r
break;\r
- \r
+\r
case 3: // cram\r
- //dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,\r
- // (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\r
+ dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,\r
+ (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());\r
Pico.m.dirtyPal = 1;\r
r = Pico.cram;\r
for(a2=a&0x7f; len; len--)\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
+ 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
\r
source =Pico.video.reg[0x15];\r
source|=Pico.video.reg[0x16]<<8;\r
unsigned char *vr=(unsigned char *) Pico.vram;\r
unsigned char high = (unsigned char) (data >> 8);\r
unsigned char inc=Pico.video.reg[0xf];\r
- \r
+\r
len=GetDmaLength();\r
- //dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());\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
\r
// from Charles MacDonald's genvdp.txt:\r
// Write lower byte to address specified\r
a&=0x1c;\r
\r
if (a==0x00) // Data port 0 or 2\r
- { \r
+ {\r
if (pvid->pending) CommandChange();\r
pvid->pending=0;\r
\r
unsigned int PicoVideoRead(unsigned int a)\r
{\r
unsigned int d=0;\r
- \r
+\r
a&=0x1c;\r
\r
if (a==0x00) // data port\r
\r
if (a==0x04) // control port\r
{\r
- //dprintf("sr_read @ %06x [%i|%i]", SekPc, Pico.m.scanline, SekCyclesDone());\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
\r
Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)\r
\r
// |---------------------|--------------------------|\r
// E4 (hc[0x43]==0) 07 B1 // 40\r
// E8 (hc[0x45]==0) 05 91 // 32\r
- \r
+\r
// check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune\r
if ((a&0x1c)==0x08)\r
{\r
if (d&0xf00) d|= 1;\r
}\r
\r
- //dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);\r
+ dprintf("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 / commitdiff