mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 07:17:45 -04:00
trying to add movie support
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@3 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
cc68a136aa
commit
4f67228034
6 changed files with 215 additions and 107 deletions
170
Pico/Memory.c
170
Pico/Memory.c
|
|
@ -181,49 +181,49 @@ u32 UnusualRead16(u32 a, int realsize)
|
|||
// some dumb detection is used, but that should be enough to make things work
|
||||
if ((a>>22) == 1 && Pico.romsize >= 512*1024) {
|
||||
if (*(int *)(Pico.rom+0x123e4) == 0x00550c39 && *(int *)(Pico.rom+0x123e8) == 0x00000040) { // Super Bubble Bobble (Unl) [!]
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x008c4) == 0x66240055 && *(int *)(Pico.rom+0x008c8) == 0x00404df9) { // Smart Mouse (Unl)
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
else if (a == 0x400004) { d=0xaa<<8; goto end; }
|
||||
else if (a == 0x400006) { d=0xf0<<8; goto end; }
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x00404) == 0x00a90600 && *(int *)(Pico.rom+0x00408) == 0x6708b013) { // King of Fighters '98, The (Unl) [!]
|
||||
if (a == 0x480000 || a == 0x4800e0 || a == 0x4824a0 || a == 0x488880) { d=0xaa<<8; goto end; }
|
||||
else if (a == 0x4a8820) { d=0x0a<<8; goto end; }
|
||||
// there is also a read @ 0x4F8820 which needs 0, but that is returned in default case
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x01b24) == 0x004013f9 && *(int *)(Pico.rom+0x01b28) == 0x00ff0000) { // Mahjong Lover (Unl) [!]
|
||||
if (a == 0x400000) { d=0x90<<8; goto end; }
|
||||
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
|
||||
// checks the result, which is of the above one. Left it just in case.
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x05254) == 0x0c3962d0 && *(int *)(Pico.rom+0x05258) == 0x00400055) { // Elf Wor (Unl)
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400004) { d=0xc9<<8; goto end; } // this check is done if the above one fails
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
else if (a == 0x400006) { d=0x18<<8; goto end; } // similar to above
|
||||
}
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x008c4) == 0x66240055 && *(int *)(Pico.rom+0x008c8) == 0x00404df9) { // Smart Mouse (Unl)
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
else if (a == 0x400004) { d=0xaa<<8; goto end; }
|
||||
else if (a == 0x400006) { d=0xf0<<8; goto end; }
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x00404) == 0x00a90600 && *(int *)(Pico.rom+0x00408) == 0x6708b013) { // King of Fighters '98, The (Unl) [!]
|
||||
if (a == 0x480000 || a == 0x4800e0 || a == 0x4824a0 || a == 0x488880) { d=0xaa<<8; goto end; }
|
||||
else if (a == 0x4a8820) { d=0x0a<<8; goto end; }
|
||||
// there is also a read @ 0x4F8820 which needs 0, but that is returned in default case
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x01b24) == 0x004013f9 && *(int *)(Pico.rom+0x01b28) == 0x00ff0000) { // Mahjong Lover (Unl) [!]
|
||||
if (a == 0x400000) { d=0x90<<8; goto end; }
|
||||
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
|
||||
// checks the result, which is of the above one. Left it just in case.
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x05254) == 0x0c3962d0 && *(int *)(Pico.rom+0x05258) == 0x00400055) { // Elf Wor (Unl)
|
||||
if (a == 0x400000) { d=0x55<<8; goto end; }
|
||||
else if (a == 0x400004) { d=0xc9<<8; goto end; } // this check is done if the above one fails
|
||||
else if (a == 0x400002) { d=0x0f<<8; goto end; }
|
||||
else if (a == 0x400006) { d=0x18<<8; goto end; } // similar to above
|
||||
}
|
||||
// our default behaviour is to return whatever was last written a 0x400000-0x7fffff range (used by Squirrel King (R) [!])
|
||||
// Lion King II, The (Unl) [!] writes @ 400000 and wants to get that val @ 400002 and wites another val
|
||||
// @ 400004 which is expected @ 400006, so we really remember 2 values here
|
||||
// Lion King II, The (Unl) [!] writes @ 400000 and wants to get that val @ 400002 and wites another val
|
||||
// @ 400004 which is expected @ 400006, so we really remember 2 values here
|
||||
d = Pico.m.prot_bytes[(a>>2)&1]<<8;
|
||||
}
|
||||
else if (a == 0xa13000 && Pico.romsize >= 1024*1024) {
|
||||
if (*(int *)(Pico.rom+0xc8af0) == 0x30133013 && *(int *)(Pico.rom+0xc8af4) == 0x000f0240) { // Rockman X3 (Unl) [!]
|
||||
d=0x0c; goto end;
|
||||
}
|
||||
d=0x0c; goto end;
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0x28888) == 0x07fc0000 && *(int *)(Pico.rom+0x2888c) == 0x4eb94e75) { // Bug's Life, A (Unl) [!]
|
||||
d=0x28; goto end; // does the check from RAM
|
||||
}
|
||||
d=0x28; goto end; // does the check from RAM
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0xc8778) == 0x30133013 && *(int *)(Pico.rom+0xc877c) == 0x000f0240) { // Super Mario Bros. (Unl) [!]
|
||||
d=0x0c; goto end; // seems to be the same code as in Rockman X3 (Unl) [!]
|
||||
}
|
||||
d=0x0c; goto end; // seems to be the same code as in Rockman X3 (Unl) [!]
|
||||
}
|
||||
else if (*(int *)(Pico.rom+0xf20ec) == 0x30143013 && *(int *)(Pico.rom+0xf20f0) == 0x000f0200) { // Super Mario 2 1998 (Unl) [!]
|
||||
d=0x0a; goto end;
|
||||
}
|
||||
d=0x0a; goto end;
|
||||
}
|
||||
}
|
||||
else if (a == 0xa13002) { // Pocket Monsters (Unl)
|
||||
d=0x01; goto end;
|
||||
|
|
@ -233,7 +233,7 @@ u32 UnusualRead16(u32 a, int realsize)
|
|||
}
|
||||
else if (a == 0x30fe02) {
|
||||
// Virtua Racing - just for fun
|
||||
// this seems to be some flag that SVP is ready or something similar
|
||||
// this seems to be some flag that SVP is ready or something similar
|
||||
d=1; goto end;
|
||||
}
|
||||
|
||||
|
|
@ -251,8 +251,8 @@ u32 OtherRead16(u32 a, int realsize)
|
|||
|
||||
if ((a&0xff0000)==0xa00000) {
|
||||
if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
|
||||
if ((a&0x6000)==0x4000) { if(PicoOpt&1) d=YM2612Read(); else d=Pico.m.rotate++&3; goto end; } // 0x4000-0x5fff, Fudge if disabled
|
||||
d=0xffff; goto end;
|
||||
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
|
||||
d=0xffff; goto end;
|
||||
}
|
||||
if ((a&0xffffe0)==0xa10000) { // I/O ports
|
||||
a=(a>>1)&0xf;
|
||||
|
|
@ -266,7 +266,17 @@ u32 OtherRead16(u32 a, int realsize)
|
|||
goto end;
|
||||
}
|
||||
// |=0x80 for Shadow of the Beast & Super Offroad; rotate fakes next fetched instruction for Time Killers
|
||||
if (a==0xa11100) { d=((Pico.m.z80Run&1)<<8)|0x8000|Pico.m.rotate++; goto end; }
|
||||
if (a==0xa11100) {
|
||||
extern int z80stopCycle; // TODO: tidy
|
||||
d=Pico.m.z80Run&1;
|
||||
if (!d) {
|
||||
int stop_before = SekCyclesDone() - z80stopCycle;
|
||||
if (stop_before > 0 && stop_before <= 16*2) // Gens uses 16 here
|
||||
d = 1; // bus not yet available
|
||||
}
|
||||
d=(d<<8)|0x8000|Pico.m.rotate++;
|
||||
dprintf("get_zrun: %04x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), SekPc);
|
||||
goto end; }
|
||||
|
||||
#ifndef _ASM_MEMORY_C
|
||||
if ((a&0xe700e0)==0xc00000) { d=PicoVideoRead(a); goto end; }
|
||||
|
|
@ -302,23 +312,23 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
|
|||
return;
|
||||
}
|
||||
if (a==0xa11100) {
|
||||
extern int z80startCycle, z80stopCycle;
|
||||
extern int z80startCycle, z80stopCycle;
|
||||
//int lineCycles=(488-SekCyclesLeft)&0x1ff;
|
||||
d&=1; d^=1;
|
||||
if(!d) {
|
||||
// hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)
|
||||
if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20);
|
||||
z80stopCycle = SekCyclesDone();
|
||||
//z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()
|
||||
} else {
|
||||
z80startCycle = SekCyclesDone();
|
||||
//if(Pico.m.scanline != -1)
|
||||
//z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;
|
||||
}
|
||||
//dprintf("set_zrun: %i [%i|%i] zPC=%04x @%06x", d, Pico.m.scanline, SekCyclesDone(), mz80GetRegisterValue(NULL, 0), SekPc);
|
||||
Pico.m.z80Run=(u8)d; return;
|
||||
if(!d) {
|
||||
// hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)
|
||||
// if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20); // FIXME: movies
|
||||
z80stopCycle = SekCyclesDone();
|
||||
//z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()
|
||||
} else {
|
||||
z80startCycle = SekCyclesDone();
|
||||
//if(Pico.m.scanline != -1)
|
||||
//z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;
|
||||
}
|
||||
dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);
|
||||
Pico.m.z80Run=(u8)d; return;
|
||||
}
|
||||
if (a==0xa11200) { if(!(d&1)) z80_reset(); return; }
|
||||
if (a==0xa11200) { dprintf("write z80Reset: %02x", d); if(!(d&1)) z80_reset(); return; }
|
||||
|
||||
if ((a&0xff7f00)==0xa06000) // Z80 BANK register
|
||||
{
|
||||
|
|
@ -336,29 +346,29 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
|
|||
if(a >= SRam.start && a <= SRam.end) {
|
||||
unsigned int sreg = Pico.m.sram_reg;
|
||||
if(!(sreg & 0x10)) {
|
||||
// not detected SRAM
|
||||
if((a&~1)==0x200000) {
|
||||
// not detected SRAM
|
||||
if((a&~1)==0x200000) {
|
||||
Pico.m.sram_reg|=4; // this should be a game with EEPROM (like NBA Jam)
|
||||
SRam.start=0x200000; SRam.end=SRam.start+1;
|
||||
}
|
||||
Pico.m.sram_reg|=0x10;
|
||||
}
|
||||
Pico.m.sram_reg|=0x10;
|
||||
}
|
||||
if(sreg & 4) { // EEPROM write
|
||||
if(SekCyclesDoneT()-lastSSRamWrite < 46) {
|
||||
// just update pending state
|
||||
SRAMUpdPending(a, d);
|
||||
} else {
|
||||
SRAMWriteEEPROM(sreg>>6); // execute pending
|
||||
SRAMUpdPending(a, d);
|
||||
if(SekCyclesDoneT()-lastSSRamWrite < 46) {
|
||||
// just update pending state
|
||||
SRAMUpdPending(a, d);
|
||||
} else {
|
||||
SRAMWriteEEPROM(sreg>>6); // execute pending
|
||||
SRAMUpdPending(a, d);
|
||||
lastSSRamWrite = SekCyclesDoneT();
|
||||
}
|
||||
}
|
||||
} else if(!(sreg & 2)) {
|
||||
u8 *pm=(u8 *)(SRam.data-SRam.start+a);
|
||||
if(*pm != (u8)d) {
|
||||
SRam.changed = 1;
|
||||
*pm=(u8)d;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -379,12 +389,12 @@ static void OtherWrite8(u32 a,u32 d,int realsize)
|
|||
|
||||
if(a >= 0xA13004 && a < 0xA13040) {
|
||||
// dumb 12-in-1 or 4-in-1 banking support
|
||||
int len;
|
||||
a &= 0x3f; a <<= 16;
|
||||
len = Pico.romsize - a;
|
||||
if (len <= 0) return; // invalid/missing bank
|
||||
if (len > 0x200000) len = 0x200000; // 2 megs
|
||||
memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.
|
||||
int len;
|
||||
a &= 0x3f; a <<= 16;
|
||||
len = Pico.romsize - a;
|
||||
if (len <= 0) return; // invalid/missing bank
|
||||
if (len > 0x200000) len = 0x200000; // 2 megs
|
||||
memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -415,7 +425,7 @@ static void OtherWrite16(u32 a,u32 d)
|
|||
return;
|
||||
}
|
||||
if (a==0xa11100) { OtherWrite8(a, d>>8, 16); return; }
|
||||
if (a==0xa11200) { if(!(d&0x100)) z80_reset(); return; }
|
||||
if (a==0xa11200) { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
|
||||
|
||||
OtherWrite8(a, d>>8, 16);
|
||||
OtherWrite8(a+1,d&0xff, 16);
|
||||
|
|
@ -438,8 +448,8 @@ u8 CPU_CALL PicoRead8(u32 a)
|
|||
if(a >= SRam.start && a <= SRam.end) {
|
||||
unsigned int sreg = Pico.m.sram_reg;
|
||||
if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
|
||||
Pico.m.sram_reg|=0x10; // should be normal SRAM
|
||||
}
|
||||
Pico.m.sram_reg|=0x10; // should be normal SRAM
|
||||
}
|
||||
if(sreg & 4) { // EEPROM read
|
||||
d = SRAMReadEEPROM();
|
||||
goto end;
|
||||
|
|
@ -711,32 +721,32 @@ void PicoWriteCD32w(unsigned int a, unsigned int d);
|
|||
|
||||
unsigned int m68k_read_memory_8(unsigned int address)
|
||||
{
|
||||
return (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);
|
||||
return (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);
|
||||
}
|
||||
|
||||
unsigned int m68k_read_memory_16(unsigned int address)
|
||||
{
|
||||
return (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);
|
||||
return (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);
|
||||
}
|
||||
|
||||
unsigned int m68k_read_memory_32(unsigned int address)
|
||||
{
|
||||
return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);
|
||||
return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);
|
||||
}
|
||||
|
||||
void m68k_write_memory_8(unsigned int address, unsigned int value)
|
||||
{
|
||||
if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);
|
||||
if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);
|
||||
}
|
||||
|
||||
void m68k_write_memory_16(unsigned int address, unsigned int value)
|
||||
{
|
||||
if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);
|
||||
if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);
|
||||
}
|
||||
|
||||
void m68k_write_memory_32(unsigned int address, unsigned int value)
|
||||
{
|
||||
if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);
|
||||
if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);
|
||||
}
|
||||
#endif
|
||||
#endif // EMU_M68K
|
||||
|
|
|
|||
72
Pico/Pico.c
72
Pico/Pico.c
|
|
@ -187,11 +187,70 @@ int PicoReset(int hard)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int dma_timings[] = {
|
||||
83, 167, 166, 83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
|
||||
102, 205, 204, 102, // vblank: 40cell:
|
||||
8, 16, 15, 8, // active: 32cell:
|
||||
9, 18, 17, 9 // ...
|
||||
};
|
||||
|
||||
static void CheckDMA(void)
|
||||
{
|
||||
int burn = 0, bytes_can = 0, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes
|
||||
int bytes = Pico.m.dma_bytes;
|
||||
|
||||
if(dma_op & 2) bytes_can = dma_op;
|
||||
else if(Pico.video.type!=1) bytes_can = 1; // setting dma_timings offset here according to Gens
|
||||
if(Pico.video.reg[12] & 1) bytes_can += 4; // 40 cell mode?
|
||||
if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) { dma_op|=4; bytes_can += 8; } // active display?
|
||||
bytes_can = dma_timings[bytes_can];
|
||||
|
||||
if(bytes <= bytes_can) {
|
||||
if(dma_op&2) Pico.video.status&=~2; // dma no longer busy
|
||||
else {
|
||||
if(dma_op&4) burn = bytes*(((488<<8)/18 ))>>8; // have to be approximate because can't afford division..
|
||||
else burn = bytes*(((488<<8)/205))>>8;
|
||||
}
|
||||
Pico.m.dma_bytes = 0;
|
||||
} else {
|
||||
if(!(dma_op&2)) burn = 488;
|
||||
Pico.m.dma_bytes -= bytes_can;
|
||||
}
|
||||
|
||||
SekCycleCnt+=burn;
|
||||
dprintf("~Dma %i op=%i can=%i burn=%i [%i|%i]", Pico.m.dma_bytes, dma_op, bytes_can, burn, Pico.m.scanline, SekCyclesDone());
|
||||
}
|
||||
|
||||
static __inline void SekRun(int cyc)
|
||||
{
|
||||
int cyc_do;
|
||||
SekCycleAim+=cyc;
|
||||
if((cyc_do=SekCycleAim-SekCycleCnt) < 0) return;
|
||||
#if 0
|
||||
if(Pico.m.dma_bytes) {
|
||||
int burn=0;
|
||||
if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?
|
||||
if(Pico.m.dma_bytes < 205) {
|
||||
burn = Pico.m.dma_bytes*(((488<<8)/205))>>8;
|
||||
Pico.m.dma_bytes = 0;
|
||||
} else {
|
||||
burn += 488;
|
||||
Pico.m.dma_bytes -= 205;
|
||||
}
|
||||
} else {
|
||||
if(Pico.m.dma_bytes < 18) {
|
||||
burn = Pico.m.dma_bytes*(((488<<8)/18))>>8;
|
||||
Pico.m.dma_bytes = 0;
|
||||
} else {
|
||||
burn += 488;
|
||||
Pico.m.dma_bytes -= 18;
|
||||
}
|
||||
}
|
||||
SekCycleCnt+=burn;
|
||||
dprintf("~DmaSlow %i burn=%i do=%i [%i|%i]", Pico.m.dma_bytes, burn, SekCycleAim-SekCycleCnt,
|
||||
Pico.m.scanline, SekCyclesDone());
|
||||
}
|
||||
#endif
|
||||
if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
|
||||
#if defined(EMU_C68K) && defined(EMU_M68K)
|
||||
// this means we do run-compare Cyclone vs Musashi
|
||||
SekCycleCnt+=CM_compareRun(cyc_do);
|
||||
|
|
@ -333,12 +392,10 @@ static int PicoFrameHints(void)
|
|||
{
|
||||
//dprintf("vint: @ %06x [%i|%i]", SekPc, y, SekCycleCnt);
|
||||
pv->status|=0x88; // V-Int happened, go into vblank
|
||||
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)
|
||||
/*if(Pico.m.z80Run && (PicoOpt&4)) {
|
||||
z80CycleAim+=cycles_z80/2;
|
||||
total_z80+=z80_run(z80CycleAim-total_z80);
|
||||
z80CycleAim-=cycles_z80/2;
|
||||
}*/
|
||||
if(!Pico.m.dma_bytes||(Pico.video.reg[0x17]&0x80)) {
|
||||
// there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)
|
||||
SekRun(128); SekCycleAim-=128;
|
||||
}
|
||||
pv->pending_ints|=0x20;
|
||||
if(pv->reg[1]&0x20) SekInterrupt(6);
|
||||
if(Pico.m.z80Run && (PicoOpt&4)) // ?
|
||||
|
|
@ -364,6 +421,7 @@ static int PicoFrameHints(void)
|
|||
getSamples(y);
|
||||
|
||||
// Run scanline:
|
||||
if(Pico.m.dma_bytes) CheckDMA();
|
||||
SekRun(cycles_68k);
|
||||
if((PicoOpt&4) && Pico.m.z80Run) {
|
||||
Pico.m.z80Run|=2;
|
||||
|
|
|
|||
|
|
@ -123,7 +123,8 @@ struct PicoMisc
|
|||
unsigned char sram_cycle; // EEPROM SRAM cycle number
|
||||
unsigned char sram_slave; // EEPROM slave word for X24C02 and better SRAMs
|
||||
unsigned char prot_bytes[2]; // simple protection fakeing
|
||||
unsigned char pad1[8];
|
||||
unsigned short dma_bytes; //
|
||||
unsigned char pad1[6];
|
||||
};
|
||||
|
||||
// some assembly stuff depend on these, do not touch!
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ static unsigned int VideoRead()
|
|||
case 8: d=Pico.cram [a&0x003f]; break;
|
||||
case 4: d=Pico.vsram[a&0x003f]; break;
|
||||
}
|
||||
|
||||
|
||||
AutoIncrement();
|
||||
return d;
|
||||
}
|
||||
|
|
@ -99,22 +99,26 @@ static void DmaSlow(int len)
|
|||
source|=Pico.video.reg[0x16]<<9;
|
||||
source|=Pico.video.reg[0x17]<<17;
|
||||
|
||||
//dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,
|
||||
// (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());
|
||||
dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,
|
||||
(Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());
|
||||
|
||||
if ((source&0xe00000)==0xe00000) { pd=(u16 *)(Pico.ram+(source&0xfffe)); pdend=(u16 *)(Pico.ram+0x10000); } // Ram
|
||||
else if(source<Pico.romsize) { pd=(u16 *)(Pico.rom+(source&~1)); pdend=(u16 *)(Pico.rom+Pico.romsize); } // Rom
|
||||
else return; // Invalid source address
|
||||
|
||||
#if 0
|
||||
// CPU is stopped during DMA, so we burn some cycles to compensate that
|
||||
if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?
|
||||
burn = (len*(((488<<8)/167))>>8); // very approximate
|
||||
if(!(Pico.video.status&8)) burn+=burn>>1; // a hack for Legend of Galahad
|
||||
} else burn = DmaSlowBurn(len);
|
||||
SekCyclesBurn(burn);
|
||||
#else
|
||||
Pico.m.dma_bytes += len;
|
||||
#endif
|
||||
if(!(Pico.video.status&8))
|
||||
SekEndRun(0);
|
||||
//dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);
|
||||
// dprintf("DmaSlow burn: %i @ %06x", burn, SekPc);
|
||||
|
||||
switch (Pico.video.type)
|
||||
{
|
||||
|
|
@ -132,10 +136,10 @@ static void DmaSlow(int len)
|
|||
}
|
||||
rendstatus|=0x10;
|
||||
break;
|
||||
|
||||
|
||||
case 3: // cram
|
||||
//dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,
|
||||
// (Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());
|
||||
dprintf("DmaSlow[%i] %06x->%04x len %i inc=%i blank %i [%i|%i]", Pico.video.type, source, a, len, inc,
|
||||
(Pico.video.status&8)||!(Pico.video.reg[1]&0x40), Pico.m.scanline, SekCyclesDone());
|
||||
Pico.m.dirtyPal = 1;
|
||||
r = Pico.cram;
|
||||
for(a2=a&0x7f; len; len--)
|
||||
|
|
@ -177,7 +181,10 @@ static void DmaCopy(int len)
|
|||
unsigned char *vrs;
|
||||
unsigned char inc=Pico.video.reg[0xf];
|
||||
int source;
|
||||
//dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());
|
||||
dprintf("DmaCopy len %i [%i|%i]", len, Pico.m.scanline, SekCyclesDone());
|
||||
|
||||
Pico.m.dma_bytes += len;
|
||||
Pico.video.status|=2; // dma busy
|
||||
|
||||
source =Pico.video.reg[0x15];
|
||||
source|=Pico.video.reg[0x16]<<8;
|
||||
|
|
@ -205,9 +212,12 @@ static void DmaFill(int data)
|
|||
unsigned char *vr=(unsigned char *) Pico.vram;
|
||||
unsigned char high = (unsigned char) (data >> 8);
|
||||
unsigned char inc=Pico.video.reg[0xf];
|
||||
|
||||
|
||||
len=GetDmaLength();
|
||||
//dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());
|
||||
dprintf("DmaFill len %i inc %i [%i|%i]", len, inc, Pico.m.scanline, SekCyclesDone());
|
||||
|
||||
Pico.m.dma_bytes += len;
|
||||
Pico.video.status|=2; // dma busy
|
||||
|
||||
// from Charles MacDonald's genvdp.txt:
|
||||
// Write lower byte to address specified
|
||||
|
|
@ -273,7 +283,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
|
|||
a&=0x1c;
|
||||
|
||||
if (a==0x00) // Data port 0 or 2
|
||||
{
|
||||
{
|
||||
if (pvid->pending) CommandChange();
|
||||
pvid->pending=0;
|
||||
|
||||
|
|
@ -351,7 +361,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
|
|||
unsigned int PicoVideoRead(unsigned int a)
|
||||
{
|
||||
unsigned int d=0;
|
||||
|
||||
|
||||
a&=0x1c;
|
||||
|
||||
if (a==0x00) // data port
|
||||
|
|
@ -362,12 +372,12 @@ unsigned int PicoVideoRead(unsigned int a)
|
|||
|
||||
if (a==0x04) // control port
|
||||
{
|
||||
//dprintf("sr_read @ %06x [%i|%i]", SekPc, Pico.m.scanline, SekCyclesDone());
|
||||
d=Pico.video.status;
|
||||
if(PicoOpt&0x10) d|=0x0020; // sprite collision (Shadow of the Beast)
|
||||
if(Pico.m.rotate++&8) d|=0x0100; else d|=0x0200; // Toggle fifo full empty (who uses that stuff?)
|
||||
if(!(Pico.video.reg[1]&0x40)) d|=0x0008; // set V-Blank if display is disabled
|
||||
if(SekCyclesLeft < 84+4) d|=0x0004; // H-Blank (Sonic3 vs)
|
||||
dprintf("sr_read %04x @ %06x [%i|%i]", d, SekPc, Pico.m.scanline, SekCyclesDone());
|
||||
|
||||
Pico.video.pending=0; // ctrl port reads clear write-pending flag (Charles MacDonald)
|
||||
|
||||
|
|
@ -387,7 +397,7 @@ unsigned int PicoVideoRead(unsigned int a)
|
|||
// |---------------------|--------------------------|
|
||||
// E4 (hc[0x43]==0) 07 B1 // 40
|
||||
// E8 (hc[0x45]==0) 05 91 // 32
|
||||
|
||||
|
||||
// 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)
|
||||
{
|
||||
|
|
@ -420,7 +430,7 @@ unsigned int PicoVideoRead(unsigned int a)
|
|||
if (d&0xf00) d|= 1;
|
||||
}
|
||||
|
||||
//dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);
|
||||
dprintf("hv: %02x %02x (%i) @ %06x", hc, d, SekCyclesDone(), SekPc);
|
||||
d&=0xff; d<<=8;
|
||||
d|=hc;
|
||||
goto end;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ static int combo_keys = 0, combo_acts = 0; // keys and actions which need button
|
|||
static int gp2x_old_gamma = 100;
|
||||
static unsigned char *movie_data = NULL;
|
||||
static int movie_size = 0;
|
||||
static int frame_count = 0;
|
||||
int frame_count = 0;
|
||||
unsigned char *framebuff = 0; // temporary buffer for alt renderer
|
||||
int state_slot = 0;
|
||||
|
||||
|
|
@ -219,11 +219,18 @@ int emu_ReloadRom(void)
|
|||
if(movie_data[0x14] == '6')
|
||||
PicoOpt |= 0x20; // 6 button pad
|
||||
else PicoOpt &= ~0x20;
|
||||
PicoOpt |= 0x40; // accurate timing
|
||||
if(movie_data[0xF] >= 'A') {
|
||||
//Pico.m.pal = movie_data[0x16] >> 7;
|
||||
if(movie_data[0x16] & 0x80) {
|
||||
PicoRegionOverride = 8;
|
||||
} else {
|
||||
PicoRegionOverride = 4;
|
||||
}
|
||||
PicoReset(0);
|
||||
// TODO: bits 6 & 5
|
||||
}
|
||||
strcpy(noticeMsg, "MOVIE LOADED");
|
||||
movie_data[0x18+30] = 0;
|
||||
sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -988,6 +995,26 @@ void emu_Loop(void)
|
|||
updateKeys();
|
||||
PicoFrame();
|
||||
|
||||
#if 0
|
||||
// debug
|
||||
{
|
||||
static unsigned char oldscr[320*240*2];
|
||||
FILE *f; char name[128]; int i;
|
||||
for (i = 0; i < 320*240*2; i++)
|
||||
if(oldscr[i] != ((unsigned char *)gp2x_screen)[i]) break;
|
||||
if (i < 320*240*2)
|
||||
{
|
||||
for (i = 0; i < 320*240*2; i++)
|
||||
oldscr[i] = ((unsigned char *)gp2x_screen)[i];
|
||||
sprintf(name, "%05i.raw", frame_count);
|
||||
f = fopen(name, "wb");
|
||||
if (!f) { printf("!f\n"); exit(1); }
|
||||
fwrite(gp2x_screen, 1, 320*240*2, f);
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// check time
|
||||
gettimeofday(&tval, 0);
|
||||
if(thissec != tval.tv_sec) tval.tv_usec+=1000000;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@
|
|||
// pico.c
|
||||
#define CAN_HANDLE_240_LINES 1
|
||||
|
||||
#define dprintf(f,...) printf(f"\n",##__VA_ARGS__)
|
||||
extern int frame_count;
|
||||
|
||||
#define dprintf(f,...) printf("%05i: " f "\n",frame_count,##__VA_ARGS__)
|
||||
//#define dprintf(x...)
|
||||
|
||||
#endif //PORT_CONFIG_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue