bugfixes in sram memhandlers

[picodrive.git] / Pico / Memory.c

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