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

EE: use std::atomic<bool> for reset variable

This commit is contained in:
Gregory Hainaut 2016-02-22 20:09:53 +01:00
parent 60fe26ff2f
commit e5d4f2c24f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -566,8 +566,8 @@ static void recAlloc()
static __aligned16 u16 manual_page[Ps2MemSize::MainRam >> 12]; static __aligned16 u16 manual_page[Ps2MemSize::MainRam >> 12];
static __aligned16 u8 manual_counter[Ps2MemSize::MainRam >> 12]; static __aligned16 u8 manual_counter[Ps2MemSize::MainRam >> 12];
static u32 eeRecIsReset = false; static std::atomic<bool> eeRecIsReset(false);
static u32 eeRecNeedsReset = false; static std::atomic<bool> eeRecNeedsReset(false);
static bool eeCpuExecuting = false; static bool eeCpuExecuting = false;
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
@ -579,8 +579,8 @@ static void recResetRaw()
recAlloc(); recAlloc();
if( AtomicExchange( eeRecIsReset, true ) ) return; if( eeRecIsReset.exchange(true) ) return;
AtomicExchange( eeRecNeedsReset, false ); eeRecNeedsReset = false;
Console.WriteLn( Color_StrongBlack, "EE/iR5900-32 Recompiler Reset" ); Console.WriteLn( Color_StrongBlack, "EE/iR5900-32 Recompiler Reset" );
@ -628,7 +628,7 @@ static void recResetEE()
{ {
if (eeCpuExecuting) if (eeCpuExecuting)
{ {
AtomicExchange( eeRecNeedsReset, true ); eeRecNeedsReset = true;
return; return;
} }
@ -1561,11 +1561,11 @@ static void __fastcall recRecompile( const u32 startpc )
// if recPtr reached the mem limit reset whole mem // if recPtr reached the mem limit reset whole mem
if (recPtr >= (recMem->GetPtrEnd() - _64kb)) { if (recPtr >= (recMem->GetPtrEnd() - _64kb)) {
AtomicExchange( eeRecNeedsReset, true ); eeRecNeedsReset = true;
} }
else if ((recConstBufPtr - recConstBuf) >= RECCONSTBUF_SIZE - 64) { else if ((recConstBufPtr - recConstBuf) >= RECCONSTBUF_SIZE - 64) {
Console.WriteLn("EE recompiler stack reset"); Console.WriteLn("EE recompiler stack reset");
AtomicExchange( eeRecNeedsReset, true ); eeRecNeedsReset = true;
} }
if (eeRecNeedsReset) recResetRaw(); if (eeRecNeedsReset) recResetRaw();
@ -1633,7 +1633,7 @@ static void __fastcall recRecompile( const u32 startpc )
xFastCall(GoemonPreloadTlb); xFastCall(GoemonPreloadTlb);
} else if (pc == 0x3563b8) { } else if (pc == 0x3563b8) {
// Game will unmap some virtual addresses. If a constant address were hardcoded in the block, we would be in a bad situation. // Game will unmap some virtual addresses. If a constant address were hardcoded in the block, we would be in a bad situation.
AtomicExchange( eeRecNeedsReset, true ); eeRecNeedsReset = true;
// 0x3563b8 is the start address of the function that invalidate entry in TLB cache // 0x3563b8 is the start address of the function that invalidate entry in TLB cache
xFastCall(GoemonUnloadTlb, ptr[&cpuRegs.GPR.n.a0.UL[0]]); xFastCall(GoemonUnloadTlb, ptr[&cpuRegs.GPR.n.a0.UL[0]]);
} }