From dd0aadac9751f93fadbe4d2d3446eb621369a7c5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 28 Oct 2014 03:57:28 -0700 Subject: [PATCH] MemoryWindow: Use p_pFakeVMEM, not the virtual mirror They point to the same contents, so there's no reason to use the mirror. This lets us make all the mirrors static. --- Source/Core/Core/HW/Memmap.cpp | 2 +- Source/Core/Core/HW/Memmap.h | 1 - Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index 7fa8d6243d..2483ac4906 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -79,7 +79,7 @@ static u8* m_pPhysicalEXRAM; // wii only static u8* m_pVirtualCachedEXRAM; // wii only static u8* m_pVirtualUncachedEXRAM; // wii only static u8* m_pVirtualL1Cache; -u8* m_pVirtualFakeVMEM; +static u8* m_pVirtualFakeVMEM; // MMIO mapping object. MMIO::Mapping* mmio_mapping; diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index 57be35c554..bc312646f8 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -33,7 +33,6 @@ extern u8* base; extern u8* m_pRAM; extern u8* m_pEXRAM; extern u8* m_pL1Cache; -extern u8* m_pVirtualFakeVMEM; extern u8* m_pFakeVMEM; extern bool bFakeVMEM; diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index 60978b6693..c620d327c6 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -278,7 +278,7 @@ void CMemoryWindow::OnDumpMem2( wxCommandEvent& event ) // Write fake vmem to file void CMemoryWindow::OnDumpFakeVMEM( wxCommandEvent& event ) { - DumpArray(File::GetUserPath(F_FAKEVMEMDUMP_IDX), Memory::m_pVirtualFakeVMEM, Memory::FAKEVMEM_SIZE); + DumpArray(File::GetUserPath(F_FAKEVMEMDUMP_IDX), Memory::m_pFakeVMEM, Memory::FAKEVMEM_SIZE); } void CMemoryWindow::U8(wxCommandEvent& event)