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

[Project64] Some code clean of up MemoryVirtualMem.cpp

This commit is contained in:
zilmar 2016-09-24 08:40:58 +10:00
parent 812dae99f5
commit 90560dd0da
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -45,12 +45,12 @@ CMipsMemoryVM::CMipsMemoryVM(bool SavesReadOnly) :
m_HalfLineCheck(false),
m_FieldSerration(0),
m_TLB_ReadMap(NULL),
m_TLB_WriteMap(NULL)
m_TLB_WriteMap(NULL),
m_RDRAM(NULL),
m_DMEM(NULL),
m_IMEM(NULL)
{
g_Settings->RegisterChangeCB(Game_RDRamSize, this, (CSettings::SettingChangedFunc)RdramChanged);
m_RDRAM = NULL;
m_DMEM = NULL;
m_IMEM = NULL;
}
uint32_t swap32by8(uint32_t word)
@ -137,11 +137,13 @@ bool CMipsMemoryVM::Initialize()
if (m_Reserve1)
{
m_RDRAM = m_Reserve1; m_Reserve1 = NULL;
m_RDRAM = m_Reserve1;
m_Reserve1 = NULL;
}
if (m_RDRAM == NULL && m_Reserve2)
{
m_RDRAM = m_Reserve2; m_Reserve2 = NULL;
m_RDRAM = m_Reserve2;
m_Reserve2 = NULL;
}
if (m_RDRAM == NULL)
{
@ -703,10 +705,6 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t PAddr, uint32_t* Value)
case 0x1FC00000: Load32PifRam(); break;
case 0x1FF00000: Load32CartridgeDomain1Address3(); break;
default:
if (bHaveDebugger())
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
m_MemLookupValue.UW[0] = PAddr & 0xFFFF;
m_MemLookupValue.UW[0] = (m_MemLookupValue.UW[0] << 16) | m_MemLookupValue.UW[0];
}

2
Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
View File

@ -116,6 +116,8 @@ private:
#if defined(__i386__) || defined(_M_IX86)
friend CX86RecompilerOps;
#elif defined(__arm__) || defined(_M_ARM)
friend CArmRegInfo;
#endif
static void RdramChanged(CMipsMemoryVM * _this);