diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-03 18:56:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 18:56:42 -0800 |
| commit | ba7cdce46d97c4b0d604928a66dc1921b051bf4f (patch) | |
| tree | c83a2ce926a542fa764d95f31d4db6debaa7660f | |
| parent | a630fa287e178695b16887a56f7726ff97c91108 (diff) | |
| parent | 6dc1d6e5689c1110a681ddba300636607680eefb (diff) | |
Merge pull request #2520 from wwylele/shader-stack-boundary
ShaderJIT: add 16 dummy bytes at the bottom of the stack
| -rw-r--r-- | src/video_core/shader/shader_jit_x64_compiler.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/video_core/shader/shader_jit_x64_compiler.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp index bef7904b04..92b35dbc00 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.cpp +++ b/src/video_core/shader/shader_jit_x64_compiler.cpp @@ -589,7 +589,7 @@ void JitShader::Compile_RSQ(Instruction instr) { void JitShader::Compile_NOP(Instruction instr) {} void JitShader::Compile_END(Instruction instr) { - ABI_PopRegistersAndAdjustStack(*this, ABI_ALL_CALLEE_SAVED, 8); + ABI_PopRegistersAndAdjustStack(*this, ABI_ALL_CALLEE_SAVED, 8, 16); ret(); } @@ -841,7 +841,10 @@ void JitShader::Compile(const std::array<u32, 1024>* program_code_, FindReturnOffsets(); // The stack pointer is 8 modulo 16 at the entry of a procedure - ABI_PushRegistersAndAdjustStack(*this, ABI_ALL_CALLEE_SAVED, 8); + // We reserve 16 bytes and assign a dummy value to the first 8 bytes, to catch any potential + // return checks (see Compile_Return) that happen in shader main routine. + ABI_PushRegistersAndAdjustStack(*this, ABI_ALL_CALLEE_SAVED, 8, 16); + mov(qword[rsp + 8], 0xFFFFFFFFFFFFFFFFULL); mov(SETUP, ABI_PARAM1); mov(STATE, ABI_PARAM2); |