Skip to content

[LA64_DYNAREC] Worked on CF IRET opcode #3903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptitSeb merged 1 commit into from
May 29, 2026
+13 −0
Merged

[LA64_DYNAREC] Worked on CF IRET opcode #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/dynarec/la64/dynarec_la64_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,9 @@ void ret_to_next(dynarec_la64_t* dyn, uintptr_t ip, int ninst, rex_t rex)

void iret_to_next(dynarec_la64_t* dyn, uintptr_t ip, int ninst, int is32bits, int is64bits)
{
int64_t j64;
MAYUSE(ninst);
MAYUSE(j64);
MESSAGE(LOG_DUMP, "IRet to next\n");
if (is64bits) {
POP1(xRIP);
Expand All @@ -481,6 +483,12 @@ void iret_to_next(dynarec_la64_t* dyn, uintptr_t ip, int ninst, int is32bits, in
ORI(xFlags, xFlags, 0x2);
SPILL_EFLAGS();
CHECK_DFNONE(0);
if (is32bits) {
ANDI(x1, x2, 0xff);
// check if return segment is 64bits, then restore rsp too
MOV32w(x3, 0x23);
BEQ_MARKSEG(x1, x3);
}
// POP RSP
if (is64bits) {
POP1(x3); // rsp
Expand All @@ -493,6 +501,7 @@ void iret_to_next(dynarec_la64_t* dyn, uintptr_t ip, int ninst, int is32bits, in
ST_H(x2, xEmu, offsetof(x64emu_t, segs[_SS]));
// set new RSP
MV(xRSP, x3);
MARKSEG;
// Ret....
rex_t dummy = { 0 };
dummy.is32bits = is32bits;
Expand Down
4 changes: 4 additions & 0 deletions src/dynarec/la64/dynarec_la64_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,10 @@
#define CBNZ_MARKSEG(reg) \
j64 = GETMARKSEG - (dyn->native_size); \
BNEZ(reg, j64);
// Branch to MARKSEG if reg1==reg2 (use j64)
#define BEQ_MARKSEG(reg1, reg2) \
j64 = GETMARKSEG - (dyn->native_size); \
BEQ(reg1, reg2, j64);

#define IFX(A) if ((dyn->insts[ninst].x64.gen_flags & (A)))
#define IFXA(A, B) if ((dyn->insts[ninst].x64.gen_flags & (A)) && (B))
Expand Down
Loading