funkey/picodrive-irixxxx
1
0
Fork 0
mirror of https://github.com/FunKey-Project/picodrive-irixxxx.git synced 2026-05-01 18:39:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfixes in sram memhandlers

Browse Source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@301 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
2007-11-21 22:04:59 +00:00
parent c6196c0f01
commit 9dc0982919
5 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Pico/Memory.c
View File

@@ -141,16 +141,33 @@ static
u32 SRAMRead(u32 a)
{
unsigned int sreg = Pico.m.sram_reg;
if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
if (!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
elprintf(EL_SRAMIO, "normal sram detected.");
Pico.m.sram_reg|=0x10; // should be normal SRAM
}
if(sreg & 4) // EEPROM read
if (sreg & 4) // EEPROM read
return SRAMReadEEPROM();
else // if(sreg & 1) // (sreg&5) is one of prerequisites
return *(u8 *)(SRam.data-SRam.start+a);
}
#ifndef _ASM_MEMORY_C
static
#endif
u32 SRAMRead16(u32 a)
{
u32 d;
if (Pico.m.sram_reg & 4) {
d = SRAMReadEEPROM();
d |= d << 8;
} else {
u8 *pm=(u8 *)(SRam.data-SRam.start+a);
d =*pm++ << 8;
d|=*pm++;
}
return d;
}
static void SRAMWrite(u32 a, u32 d)
{
unsigned int sreg = Pico.m.sram_reg;
@@ -363,8 +380,7 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
#ifndef EMU_CORE_DEBUG
// sram
if (a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
d = SRAMRead(a);
d |= d<<8;
d = SRAMRead16(a);
elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc);
goto end;
}
@@ -400,8 +416,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
// sram
if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
d = (SRAMRead(a)<<16)|SRAMRead(a+2);
d |= d<<8;
d = (SRAMRead16(a)<<16)|SRAMRead16(a+2);
elprintf(EL_SRAMIO, "sram r32 [%06x] %08x @ %06x", a, d, SekPc);
goto end;
}