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

Merge pull request #2853 from degasus/arm 

JitArm64: Fix jit clearing
This commit is contained in:
Ryan Houdek 2015-08-15 13:50:36 -05:00
parent b5a5883792 9bfff0d461
commit 909ab23df5
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Arm64Emitter.cpp
View File

@ -268,11 +268,15 @@ bool IsImmLogical(uint64_t value, unsigned int width, unsigned int *n, unsigned
return true;
}
void ARM64XEmitter::SetCodePtr(u8* ptr)
void ARM64XEmitter::SetCodePtrUnsafe(u8* ptr)
{
m_code = ptr;
if (!m_lastCacheFlushEnd)
m_lastCacheFlushEnd = ptr;
}
void ARM64XEmitter::SetCodePtr(u8* ptr)
{
SetCodePtrUnsafe(ptr);
m_lastCacheFlushEnd = ptr;
}
const u8* ARM64XEmitter::GetCodePtr() const

1
Source/Core/Common/Arm64Emitter.h
View File

@ -378,6 +378,7 @@ public:
}
void SetCodePtr(u8* ptr);
void SetCodePtrUnsafe(u8* ptr);
void ReserveCodeSpace(u32 bytes);
const u8* AlignCode16();
const u8* AlignCodePage();

6
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -227,13 +227,13 @@ private:
void SwitchToFarCode()
{
nearcode = GetWritableCodePtr();
SetCodePtr(farcode.GetWritableCodePtr());
SetCodePtrUnsafe(farcode.GetWritableCodePtr());
}
void SwitchToNearCode()
{
farcode.SetCodePtr(GetWritableCodePtr());
SetCodePtr(nearcode);
farcode.SetCodePtrUnsafe(GetWritableCodePtr());
SetCodePtrUnsafe(nearcode);
}
// Dump a memory range of code