summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-02-03 13:22:43 +0100
committerwwylele <wwylele@gmail.com>2017-02-03 13:53:38 +0100
commit6dc1d6e5689c1110a681ddba300636607680eefb (patch)
treee6a1e14a283442ce323b23242e9bea018023d7b2 /src
parentHLE/Applets: Stub Mint (eShop) Applet (#2463) (diff)
downloadyuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar.gz
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar.bz2
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar.lz
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar.xz
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.tar.zst
yuzu-6dc1d6e5689c1110a681ddba300636607680eefb.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/shader_jit_x64_compiler.cpp7
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 bef7904b0..92b35dbc0 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);