eeprom crash fix, PacMan2 hack

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@431 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-04-26 20:11:19 +00:00
parent daec725334
commit 583ab72c0b
3 changed files with 13 additions and 5 deletions

View file

@ -122,7 +122,7 @@ u32 OtherRead16(u32 a, int realsize)
if ((a&0xff0000)==0xa00000)
{
if (Pico.m.z80Run&1)
elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x]", a);
elprintf(EL_ANOMALY, "68k z80 read with no bus! [%06x] @ %06x", a, SekPc);
if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
if(PicoOpt&POPT_EN_FM) d=YM2612Read();
@ -168,7 +168,10 @@ void OtherWrite8(u32 a,u32 d)
if ((a&0xe700f9)==0xc00011||(a&0xff7ff9)==0xa07f11) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
if ((a&0xff4000)==0xa00000) { // z80 RAM
if (!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)d;
else elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x", a, d);
else {
elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x @ %06x", a, d, SekPc);
SekCyclesBurn(4); // hack?
}
return;
}
if ((a&0xff6000)==0xa04000) { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d)&1; return; } // FM Sound
@ -216,7 +219,7 @@ void OtherWrite16(u32 a,u32 d)
if ((a&0xff6000)==0xa04000) { if(PicoOpt&1) emustatus|=YM2612Write(a&3, d)&1; return; } // FM Sound (??)
if ((a&0xff4000)==0xa00000) { // Z80 ram (MSB only)
if (!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8);
else elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x", a, d);
else elprintf(EL_ANOMALY, "68k z80 write with no bus! [%06x] %02x @ %06x", a, d, SekPc);
return;
}
if (a==0xa11200) {

View file

@ -57,6 +57,8 @@ void PicoExit(void)
void PicoPower(void)
{
unsigned char sram_reg=Pico.m.sram_reg; // must be preserved
// clear all memory of the emulated machine
memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
@ -74,6 +76,7 @@ void PicoPower(void)
if (PicoAHW & PAHW_MCD)
PicoPowerMCD();
Pico.m.sram_reg=sram_reg;
PicoReset();
}

View file

@ -209,8 +209,10 @@ static int PicoFrameHints(void)
elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);
SekInterrupt(6);
}
if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))
if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80)) {
elprintf(EL_INTS, "zint");
z80_int();
}
if (PicoOpt&POPT_EN_FM)
Psnd_timers_and_dac(y);