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

[a64] Preserve X0 when resolving functions 

Fixes indirect branches
This commit is contained in:
Wunkolo 2024-05-10 08:05:28 -07:00
parent 31b2ccd3bb
commit 6f0ff9e54b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,7 +437,7 @@ ResolveFunctionThunk A64ThunkEmitter::EmitResolveFunctionThunk() {
code_offsets.prolog = offset();
// rsp + 0 = return address
STP(ZR, X0, SP, PRE_INDEXED, -16);
SUB(SP, SP, stack_size);
code_offsets.prolog_stack_alloc = offset();
@ -453,6 +453,7 @@ ResolveFunctionThunk A64ThunkEmitter::EmitResolveFunctionThunk() {
MOV(W1, W17);
MOV(X16, reinterpret_cast<uint64_t>(&ResolveFunction));
BLR(X16);
MOV(X16, X0);
EmitLoadVolatileRegs();
@ -461,7 +462,8 @@ ResolveFunctionThunk A64ThunkEmitter::EmitResolveFunctionThunk() {
// add(rsp, stack_size);
// jmp(rax);
ADD(SP, SP, stack_size);
BR(X0);
LDP(ZR, X0, SP, POST_INDEXED, 16);
BR(X16);
code_offsets.tail = offset();