ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Remove windows.h from FunctionMapClass.cpp

This commit is contained in:
zilmar 2016-01-14 08:38:54 +11:00
parent 02b7db1007
commit 266b277a1d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Project64-core/N64System/Recompiler/FunctionMapClass.cpp
View File

@ -12,7 +12,6 @@
#include <Project64-core/N64System/Recompiler/FunctionMapClass.h> #include <Project64-core/N64System/Recompiler/FunctionMapClass.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64Class.h>
#include <Windows.h>
CFunctionMap::CFunctionMap() : CFunctionMap::CFunctionMap() :
m_JumpTable(NULL), m_JumpTable(NULL),
@ -29,14 +28,14 @@ bool CFunctionMap::AllocateMemory()
{ {
if (g_System->LookUpMode() == FuncFind_VirtualLookup && m_FunctionTable == NULL) if (g_System->LookUpMode() == FuncFind_VirtualLookup && m_FunctionTable == NULL)
{ {
m_FunctionTable = (PCCompiledFunc_TABLE *)VirtualAlloc(NULL, 0xFFFFF * sizeof(CCompiledFunc *), MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); m_FunctionTable = new PCCompiledFunc_TABLE[0x100000];
if (m_FunctionTable == NULL) if (m_FunctionTable == NULL)
{ {
WriteTrace(TraceRecompiler, TraceError, "failed to allocate function table"); WriteTrace(TraceRecompiler, TraceError, "failed to allocate function table");
g_Notify->FatalError(MSG_MEM_ALLOC_ERROR); g_Notify->FatalError(MSG_MEM_ALLOC_ERROR);
return false; return false;
} }
memset(m_FunctionTable, 0, 0xFFFFF * sizeof(CCompiledFunc *)); memset(m_FunctionTable, 0, 0x100000 * sizeof(PCCompiledFunc_TABLE));
} }
if (g_System->LookUpMode() == FuncFind_PhysicalLookup && m_JumpTable == NULL) if (g_System->LookUpMode() == FuncFind_PhysicalLookup && m_JumpTable == NULL)
{ {
@ -63,7 +62,7 @@ void CFunctionMap::CleanBuffers()
delete m_FunctionTable[i]; delete m_FunctionTable[i];
} }
} }
VirtualFree(m_FunctionTable, 0, MEM_RELEASE); delete [] m_FunctionTable;
m_FunctionTable = NULL; m_FunctionTable = NULL;
} }
if (m_JumpTable) if (m_JumpTable)