diff options
| author | LillyJadeKatrin <lilly.kitty.1988@gmail.com> | 2025-05-04 08:18:02 -0400 |
|---|---|---|
| committer | LillyJadeKatrin <lilly.kitty.1988@gmail.com> | 2025-05-06 16:59:27 -0400 |
| commit | 85bb066cb0a1a16f3eadbef263ca8f72d654caad (patch) | |
| tree | 6533ae7b0044860ee29941ccd19c9ae02a446a70 /Source/Core | |
| parent | 599f28045ec2baf0426102a3ef42a2ce5be40445 (diff) | |
AchievementManager: update dev memory clone for Wii
The clone of system memory used by AchievementManager during achievement development for the sake of thread decoupling was only copying MEM1; this grabs MEM2 as well if it exists.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/AchievementManager.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp index b8ec132bc8..dc818c8718 100644 --- a/Source/Core/Core/AchievementManager.cpp +++ b/Source/Core/Core/AchievementManager.cpp @@ -330,10 +330,11 @@ void AchievementManager::DoFrame() if (!system) return; Core::CPUThreadGuard thread_guard(*system); - u32 ram_size = system->GetMemory().GetRamSizeReal(); - if (m_cloned_memory.size() != ram_size) - m_cloned_memory.resize(ram_size); - system->GetMemory().CopyFromEmu(m_cloned_memory.data(), 0, m_cloned_memory.size()); + u32 mem2_size = system->GetMemory().GetExRamSizeReal(); + if (m_cloned_memory.size() != MEM1_SIZE + mem2_size) + m_cloned_memory.resize(MEM1_SIZE + mem2_size); + system->GetMemory().CopyFromEmu(m_cloned_memory.data(), 0, MEM1_SIZE); + system->GetMemory().CopyFromEmu(m_cloned_memory.data() + MEM1_SIZE, MEM2_START, mem2_size); } #endif // RC_CLIENT_SUPPORTS_RAINTEGRATION std::lock_guard lg{m_lock}; @@ -1351,6 +1352,8 @@ u32 AchievementManager::MemoryPeeker(u32 address, u8* buffer, u32 num_bytes, rc_ return 0; } Core::CPUThreadGuard thread_guard(system); + if (address > MEM1_SIZE) + address += (MEM2_START - MEM1_SIZE); for (u32 num_read = 0; num_read < num_bytes; num_read++) { auto value = system.GetMMU().HostTryReadU8(thread_guard, address + num_read, @@ -1591,7 +1594,10 @@ void AchievementManager::MemoryPoker(u32 address, u8* buffer, u32 num_bytes, rc_ return; Core::CPUThreadGuard thread_guard(*system); std::lock_guard lg{instance.m_memory_lock}; - system->GetMemory().CopyToEmu(address, buffer, num_bytes); + if (address < MEM1_SIZE) + system->GetMemory().CopyToEmu(address, buffer, num_bytes); + else + system->GetMemory().CopyToEmu(address - MEM1_SIZE + MEM2_START, buffer, num_bytes); std::copy(buffer, buffer + num_bytes, instance.m_cloned_memory.begin() + address); } void AchievementManager::GameTitleEstimateHandler(char* buffer, u32 buffer_size, |