Skip to content

[RV64_DYNAREC] Fixed BSF/BSR opcodes safeflags handling #3886

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 23, 2026
+28 −4
Merged

[RV64_DYNAREC] Fixed BSF/BSR opcodes safeflags handling #3886

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
16 changes: 14 additions & 2 deletions src/dynarec/rv64/dynarec_rv64_0f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,14 +2377,20 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
ZEXTW2(x4, ed);
ed = x4;
}
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x3, xZR);
}
BNE_MARK(ed, xZR);
IFX (X_ZF) ORI(xFlags, xFlags, 1 << F_ZF);
B_MARK2_nocond;
MARK;
CTZxw(gd, ed, rex.w, x3, x5);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x3, gd);
}
MARK2;
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) emit_pf(dyn, ninst, gd, x2, x5);
IFX (X_PF) emit_pf(dyn, ninst, x3, x2, x5);
}
break;
case 0xBD:
Expand All @@ -2403,16 +2409,22 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
ZEXTW2(x4, ed);
ed = x4;
}
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, xZR);
}
BNE_MARK(ed, xZR);
IFX (X_ZF) ORI(xFlags, xFlags, 1 << F_ZF);
B_MARK2_nocond;
MARK;
CLZxw(gd, ed, rex.w, x3, x5, x7);
ADDI(x3, xZR, rex.w ? 63 : 31);
SUB(gd, x3, gd);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, gd);
}
MARK2;
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) emit_pf(dyn, ninst, gd, x2, x5);
IFX (X_PF) emit_pf(dyn, ninst, x2, x4, x5);
}
break;
case 0xBE:
Expand Down
16 changes: 14 additions & 2 deletions src/dynarec/rv64/dynarec_rv64_660f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,17 +1596,23 @@ uintptr_t dynarec64_660F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
nextop = F8;
GETEW(x5, 0);
GETGW(x4);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, xZR);
}
BNE_MARK(ed, xZR);
IFX (X_ZF) ORI(xFlags, xFlags, 1 << F_ZF);
B_MARK2_nocond;
MARK;
IFXA (X_ZF, !BOX64DRENV(dynarec_safeflags))
ANDI(xFlags, xFlags, ~(1 << F_ZF));
CTZxw(gd, ed, 0, x1, x2);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, gd);
}
GWBACK;
MARK2;
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) emit_pf(dyn, ninst, gd, x1, x2);
IFX (X_PF) emit_pf(dyn, ninst, x2, x1, x5);
}
break;
case 0xBD:
Expand All @@ -1620,6 +1626,9 @@ uintptr_t dynarec64_660F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
nextop = F8;
GETEW(x5, 0);
GETGW(x4);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, xZR);
}
BNE_MARK(ed, xZR);
IFX (X_ZF) ORI(xFlags, xFlags, 1 << F_ZF);
B_MARK2_nocond;
Expand All @@ -1629,10 +1638,13 @@ uintptr_t dynarec64_660F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int
CLZxw(gd, ed, 1, x1, x2, x6);
ADDI(x1, xZR, 63);
SUB(gd, x1, gd);
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) MV(x2, gd);
}
GWBACK;
MARK2;
if (BOX64DRENV(dynarec_safeflags)) {
IFX (X_PF) emit_pf(dyn, ninst, gd, x1, x2);
IFX (X_PF) emit_pf(dyn, ninst, x2, x1, x5);
}
break;
case 0xBE:
Expand Down
Loading