mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-24 00:49:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HW/Memmap: Refactor Memory to class, move to Core::System.

Browse source
This commit is contained in:
Admiral H. Curtiss 2022-12-02 20:07:30 +01:00
commit 839db591d9
No known key found for this signature in database
GPG key ID: F051B4C4044F33FB
83 changed files with 2222 additions and 1361 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/Core/State.cpp
View file

@ -194,17 +194,19 @@ static void DoState(PointerWrap& p)
}
// Check to make sure the emulated memory sizes are the same as the savestate
u32 state_mem1_size = Memory::GetRamSizeReal();
u32 state_mem2_size = Memory::GetExRamSizeReal();
auto& system = Core::System::GetInstance();
auto& memory = system.GetMemory();
u32 state_mem1_size = memory.GetRamSizeReal();
u32 state_mem2_size = memory.GetExRamSizeReal();
p.Do(state_mem1_size);
p.Do(state_mem2_size);
if (state_mem1_size != Memory::GetRamSizeReal() || state_mem2_size != Memory::GetExRamSizeReal())
if (state_mem1_size != memory.GetRamSizeReal() || state_mem2_size != memory.GetExRamSizeReal())
{
OSD::AddMessage(fmt::format("Memory size mismatch!\n"
"Current | MEM1 {:08X} ({:3}MB) MEM2 {:08X} ({:3}MB)\n"
"State | MEM1 {:08X} ({:3}MB) MEM2 {:08X} ({:3}MB)",
Memory::GetRamSizeReal(), Memory::GetRamSizeReal() / 0x100000U,
Memory::GetExRamSizeReal(), Memory::GetExRamSizeReal() / 0x100000U,
memory.GetRamSizeReal(), memory.GetRamSizeReal() / 0x100000U,
memory.GetExRamSizeReal(), memory.GetExRamSizeReal() / 0x100000U,
state_mem1_size, state_mem1_size / 0x100000U, state_mem2_size,
state_mem2_size / 0x100000U));
p.SetMeasureMode();
@ -225,7 +227,7 @@ static void DoState(PointerWrap& p)
p.DoMarker("PowerPC");
// CoreTiming needs to be restored before restoring Hardware because
// the controller code might need to schedule an event if the controller has changed.
Core::System::GetInstance().GetCoreTiming().DoState(p);
system.GetCoreTiming().DoState(p);
p.DoMarker("CoreTiming");
HW::DoState(p);
p.DoMarker("HW");