ARAM: further cleanup, use AddressSpace accessors

dolphin-emu · May 16, 2019 · 94e6c9c · 94e6c9c
1 parent 0edf337
commit 94e6c9c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
@@ -34,7 +34,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
 #include "Core/DSPEmulator.h"
-
+#include "Core/HW/AddressSpace.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/ProcessorInterface.h"
@@ -211,9 +211,9 @@ void Reinit(bool hle)
   if (SConfig::GetInstance().bWii)
   {
     s_ARAM.wii_mode = true;
-    s_ARAM.size = Memory::EXRAM_SIZE;
-    s_ARAM.mask = Memory::EXRAM_MASK;
-    s_ARAM.ptr = Memory::m_pEXRAM;
+    s_ARAM.size = 0;
+    s_ARAM.mask = 0;
+    s_ARAM.ptr = nullptr;
   }
   else
   {
@@ -620,22 +620,26 @@ static void Do_ARAM_DMA()
 
 u8 ReadARAM(u32 address)
 {
-  if (s_ARAM.wii_mode)
-  {
-    return Memory::Read_U8(address & 0x1fffffff);
-  }
-  return s_ARAM.ptr[address & s_ARAM.mask];
+  AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(
+      s_ARAM.wii_mode ? AddressSpace::Type::Physical : AddressSpace::Type::Auxiliary);
+  return accessors->ReadU8(address);
 }
 
 void WriteARAM(u8 value, u32 address)
 {
-  // TODO: verify this on Wii
-  s_ARAM.ptr[address & s_ARAM.mask] = value;
+  AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(
+      s_ARAM.wii_mode ? AddressSpace::Type::Physical : AddressSpace::Type::Auxiliary);
+  accessors->WriteU8(address, value);
 }
 
 u8* GetARAMPtr()
 {
   return s_ARAM.ptr;
 }
 
+u32 GetARAMPhysicalSize()
+{
+  return s_ARAM.size;
+}
+
 }  // end of namespace DSP
diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h
@@ -26,7 +26,8 @@ enum DSPInterruptType
 enum
 {
   ARAM_SIZE = 0x01000000,  // 16 MB
-  ARAM_MASK = 0x00FFFFFF,
+  // ARAM_SIZE is always a power-of-two, so (ARAM_SIZE-1) is the mask
+  ARAM_MASK = ARAM_SIZE - 1,
 };
 
 // UDSPControl