Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win32: Respect home space / shadow space on the stack frame (#17514)

Browse Source 
Previous code did not respect the 32-byte long area on the stack frame
called the home space - area on the stack frame area that is specific to
Microsoft's x64 calling convention, leading to corrupted values after a
callback.
Bug noticed by @capriots

Co-Authored-By: capriots <29807355+capriots@users.noreply.github.com>
This commit is contained in:
Elad
2025-09-19 11:46:39 +03:00
committed by GitHub
parent e995511c57
commit ffeb16fe1e
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/PPUThread.cpp
+22 -22
View File
@@ -195,17 +195,17 @@ const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>("ppu_gateway",
c.push(x86::rdi); c.push(x86::rdi);
c.push(x86::rbp); c.push(x86::rbp);
c.push(x86::rbx); c.push(x86::rbx);
c.sub(x86::rsp, 0xa8); c.sub(x86::rsp, 0xc8);
c.movaps(x86::oword_ptr(x86::rsp, 0x90), x86::xmm15); c.movaps(x86::oword_ptr(x86::rsp, 0xb0), x86::xmm15);
c.movaps(x86::oword_ptr(x86::rsp, 0x80), x86::xmm14); c.movaps(x86::oword_ptr(x86::rsp, 0xa0), x86::xmm14);
c.movaps(x86::oword_ptr(x86::rsp, 0x70), x86::xmm13); c.movaps(x86::oword_ptr(x86::rsp, 0x90), x86::xmm13);
c.movaps(x86::oword_ptr(x86::rsp, 0x60), x86::xmm12); c.movaps(x86::oword_ptr(x86::rsp, 0x80), x86::xmm12);
c.movaps(x86::oword_ptr(x86::rsp, 0x50), x86::xmm11); c.movaps(x86::oword_ptr(x86::rsp, 0x70), x86::xmm11);
c.movaps(x86::oword_ptr(x86::rsp, 0x40), x86::xmm10); c.movaps(x86::oword_ptr(x86::rsp, 0x60), x86::xmm10);
c.movaps(x86::oword_ptr(x86::rsp, 0x30), x86::xmm9); c.movaps(x86::oword_ptr(x86::rsp, 0x50), x86::xmm9);
c.movaps(x86::oword_ptr(x86::rsp, 0x20), x86::xmm8); c.movaps(x86::oword_ptr(x86::rsp, 0x40), x86::xmm8);
c.movaps(x86::oword_ptr(x86::rsp, 0x10), x86::xmm7); c.movaps(x86::oword_ptr(x86::rsp, 0x30), x86::xmm7);
c.movaps(x86::oword_ptr(x86::rsp, 0), x86::xmm6); c.movaps(x86::oword_ptr(x86::rsp, 0x20), x86::xmm6);
#else #else
c.push(x86::rbp); c.push(x86::rbp);
c.push(x86::r15); c.push(x86::r15);
@@ -252,17 +252,17 @@ const auto ppu_gateway = build_function_asm<void(*)(ppu_thread*)>("ppu_gateway",
} }
#ifdef _WIN32 #ifdef _WIN32
c.movaps(x86::xmm6, x86::oword_ptr(x86::rsp, 0)); c.movaps(x86::xmm6, x86::oword_ptr(x86::rsp, 0x20));
c.movaps(x86::xmm7, x86::oword_ptr(x86::rsp, 0x10)); c.movaps(x86::xmm7, x86::oword_ptr(x86::rsp, 0x30));
c.movaps(x86::xmm8, x86::oword_ptr(x86::rsp, 0x20)); c.movaps(x86::xmm8, x86::oword_ptr(x86::rsp, 0x40));
c.movaps(x86::xmm9, x86::oword_ptr(x86::rsp, 0x30)); c.movaps(x86::xmm9, x86::oword_ptr(x86::rsp, 0x50));
c.movaps(x86::xmm10, x86::oword_ptr(x86::rsp, 0x40)); c.movaps(x86::xmm10, x86::oword_ptr(x86::rsp, 0x60));
c.movaps(x86::xmm11, x86::oword_ptr(x86::rsp, 0x50)); c.movaps(x86::xmm11, x86::oword_ptr(x86::rsp, 0x70));
c.movaps(x86::xmm12, x86::oword_ptr(x86::rsp, 0x60)); c.movaps(x86::xmm12, x86::oword_ptr(x86::rsp, 0x80));
c.movaps(x86::xmm13, x86::oword_ptr(x86::rsp, 0x70)); c.movaps(x86::xmm13, x86::oword_ptr(x86::rsp, 0x90));
c.movaps(x86::xmm14, x86::oword_ptr(x86::rsp, 0x80)); c.movaps(x86::xmm14, x86::oword_ptr(x86::rsp, 0xa0));
c.movaps(x86::xmm15, x86::oword_ptr(x86::rsp, 0x90)); c.movaps(x86::xmm15, x86::oword_ptr(x86::rsp, 0xb0));
c.add(x86::rsp, 0xa8); c.add(x86::rsp, 0xc8);
c.pop(x86::rbx); c.pop(x86::rbx);
c.pop(x86::rbp); c.pop(x86::rbp);
c.pop(x86::rdi); c.pop(x86::rdi);