diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 512668b55..ebbfd416e 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -536,8 +536,8 @@ bool CN64System::SetActiveSystem( bool bActive ) g_SystemEvents = this; g_NextTimer = &m_NextTimer; g_Plugins = m_Plugins; - _TLBLoadAddress = &m_TLBLoadAddress; - _TLBStoreAddress = &m_TLBStoreAddress; + g_TLBLoadAddress = &m_TLBLoadAddress; + g_TLBStoreAddress = &m_TLBStoreAddress; R4300iOp::m_TestTimer = m_TestTimer; R4300iOp::m_NextInstruction = m_NextInstruction; R4300iOp::m_JumpToLocation = m_JumpToLocation; @@ -567,8 +567,8 @@ bool CN64System::SetActiveSystem( bool bActive ) g_SystemEvents = NULL; g_NextTimer = NULL; g_Plugins = m_Plugins; - _TLBLoadAddress = NULL; - _TLBStoreAddress = NULL; + g_TLBLoadAddress = NULL; + g_TLBStoreAddress = NULL; } } diff --git a/Source/Project64/N64 System/Recompiler/Code Section.cpp b/Source/Project64/N64 System/Recompiler/Code Section.cpp index 877cccd5f..2a841b009 100644 --- a/Source/Project64/N64 System/Recompiler/Code Section.cpp +++ b/Source/Project64/N64 System/Recompiler/Code Section.cpp @@ -295,7 +295,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg ExitCodeBlock(); break; case CExitInfo::TLBReadMiss: - MoveVariableToX86reg(_TLBLoadAddress,"_TLBLoadAddress",x86_EDX); + MoveVariableToX86reg(g_TLBLoadAddress,"g_TLBLoadAddress",x86_EDX); Push(x86_EDX); PushImm32(m_NextInstruction == JUMP || m_NextInstruction == DELAY_SLOT); MoveConstToX86reg((DWORD)g_Reg,x86_ECX); diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp index 8e8ae57e7..ae4b7e5d3 100644 --- a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp +++ b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp @@ -9,21 +9,21 @@ DWORD CRecompilerOps::m_BranchCompare = 0; void CRecompilerOps::CompileReadTLBMiss (DWORD VirtualAddress, x86Reg LookUpReg ) { - MoveConstToVariable(VirtualAddress,_TLBLoadAddress,"TLBLoadAddress"); + MoveConstToVariable(VirtualAddress,g_TLBLoadAddress,"TLBLoadAddress"); TestX86RegToX86Reg(LookUpReg,LookUpReg); m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBReadMiss,FALSE,JeLabel32); } void CRecompilerOps::CompileReadTLBMiss (x86Reg AddressReg, x86Reg LookUpReg ) { - MoveX86regToVariable(AddressReg,_TLBLoadAddress,"TLBLoadAddress"); + MoveX86regToVariable(AddressReg,g_TLBLoadAddress,"TLBLoadAddress"); TestX86RegToX86Reg(LookUpReg,LookUpReg); m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBReadMiss,FALSE,JeLabel32); } void CRecompilerOps::CompileWriteTLBMiss (x86Reg AddressReg, x86Reg LookUpReg ) { - MoveX86regToVariable(AddressReg,&_TLBStoreAddress,"_TLBStoreAddress"); + MoveX86regToVariable(AddressReg,&g_TLBStoreAddress,"g_TLBStoreAddress"); TestX86RegToX86Reg(LookUpReg,LookUpReg); m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBWriteMiss,FALSE,JeLabel32); } diff --git a/Source/Project64/N64 System/System Globals.cpp b/Source/Project64/N64 System/System Globals.cpp index b0c49efe2..0380dddf7 100644 --- a/Source/Project64/N64 System/System Globals.cpp +++ b/Source/Project64/N64 System/System Globals.cpp @@ -14,8 +14,8 @@ CAudio * g_Audio = NULL; CSystemTimer * g_SystemTimer = NULL; CTransVaddr * g_TransVaddr = NULL; CSystemEvents * g_SystemEvents = NULL; -DWORD * _TLBLoadAddress = NULL; -DWORD * _TLBStoreAddress = NULL; +DWORD * g_TLBLoadAddress = NULL; +DWORD * g_TLBStoreAddress = NULL; int * g_NextTimer; diff --git a/Source/Project64/N64 System/System Globals.h b/Source/Project64/N64 System/System Globals.h index e3da4f582..e1b4f80e8 100644 --- a/Source/Project64/N64 System/System Globals.h +++ b/Source/Project64/N64 System/System Globals.h @@ -15,5 +15,5 @@ extern CSystemTimer * g_SystemTimer; extern CTransVaddr * g_TransVaddr; extern CSystemEvents * g_SystemEvents; extern int * g_NextTimer; -extern DWORD * _TLBLoadAddress; -extern DWORD * _TLBStoreAddress; +extern DWORD * g_TLBLoadAddress; +extern DWORD * g_TLBStoreAddress;