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 #5142 from MerryMage/stored_stack_pointer 

JitAsm: Use stored_stack_pointer instead of s_saved_rsp
This commit is contained in:
Markus Wick 2017-03-25 17:37:48 +01:00 committed by GitHub
parent 3898707ef9 61198199cd
commit 4d8d0451e3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
View File

@ -17,9 +17,6 @@
using namespace Gen; using namespace Gen;
// Not PowerPC state. Can't put in 'this' because it's out of range...
static void* s_saved_rsp;
void Jit64AsmRoutineManager::Init(u8* stack_top) void Jit64AsmRoutineManager::Init(u8* stack_top)
{ {
m_const_pool.Init(AllocChildCodeSpace(4096), 4096); m_const_pool.Init(AllocChildCodeSpace(4096), 4096);
@ -48,7 +45,7 @@ void Jit64AsmRoutineManager::Generate()
} }
else else
{ {
MOV(64, M(&s_saved_rsp), R(RSP)); MOV(64, PPCSTATE(stored_stack_pointer), R(RSP));
} }
// something that can't pass the BLR test // something that can't pass the BLR test
MOV(64, MDisp(RSP, 8), Imm32((u32)-1)); MOV(64, MDisp(RSP, 8), Imm32((u32)-1));
@ -215,7 +212,7 @@ void Jit64AsmRoutineManager::ResetStack(X64CodeBlock& emitter)
if (m_stack_top) if (m_stack_top)
emitter.MOV(64, R(RSP), Imm64((u64)m_stack_top - 0x20)); emitter.MOV(64, R(RSP), Imm64((u64)m_stack_top - 0x20));
else else
emitter.MOV(64, R(RSP), M(&s_saved_rsp)); emitter.MOV(64, R(RSP), PPCSTATE(stored_stack_pointer));
} }
void Jit64AsmRoutineManager::GenerateCommon() void Jit64AsmRoutineManager::GenerateCommon()