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

Merge pull request #544 from cxd4/dedotated_wam_4_mah_serv0r 

cleaner RdramChanged algorithm (not biased to only 4 vs. 8 MB)
This commit is contained in:
zilmar 2015-07-27 14:05:16 +10:00
parent 764567c8df 51975fb00d
commit 1a481c520a
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
View File

@ -5372,25 +5372,38 @@ void CMipsMemoryVM::TLB_Unmaped( DWORD Vaddr, DWORD Len )
void CMipsMemoryVM::RdramChanged ( CMipsMemoryVM * _this ) void CMipsMemoryVM::RdramChanged ( CMipsMemoryVM * _this )
{ {
if (_this->m_AllocatedRdramSize == g_Settings->LoadDword(Game_RDRamSize)) const size_t new_size = g_Settings -> LoadDword(Game_RDRamSize);
const size_t old_size = _this -> m_AllocatedRdramSize;
if (old_size == new_size)
{ {
return; return;
} }
if (_this->m_AllocatedRdramSize == 0x400000) if (old_size > new_size)
{ {
if (VirtualAlloc(_this->m_RDRAM + 0x400000, 0x400000, MEM_COMMIT, PAGE_READWRITE)==NULL) VirtualFree(
{ _this->m_RDRAM + new_size,
WriteTrace(TraceError,__FUNCTION__ ": failed to allocate extended memory"); old_size - new_size,
g_Notify->FatalError(GS(MSG_MEM_ALLOC_ERROR)); MEM_DECOMMIT
} );
_this->m_AllocatedRdramSize = 0x800000;
} }
else else
{ {
VirtualFree(_this->m_RDRAM + 0x400000, 0x400000,MEM_DECOMMIT); void * result;
_this->m_AllocatedRdramSize = 0x400000;
}
result = VirtualAlloc(
_this->m_RDRAM + old_size,
new_size - old_size,
MEM_COMMIT,
PAGE_READWRITE
);
if (result == NULL)
{
WriteTrace(TraceError, __FUNCTION__": failed to allocate extended memory");
g_Notify -> FatalError(GS(MSG_MEM_ALLOC_ERROR));
}
}
_this->m_AllocatedRdramSize = new_size;
} }
void CMipsMemoryVM::ChangeSpStatus() void CMipsMemoryVM::ChangeSpStatus()