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

Global Variable: rename _SystemEvents to g_SystemEvents

This commit is contained in:
zilmar 2012-11-17 14:43:02 +11:00
parent e8b96dd915
commit 0410fafd3b
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp
View File

@ -229,7 +229,7 @@ void CInterpreterCPU::ExecuteCPU (void )
OPCODE & Opcode = R4300iOp::m_Opcode; OPCODE & Opcode = R4300iOp::m_Opcode;
DWORD & JumpToLocation = R4300iOp::m_JumpToLocation; DWORD & JumpToLocation = R4300iOp::m_JumpToLocation;
BOOL & TestTimer = R4300iOp::m_TestTimer; BOOL & TestTimer = R4300iOp::m_TestTimer;
const BOOL & bDoSomething= _SystemEvents->DoSomething(); const BOOL & bDoSomething= g_SystemEvents->DoSomething();
int & NextTimer = *_NextTimer; int & NextTimer = *_NextTimer;
__try __try
@ -274,7 +274,7 @@ void CInterpreterCPU::ExecuteCPU (void )
} }
if (bDoSomething) if (bDoSomething)
{ {
_SystemEvents->ExecuteEvents(); g_SystemEvents->ExecuteEvents();
} }
} }
} }
@ -286,7 +286,7 @@ void CInterpreterCPU::ExecuteCPU (void )
g_SystemTimer->TimerDone(); g_SystemTimer->TimerDone();
if (bDoSomething) if (bDoSomething)
{ {
_SystemEvents->ExecuteEvents(); g_SystemEvents->ExecuteEvents();
} }
break; break;
default: default:
@ -311,7 +311,7 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
OPCODE & Opcode = R4300iOp::m_Opcode; OPCODE & Opcode = R4300iOp::m_Opcode;
DWORD & JumpToLocation = R4300iOp::m_JumpToLocation; DWORD & JumpToLocation = R4300iOp::m_JumpToLocation;
BOOL & TestTimer = R4300iOp::m_TestTimer; BOOL & TestTimer = R4300iOp::m_TestTimer;
const BOOL & DoSomething = _SystemEvents->DoSomething(); const BOOL & DoSomething = g_SystemEvents->DoSomething();
__try __try
{ {
@ -380,7 +380,7 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
} }
if (DoSomething) if (DoSomething)
{ {
_SystemEvents->ExecuteEvents(); g_SystemEvents->ExecuteEvents();
} }
} }
} }
@ -392,7 +392,7 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
g_SystemTimer->TimerDone(); g_SystemTimer->TimerDone();
if (DoSomething) if (DoSomething)
{ {
_SystemEvents->ExecuteEvents(); g_SystemEvents->ExecuteEvents();
} }
break; break;
default: default:

2
Source/Project64/N64 System/Mips/Register Class.cpp
View File

@ -289,7 +289,7 @@ void CRegisters::CheckInterrupts ( void )
g_Recompiler->ClearRecompCode_Virt(0x80000000,0x200,CRecompiler::Remove_InitialCode); g_Recompiler->ClearRecompCode_Virt(0x80000000,0x200,CRecompiler::Remove_InitialCode);
} }
} }
_SystemEvents->QueueEvent(SysEvent_ExecuteInterrupt); g_SystemEvents->QueueEvent(SysEvent_ExecuteInterrupt);
} }
} }

4
Source/Project64/N64 System/N64 Class.cpp
View File

@ -533,7 +533,7 @@ bool CN64System::SetActiveSystem( bool bActive )
g_Audio = &m_Audio; g_Audio = &m_Audio;
g_SystemTimer = &m_SystemTimer; g_SystemTimer = &m_SystemTimer;
g_TransVaddr = &m_MMU_VM; g_TransVaddr = &m_MMU_VM;
_SystemEvents = this; g_SystemEvents = this;
_NextTimer = &m_NextTimer; _NextTimer = &m_NextTimer;
g_Plugins = m_Plugins; g_Plugins = m_Plugins;
_TLBLoadAddress = &m_TLBLoadAddress; _TLBLoadAddress = &m_TLBLoadAddress;
@ -564,7 +564,7 @@ bool CN64System::SetActiveSystem( bool bActive )
g_Audio = NULL; g_Audio = NULL;
g_SystemTimer = NULL; g_SystemTimer = NULL;
g_TransVaddr = NULL; g_TransVaddr = NULL;
_SystemEvents = NULL; g_SystemEvents = NULL;
_NextTimer = NULL; _NextTimer = NULL;
g_Plugins = m_Plugins; g_Plugins = m_Plugins;
_TLBLoadAddress = NULL; _TLBLoadAddress = NULL;

2
Source/Project64/N64 System/Recompiler/Code Section.cpp
View File

@ -242,7 +242,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
#endif #endif
break; break;
case CExitInfo::DoCPU_Action: case CExitInfo::DoCPU_Action:
MoveConstToX86reg((DWORD)_SystemEvents,x86_ECX); MoveConstToX86reg((DWORD)g_SystemEvents,x86_ECX);
Call_Direct(AddressOf(&CSystemEvents::ExecuteEvents),"CSystemEvents::ExecuteEvents"); Call_Direct(AddressOf(&CSystemEvents::ExecuteEvents),"CSystemEvents::ExecuteEvents");
if (g_SyncSystem) { if (g_SyncSystem) {
MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX); MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);

4
Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp
View File

@ -5153,7 +5153,7 @@ void CRecompilerOps::UpdateCounters ( CRegInfo & RegSet, bool CheckTimer, bool C
void CRecompilerOps::CompileSystemCheck (DWORD TargetPC, const CRegInfo & RegSet) void CRecompilerOps::CompileSystemCheck (DWORD TargetPC, const CRegInfo & RegSet)
{ {
CompConstToVariable(0,(void *)&_SystemEvents->DoSomething(),"_SystemEvents->DoSomething()"); CompConstToVariable(0,(void *)&g_SystemEvents->DoSomething(),"g_SystemEvents->DoSomething()");
JeLabel32("Continue_From_Interrupt_Test",0); JeLabel32("Continue_From_Interrupt_Test",0);
DWORD * Jump = (DWORD *)(m_RecompPos - 4); DWORD * Jump = (DWORD *)(m_RecompPos - 4);
if (TargetPC != (DWORD)-1) if (TargetPC != (DWORD)-1)
@ -5164,7 +5164,7 @@ void CRecompilerOps::CompileSystemCheck (DWORD TargetPC, const CRegInfo & RegSet
CRegInfo RegSetCopy(RegSet); CRegInfo RegSetCopy(RegSet);
RegSetCopy.WriteBackRegisters(); RegSetCopy.WriteBackRegisters();
MoveConstToX86reg((DWORD)_SystemEvents,x86_ECX); MoveConstToX86reg((DWORD)g_SystemEvents,x86_ECX);
Call_Direct(AddressOf(&CSystemEvents::ExecuteEvents),"CSystemEvents::ExecuteEvents"); Call_Direct(AddressOf(&CSystemEvents::ExecuteEvents),"CSystemEvents::ExecuteEvents");
if (g_SyncSystem) { if (g_SyncSystem) {
MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX); MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);

2
Source/Project64/N64 System/System Globals.cpp
View File

@ -13,7 +13,7 @@ CN64Rom * g_Rom = NULL; //The current rom that this system is executi
CAudio * g_Audio = NULL; CAudio * g_Audio = NULL;
CSystemTimer * g_SystemTimer = NULL; CSystemTimer * g_SystemTimer = NULL;
CTransVaddr * g_TransVaddr = NULL; CTransVaddr * g_TransVaddr = NULL;
CSystemEvents * _SystemEvents = NULL; CSystemEvents * g_SystemEvents = NULL;
DWORD * _TLBLoadAddress = NULL; DWORD * _TLBLoadAddress = NULL;
DWORD * _TLBStoreAddress = NULL; DWORD * _TLBStoreAddress = NULL;

2
Source/Project64/N64 System/System Globals.h
View File

@ -13,7 +13,7 @@ extern CN64Rom * g_Rom; //The current rom that this system is executi
extern CAudio * g_Audio; extern CAudio * g_Audio;
extern CSystemTimer * g_SystemTimer; extern CSystemTimer * g_SystemTimer;
extern CTransVaddr * g_TransVaddr; extern CTransVaddr * g_TransVaddr;
extern CSystemEvents * _SystemEvents; extern CSystemEvents * g_SystemEvents;
extern int * _NextTimer; extern int * _NextTimer;
extern DWORD * _TLBLoadAddress; extern DWORD * _TLBLoadAddress;
extern DWORD * _TLBStoreAddress; extern DWORD * _TLBStoreAddress;