From b4a35166549f56525e6061153ed614441759a5f3 Mon Sep 17 00:00:00 2001 From: zilmar Date: Sun, 13 Dec 2015 19:26:41 +1100 Subject: [PATCH] [Project64] Clean up RecompilerMemory.cpp --- .../N64System/Recompiler/RecompilerMemory.cpp | 104 +++++++++--------- .../N64System/Recompiler/RecompilerMemory.h | 30 ++--- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp index c4d720b6e..304d21861 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.cpp @@ -18,78 +18,78 @@ CRecompMemory::CRecompMemory() : m_RecompCode(NULL), m_RecompSize(0) { - m_RecompPos = NULL; + m_RecompPos = NULL; } CRecompMemory::~CRecompMemory() { - if (m_RecompCode) - { - VirtualFree(m_RecompCode, 0, MEM_RELEASE); - m_RecompCode = NULL; - } - m_RecompPos = NULL; + if (m_RecompCode) + { + VirtualFree(m_RecompCode, 0, MEM_RELEASE); + m_RecompCode = NULL; + } + m_RecompPos = NULL; } bool CRecompMemory::AllocateMemory() { - uint8_t * RecompCodeBase = (uint8_t *)VirtualAlloc(NULL, MaxCompileBufferSize + 4, MEM_RESERVE | MEM_TOP_DOWN, PAGE_EXECUTE_READWRITE); - if (RecompCodeBase == NULL) - { - WriteTrace(TraceError, __FUNCTION__ ": failed to allocate RecompCodeBase"); - g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR); - return false; - } + uint8_t * RecompCodeBase = (uint8_t *)VirtualAlloc(NULL, MaxCompileBufferSize + 4, MEM_RESERVE | MEM_TOP_DOWN, PAGE_EXECUTE_READWRITE); + if (RecompCodeBase == NULL) + { + WriteTrace(TraceError, __FUNCTION__ ": failed to allocate RecompCodeBase"); + g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR); + return false; + } - m_RecompCode = (uint8_t *)VirtualAlloc(RecompCodeBase, InitialCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); - if (m_RecompCode == NULL) - { - WriteTrace(TraceError, __FUNCTION__ ": failed to commit initial buffer"); - VirtualFree(RecompCodeBase, 0, MEM_RELEASE); - g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR); - return false; - } - m_RecompSize = InitialCompileBufferSize; - m_RecompPos = m_RecompCode; - memset(m_RecompCode, 0, InitialCompileBufferSize); - return true; + m_RecompCode = (uint8_t *)VirtualAlloc(RecompCodeBase, InitialCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + if (m_RecompCode == NULL) + { + WriteTrace(TraceError, __FUNCTION__ ": failed to commit initial buffer"); + VirtualFree(RecompCodeBase, 0, MEM_RELEASE); + g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR); + return false; + } + m_RecompSize = InitialCompileBufferSize; + m_RecompPos = m_RecompCode; + memset(m_RecompCode, 0, InitialCompileBufferSize); + return true; } void CRecompMemory::CheckRecompMem() { - uint32_t Size = (uint32_t)((uint8_t *)m_RecompPos - (uint8_t *)m_RecompCode); - if ((Size + 0x20000) < m_RecompSize) - { - return; - } - if (m_RecompSize == MaxCompileBufferSize) - { - g_Recompiler->ResetRecompCode(true); - return; - } - LPVOID MemAddr = VirtualAlloc(m_RecompCode + m_RecompSize, IncreaseCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); - if (MemAddr == NULL) - { - WriteTrace(TraceError, __FUNCTION__ ": failed to increase buffer"); - g_Notify->FatalError(MSG_MEM_ALLOC_ERROR); - } - m_RecompSize += IncreaseCompileBufferSize; + uint32_t Size = (uint32_t)((uint8_t *)m_RecompPos - (uint8_t *)m_RecompCode); + if ((Size + 0x20000) < m_RecompSize) + { + return; + } + if (m_RecompSize == MaxCompileBufferSize) + { + g_Recompiler->ResetRecompCode(true); + return; + } + LPVOID MemAddr = VirtualAlloc(m_RecompCode + m_RecompSize, IncreaseCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + if (MemAddr == NULL) + { + WriteTrace(TraceError, __FUNCTION__ ": failed to increase buffer"); + g_Notify->FatalError(MSG_MEM_ALLOC_ERROR); + } + m_RecompSize += IncreaseCompileBufferSize; } void CRecompMemory::Reset() { - m_RecompPos = m_RecompCode; + m_RecompPos = m_RecompCode; } void CRecompMemory::ShowMemUsed() { - uint32_t Size = m_RecompPos - m_RecompCode; - uint32_t MB = Size / 0x100000; - Size -= MB * 0x100000; - uint32_t KB = Size / 1024; - Size -= KB * 1024; + uint32_t Size = m_RecompPos - m_RecompCode; + uint32_t MB = Size / 0x100000; + Size -= MB * 0x100000; + uint32_t KB = Size / 1024; + Size -= KB * 1024; - uint32_t TotalAvaliable = m_RecompSize / 0x100000; + uint32_t TotalAvaliable = m_RecompSize / 0x100000; - g_Notify->DisplayMessage(0, stdstr_f("Memory used: %d mb %-3d kb %-3d bytes Total Available: %d mb", MB, KB, Size, TotalAvaliable).ToUTF16().c_str()); -} + g_Notify->DisplayMessage(0, stdstr_f("Memory used: %d mb %-3d kb %-3d bytes Total Available: %d mb", MB, KB, Size, TotalAvaliable).ToUTF16().c_str()); +} \ No newline at end of file diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h index 007779008..d7b6140b4 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h +++ b/Source/Project64-core/N64System/Recompiler/RecompilerMemory.h @@ -12,27 +12,27 @@ #include "X86ops.h" class CRecompMemory : - protected CX86Ops + protected CX86Ops { protected: - CRecompMemory(); - ~CRecompMemory(); + CRecompMemory(); + ~CRecompMemory(); - bool AllocateMemory(); - void CheckRecompMem(); - void Reset(); - void ShowMemUsed(); + bool AllocateMemory(); + void CheckRecompMem(); + void Reset(); + void ShowMemUsed(); - uint8_t* RecompPos() const { return m_RecompPos; } + uint8_t* RecompPos() const { return m_RecompPos; } private: - CRecompMemory(const CRecompMemory&); // Disable copy constructor - CRecompMemory& operator=(const CRecompMemory&); // Disable assignment + CRecompMemory(const CRecompMemory&); // Disable copy constructor + CRecompMemory& operator=(const CRecompMemory&); // Disable assignment - uint8_t * m_RecompCode; - uint32_t m_RecompSize; + uint8_t * m_RecompCode; + uint32_t m_RecompSize; - enum { MaxCompileBufferSize = 0x03C00000 }; - enum { InitialCompileBufferSize = 0x00500000 }; - enum { IncreaseCompileBufferSize = 0x00100000 }; + enum { MaxCompileBufferSize = 0x03C00000 }; + enum { InitialCompileBufferSize = 0x00500000 }; + enum { IncreaseCompileBufferSize = 0x00100000 }; };