xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2025-12-06 07:12:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[a64] Fix indirect and external calls

Browse source
This commit is contained in:
Wunkolo 2024-05-03 21:45:46 -07:00
parent 8aa4b9372a
commit 6a0e6a9ca9
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/xenia/cpu/backend/a64/a64_emitter.cc
View file

@ -510,7 +510,14 @@ void A64Emitter::CallIndirect(const hir::Instr* instr,
MOV(W1, reg.toW()); MOV(W1, reg.toW());
ADRP(X16, ResolveFunction); ADRP(X16, ResolveFunction);
// Preserve frame and link register
STP(X29, X30, XSP, POST_INDEXED, -16);
BLR(X16); BLR(X16);
// Restore frame and link register
LDP(X29, X30, XSP, PRE_INDEXED, 16);
} }
// Actually jump/call to rax. // Actually jump/call to rax.
@ -532,7 +539,14 @@ void A64Emitter::CallIndirect(const hir::Instr* instr,
// mov(rcx, qword[rsp + StackLayout::GUEST_CALL_RET_ADDR]); // mov(rcx, qword[rsp + StackLayout::GUEST_CALL_RET_ADDR]);
// call(rax); // call(rax);
LDR(X0, XSP, StackLayout::GUEST_CALL_RET_ADDR); LDR(X0, XSP, StackLayout::GUEST_CALL_RET_ADDR);
// Preserve frame and link register
STP(X29, X30, XSP, POST_INDEXED, -16);
BLR(X16); BLR(X16);
// Restore frame and link register
LDP(X29, X30, XSP, PRE_INDEXED, 16);
} }
} }
@ -568,7 +582,15 @@ void A64Emitter::CallExtern(const hir::Instr* instr, const Function* function) {
MOV(X2, reinterpret_cast<uint64_t>(builtin_function->arg1())); MOV(X2, reinterpret_cast<uint64_t>(builtin_function->arg1()));
MOV(X16, reinterpret_cast<uint64_t>(thunk)); MOV(X16, reinterpret_cast<uint64_t>(thunk));
// Preserve frame and link register
STP(X29, X30, XSP, POST_INDEXED, -16);
BLR(X16); BLR(X16);
// Restore frame and link register
LDP(X29, X30, XSP, PRE_INDEXED, 16);
// x0 = host return // x0 = host return
} }
} else if (function->behavior() == Function::Behavior::kExtern) { } else if (function->behavior() == Function::Behavior::kExtern) {
@ -591,7 +613,15 @@ void A64Emitter::CallExtern(const hir::Instr* instr, const Function* function) {
LDR(X2, GetContextReg(), offsetof(ppc::PPCContext, kernel_state)); LDR(X2, GetContextReg(), offsetof(ppc::PPCContext, kernel_state));
MOV(X16, reinterpret_cast<uint64_t>(thunk)); MOV(X16, reinterpret_cast<uint64_t>(thunk));
// Preserve frame and link register
STP(X29, X30, XSP, POST_INDEXED, -16);
BLR(X16); BLR(X16);
// Restore frame and link register
LDP(X29, X30, XSP, PRE_INDEXED, 16);
// x0 = host return // x0 = host return
} }
} }