RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

DMNA handling fix

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@555 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-07-21 19:45:10 +00:00
parent 2b02d6e533
commit 39230401af
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Pico/cd/Memory.c
View file

@ -21,11 +21,13 @@ typedef unsigned int u32;
#ifdef _MSC_VER #ifdef _MSC_VER
#define rdprintf #define rdprintf
#define wrdprintf #define wrdprintf
#define r3printf
#else #else
//#define rdprintf dprintf //#define rdprintf dprintf
#define rdprintf(...) #define rdprintf(...)
//#define wrdprintf dprintf //#define wrdprintf dprintf
#define wrdprintf(...) #define wrdprintf(...)
#define r3printf(...)
#endif #endif
#ifdef EMU_CORE_DEBUG #ifdef EMU_CORE_DEBUG
@ -57,7 +59,7 @@ static u32 m68k_reg_read16(u32 a)
d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7); d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);
// the DMNA delay must only be visible on s68k side (Lunar2, Silpheed) // the DMNA delay must only be visible on s68k side (Lunar2, Silpheed)
if (Pico_mcd->m.state_flags&2) { d &= ~1; d |= 2; } if (Pico_mcd->m.state_flags&2) { d &= ~1; d |= 2; }
//printf("m68k_regs r3: %02x @%06x\n", (u8)d, SekPc); r3printf(EL_STATUS, "m68k_regs r3: %02x @%06x", (u8)d, SekPc);
goto end; goto end;
case 4: case 4:
d = Pico_mcd->s68k_regs[4]<<8; d = Pico_mcd->s68k_regs[4]<<8;
@ -122,7 +124,7 @@ void m68k_reg_write8(u32 a, u32 d)
return; return;
case 3: { case 3: {
u32 dold = Pico_mcd->s68k_regs[3]&0x1f; u32 dold = Pico_mcd->s68k_regs[3]&0x1f;
//printf("m68k_regs w3: %02x @%06x\n", (u8)d, SekPc); r3printf(EL_STATUS, "m68k_regs w3: %02x @%06x", (u8)d, SekPc);
d &= 0xc2; d &= 0xc2;
if ((dold>>6) != ((d>>6)&3)) if ((dold>>6) != ((d>>6)&3))
dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3)); dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));
@ -134,10 +136,12 @@ void m68k_reg_write8(u32 a, u32 d)
} else { } else {
//dold &= ~2; // ?? //dold &= ~2; // ??
#if 1 #if 1
if ((d & 2) && !(dold & 2)) { if (d & (d ^ dold) & 2) { // DMNA is being set
Pico_mcd->m.state_flags |= 2; // we must delay setting DMNA bit (needed for Silpheed) Pico_mcd->m.state_flags |= 2; // we must delay setting DMNA bit (needed for Silpheed)
d &= ~2; d &= ~2;
} }
else
Pico_mcd->m.state_flags &= ~2;
#else #else
if (d & 2) dold &= ~1; // return word RAM to s68k in 2M mode if (d & 2) dold &= ~1; // return word RAM to s68k in 2M mode
#endif #endif
@ -239,7 +243,7 @@ u32 s68k_reg_read16(u32 a)
return ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state return ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state
case 2: case 2:
d = (Pico_mcd->s68k_regs[2]<<8) | (Pico_mcd->s68k_regs[3]&0x1f); d = (Pico_mcd->s68k_regs[2]<<8) | (Pico_mcd->s68k_regs[3]&0x1f);
//printf("s68k_regs r3: %02x @%06x\n", (u8)d, SekPcS68k); r3printf(EL_STATUS, "s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);
return s68k_poll_detect(a, d); return s68k_poll_detect(a, d);
case 6: case 6:
return CDC_Read_Reg(); return CDC_Read_Reg();
@ -289,10 +293,11 @@ void s68k_reg_write8(u32 a, u32 d)
return; // only m68k can change WP return; // only m68k can change WP
case 3: { case 3: {
int dold = Pico_mcd->s68k_regs[3]; int dold = Pico_mcd->s68k_regs[3];
//elprintf(EL_STATUS, "s68k_regs w3: %02x s@%06x", (u8)d, SekPcS68k); r3printf(EL_STATUS, "s68k_regs w3: %02x @%06x", (u8)d, SekPcS68k);
d &= 0x1d; d &= 0x1d;
d |= dold&0xc2; d |= dold&0xc2;
if (d&4) { if (d&4)
{
if ((d ^ dold) & 5) { if ((d ^ dold) & 5) {
d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit d &= ~2; // in case of mode or bank change we clear DMNA (m68k req) bit
PicoMemResetCD(d); PicoMemResetCD(d);
@ -302,12 +307,14 @@ void s68k_reg_write8(u32 a, u32 d)
PicoMemResetCDdecode(d); PicoMemResetCDdecode(d);
#endif #endif
if (!(dold & 4)) { if (!(dold & 4)) {
dprintf("wram mode 2M->1M"); r3printf(EL_STATUS, "wram mode 2M->1M");
wram_2M_to_1M(Pico_mcd->word_ram2M); wram_2M_to_1M(Pico_mcd->word_ram2M);
} }
} else { }
else
{
if (dold & 4) { if (dold & 4) {
dprintf("wram mode 1M->2M"); r3printf(EL_STATUS, "wram mode 1M->2M");
if (!(d&1)) { // it didn't set the ret bit, which means it doesn't want to give WRAM to m68k if (!(d&1)) { // it didn't set the ret bit, which means it doesn't want to give WRAM to m68k
d &= ~3; d &= ~3;
d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode d |= (dold&1) ? 2 : 1; // then give it to the one which had bank0 in 1M mode
@ -319,6 +326,7 @@ void s68k_reg_write8(u32 a, u32 d)
d |= dold&1; d |= dold&1;
if (d&1) d &= ~2; // return word RAM to m68k in 2M mode if (d&1) d &= ~2; // return word RAM to m68k in 2M mode
} }
Pico_mcd->m.state_flags &= ~2;
break; break;
} }
case 4: case 4: