added warning logs to MBCs

neonichu · Jul 25, 2013 · 7c79515 · 7c79515
1 parent af98601
commit 7c79515
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/src/MBC1MemoryRule.cpp b/src/MBC1MemoryRule.cpp
@@ -59,7 +59,7 @@ u8 MBC1MemoryRule::PerformRead(u16 address)
                     if ((m_pCartridge->GetRAMSize() == 1) && (address >= 0xA800))
                     {
                         // only 2KB of ram
-                        Log("--> ** Attempting to read from non usable address %X", address);
+                        Log("--> ** Attempting to read from invalid RAM %X", address);
                     }
                     return m_pRAMBanks[address - 0xA000];
                 }
@@ -151,7 +151,7 @@ void MBC1MemoryRule::PerformWrite(u16 address, u8 value)
                     if ((m_pCartridge->GetRAMSize() == 1) && (address >= 0xA800))
                     {
                         // only 2KB of ram
-                        Log("--> ** Attempting to write on non usable address %X %X", address, value);
+                        Log("--> ** Attempting to write on invalid RAM %X %X", address, value);
                     }
 
                     m_pRAMBanks[address - 0xA000] = value;
@@ -190,6 +190,7 @@ void MBC1MemoryRule::Reset(bool bCGB)
 void MBC1MemoryRule::SaveRam(std::ofstream &file)
 {
     Log("MBC1MemoryRule save RAM...");
+    Log("MBC1MemoryRule saving %d banks...", m_pCartridge->GetRAMBankCount());
 
     u32 ramSize = m_pCartridge->GetRAMBankCount() * 0x2000;
 
@@ -205,22 +206,20 @@ void MBC1MemoryRule::SaveRam(std::ofstream &file)
 bool MBC1MemoryRule::LoadRam(std::ifstream &file, s32 fileSize)
 {
     Log("MBC1MemoryRule load RAM...");
+    Log("MBC1MemoryRule loading %d banks...", m_pCartridge->GetRAMBankCount());
 
     s32 ramSize = m_pCartridge->GetRAMBankCount() * 0x2000;
 
-    if (fileSize > 0)
+    if ((fileSize > 0) && (fileSize != ramSize))
     {
-        if (fileSize != ramSize)
-        {
-            Log("MBC1MemoryRule incorrect size. Expected: %d Found: %d", ramSize, fileSize);
-            return false;
-        }
+        Log("MBC1MemoryRule incorrect size. Expected: %d Found: %d", ramSize, fileSize);
+        return false;
     }
     else if (fileSize == 0)
     {
+        // compatibility with old saves
         u8 mode;
         file.read(reinterpret_cast<char*> (&mode), 1);
-
         Log("MBC1MemoryRule load RAM mode %d", mode);
     }
 

diff --git a/src/MBC2MemoryRule.cpp b/src/MBC2MemoryRule.cpp
@@ -60,7 +60,7 @@ u8 MBC2MemoryRule::PerformRead(u16 address)
             }
             else
             {
-                Log("--> ** Attempting to read from non usable address %X", address);
+                Log("--> ** Attempting to read from ivalid RAM %X", address);
                 return 0x00;
             }
         }
@@ -81,6 +81,10 @@ void MBC2MemoryRule::PerformWrite(u16 address, u8 value)
             {
                 m_bRamEnabled = (value & 0x0F) == 0x0A;
             }
+            else
+            {
+                Log("--> ** Attempting to write on invalid register %X %X", address, value);
+            }
             break;
         }
         case 0x2000:
@@ -93,12 +97,16 @@ void MBC2MemoryRule::PerformWrite(u16 address, u8 value)
                 m_iCurrentROMBank &= (m_pCartridge->GetROMBankCount() - 1);
                 m_CurrentROMAddress = m_iCurrentROMBank * 0x4000;
             }
+            else
+            {
+                Log("--> ** Attempting to write on invalid register %X %X", address, value);
+            }
             break;
         }
         case 0x4000:
         case 0x6000:
         {
-            Log("--> ** Attempting to write on non usable address %X %X", address, value);
+            Log("--> ** Attempting to write on invalid address %X %X", address, value);
             break;
         }
         case 0xA000:
@@ -116,7 +124,7 @@ void MBC2MemoryRule::PerformWrite(u16 address, u8 value)
             }
             else
             {
-                Log("--> ** Attempting to write on non usable address %X %X", address, value);
+                Log("--> ** Attempting to write on invalid RAM %X %X", address, value);
             }
             break;
         }

diff --git a/src/MBC5MemoryRule.cpp b/src/MBC5MemoryRule.cpp
@@ -101,7 +101,7 @@ void MBC5MemoryRule::PerformWrite(u16 address, u8 value)
         }
         case 0x6000:
         {
-            Log("--> ** Attempting to write on non usable address %X %X", address, value);
+            Log("--> ** Attempting to write on invalid address %X %X", address, value);
             break;
         }
         case 0xA000:
@@ -140,6 +140,7 @@ void MBC5MemoryRule::Reset(bool bCGB)
 void MBC5MemoryRule::SaveRam(std::ofstream & file)
 {
     Log("MBC5MemoryRule save RAM...");
+    Log("MBC5MemoryRule saving %d banks...", m_pCartridge->GetRAMBankCount());
 
     s32 ramSize = m_pCartridge->GetRAMBankCount() * 0x2000;
 
@@ -155,6 +156,7 @@ void MBC5MemoryRule::SaveRam(std::ofstream & file)
 bool MBC5MemoryRule::LoadRam(std::ifstream & file, s32 fileSize)
 {
     Log("MBC5MemoryRule load RAM...");
+    Log("MBC5MemoryRule loading %d banks...", m_pCartridge->GetRAMBankCount());
 
     s32 ramSize = m_pCartridge->GetRAMBankCount() * 0x2000;