ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[a64] Fix overwriting of return-value registers 

These are stomping over X0 and Q0 which is returning input argument registers as return values.
Fixes some guest-to-host calls.
This commit is contained in:
Wunkolo 2024-05-04 11:22:37 -07:00
parent 6a0e6a9ca9
commit 3d345d71a7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/backend/a64/a64_backend.cc
View File

@ -458,7 +458,9 @@ void A64ThunkEmitter::EmitSaveVolatileRegs() {
} }
void A64ThunkEmitter::EmitLoadVolatileRegs() { void A64ThunkEmitter::EmitLoadVolatileRegs() {
LDR(X0, XSP, offsetof(StackLayout::Thunk, r[0])); // Preserve arguments passed to and returned from a subroutine
// LDR(X0, XSP, offsetof(StackLayout::Thunk, r[0]));
LDR(X1, XSP, offsetof(StackLayout::Thunk, r[1])); LDR(X1, XSP, offsetof(StackLayout::Thunk, r[1]));
LDR(X2, XSP, offsetof(StackLayout::Thunk, r[2])); LDR(X2, XSP, offsetof(StackLayout::Thunk, r[2]));
LDR(X3, XSP, offsetof(StackLayout::Thunk, r[3])); LDR(X3, XSP, offsetof(StackLayout::Thunk, r[3]));
@ -481,7 +483,8 @@ void A64ThunkEmitter::EmitLoadVolatileRegs() {
LDR(X30, XSP, offsetof(StackLayout::Thunk, r[19])); LDR(X30, XSP, offsetof(StackLayout::Thunk, r[19]));
LDR(Q0, XSP, offsetof(StackLayout::Thunk, xmm[0])); // Preserve arguments passed to and returned from a subroutine
// LDR(Q0, XSP, offsetof(StackLayout::Thunk, xmm[0]));
LDR(Q1, XSP, offsetof(StackLayout::Thunk, xmm[1])); LDR(Q1, XSP, offsetof(StackLayout::Thunk, xmm[1]));
LDR(Q2, XSP, offsetof(StackLayout::Thunk, xmm[2])); LDR(Q2, XSP, offsetof(StackLayout::Thunk, xmm[2]));
LDR(Q3, XSP, offsetof(StackLayout::Thunk, xmm[3])); LDR(Q3, XSP, offsetof(StackLayout::Thunk, xmm[3]));