archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1104 from comex/its-like-the-bad-old-days-where-i-broke-master-over-and-over

Browse source 
Fix BLR optimization (sorry)
This commit is contained in:
shuffle2 2014-09-17 19:38:28 -07:00
commit 8b151d6a61
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View file

@ -116,8 +116,7 @@ using namespace PowerPC;
// accessed, immediately turn into regular pages but cause a trap... but // accessed, immediately turn into regular pages but cause a trap... but
// putting them in the path of RSP just leads to something (in the kernel?) // putting them in the path of RSP just leads to something (in the kernel?)
// thinking a regular stack extension is required. So this protection is not // thinking a regular stack extension is required. So this protection is not
// supported on Windows yet... We still use a separate stack for the sake of // supported on Windows yet...
// simplicity.
enum enum
{ {
@ -129,7 +128,7 @@ enum
void Jit64::AllocStack() void Jit64::AllocStack()
{ {
#if defined(_WIN32) #ifndef _WIN32
m_stack = (u8*)AllocateMemoryPages(STACK_SIZE); m_stack = (u8*)AllocateMemoryPages(STACK_SIZE);
ReadProtectMemory(m_stack, GUARD_SIZE); ReadProtectMemory(m_stack, GUARD_SIZE);
ReadProtectMemory(m_stack + GUARD_OFFSET, GUARD_SIZE); ReadProtectMemory(m_stack + GUARD_OFFSET, GUARD_SIZE);
@ -138,7 +137,7 @@ void Jit64::AllocStack()
void Jit64::FreeStack() void Jit64::FreeStack()
{ {
#if defined(_WIN32) #ifndef _WIN32
if (m_stack) if (m_stack)
{ {
FreeMemoryPages(m_stack, STACK_SIZE); FreeMemoryPages(m_stack, STACK_SIZE);
@ -330,7 +329,9 @@ bool Jit64::Cleanup()
// SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time. // SPEED HACK: MMCR0/MMCR1 should be checked at run-time, not at compile time.
if (MMCR0.Hex || MMCR1.Hex) if (MMCR0.Hex || MMCR1.Hex)
{ {
ABI_PushRegistersAndAdjustStack(0, 0);
ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst); ABI_CallFunctionCCC((void *)&PowerPC::UpdatePerformanceMonitor, js.downcountAmount, jit->js.numLoadStoreInst, jit->js.numFloatingPointInst);
ABI_PopRegistersAndAdjustStack(0, 0);
did_something = true; did_something = true;
} }