Skip to content

[LA64_DYNAREC] Fixed gpr upper tracking non-lbt path #4034

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
Jul 13, 2026
+31 −38
Merged

[LA64_DYNAREC] Fixed gpr upper tracking non-lbt path #4034

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: 6 additions & 10 deletions src/dynarec/la64/dynarec_la64_emit_logic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,7 @@ void emit_xor32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (s1 != s2 && NEED_ZEROUP(s1)) {
ZEROUP(s1);
}
if (!rex.w && s1 != s2) ZEROUP(s1);

IFX(X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
Expand Down Expand Up @@ -252,7 +250,7 @@ void emit_xor32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int64_t c, i
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);

IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
Expand Down Expand Up @@ -408,16 +406,16 @@ void emit_and32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
}

AND(s1, s1, s2); // res = s1 & s2
if (NEED_ZEROUP(s1)) ZEROUP(s1);

IFX(X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}

if (cpuext.lbt) {
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (dyn->insts[ninst].nat_flags_fusion) NAT_FLAGS_OPS(s1, xZR, s3, xZR);
return;
}
} else if (!rex.w) ZEROUP(s1);

CLEAR_FLAGS(s3);
IFX(X_SF) {
Expand Down Expand Up @@ -563,7 +561,7 @@ void emit_or32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s3
ORI(xFlags, xFlags, 1 << F_SF);
}

if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX(X_ZF) {
BNEZ(s1, 8);
ORI(xFlags, xFlags, 1 << F_ZF);
Expand Down Expand Up @@ -615,9 +613,7 @@ void emit_or32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int64_t c, in
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) {
ZEROUP(s1);
}
if (!rex.w) ZEROUP(s1);

IFX(X_ZF) {
BNEZ(s1, 8);
Expand Down
18 changes: 9 additions & 9 deletions src/dynarec/la64/dynarec_la64_emit_math.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void emit_add32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s4);
}
Expand Down Expand Up @@ -221,7 +221,7 @@ void emit_add32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int64_t c, i
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s4);
}
Expand Down Expand Up @@ -606,7 +606,7 @@ void emit_sub32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
CALC_SUB_FLAGS(s5, s2, s1, s3, s4, rex.w ? 64 : 32);
IFX (X_ZF) {
BNEZ(s1, 8);
Expand Down Expand Up @@ -687,7 +687,7 @@ void emit_sub32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int64_t c, i
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
CALC_SUB_FLAGS(s5, s2, s1, s3, s4, rex.w ? 64 : 32);
IFX (X_ZF) {
BNEZ(s1, 8);
Expand Down Expand Up @@ -896,7 +896,7 @@ void emit_sbb32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -1040,7 +1040,7 @@ void emit_neg32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s2);
}
Expand Down Expand Up @@ -1310,7 +1310,7 @@ void emit_adc32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s4);
}
Expand Down Expand Up @@ -1489,7 +1489,7 @@ void emit_inc32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s2);
}
Expand Down Expand Up @@ -1666,7 +1666,7 @@ void emit_dec32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BSTRPICK_D(s5, s1, rex.w ? 63 : 31, rex.w ? 63 : 31);
BSTRINS_D(xFlags, s5, F_SF, F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PF) {
emit_pf(dyn, ninst, s1, s3, s2);
}
Expand Down
35 changes: 16 additions & 19 deletions src/dynarec/la64/dynarec_la64_emit_shift.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void emit_shl32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
SLTI(s3, s1, 0);
BSTRINS_D(xFlags, s3, F_SF, F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -336,7 +336,7 @@ void emit_shl32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
SLTI(s3, s1, 0);
BSTRINS_D(xFlags, s3, F_SF, F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -853,7 +853,7 @@ void emit_shr32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -1148,7 +1148,7 @@ void emit_sar32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -1209,7 +1209,7 @@ void emit_sar32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
BGE(s1, xZR, 8);
ORI(xFlags, xFlags, 1 << F_SF);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
Expand Down Expand Up @@ -1270,7 +1270,7 @@ void emit_ror32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
ROTRI_D(s1, s1, c);
else
ROTRI_W(s1, s1, c);
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);

IFX (X_CF) {
SRLIxw(s3, s1, rex.w ? 63 : 31);
Expand Down Expand Up @@ -1419,8 +1419,7 @@ void emit_rol32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
} else {
ROTR_W(s1, s1, s3);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);

if (!rex.w) ZEROUP(s1);
if (cpuext.lbt) {
if (dyn->insts[ninst].nat_flags_fusion) NAT_FLAGS_OPS(s1, xZR, s3, xZR);
return;
Expand Down Expand Up @@ -1463,12 +1462,12 @@ void emit_ror32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int s
} else {
ROTR_W(s1, s1, s2);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);

if (cpuext.lbt) {
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (dyn->insts[ninst].nat_flags_fusion) NAT_FLAGS_OPS(s1, xZR, s3, xZR);
return;
}
} else if (!rex.w) ZEROUP(s1);

IFX (X_CF) {
SRLIxw(s3, s1, rex.w ? 63 : 31);
Expand Down Expand Up @@ -1525,7 +1524,7 @@ void emit_rol32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
ROTRI_D(s1, s1, (rex.w ? 64 : 32) - c);
else
ROTRI_W(s1, s1, (rex.w ? 64 : 32) - c);
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);

IFX (X_CF) {
ANDI(s4, s1, 1 << F_CF);
Expand Down Expand Up @@ -1566,7 +1565,7 @@ void emit_shld32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, uin
SRLIxw(s1, s2, (rex.w ? 64 : 32) - c);
OR(s1, s1, s3);

if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_SF) {
SRLIxw(s3, s1, rex.w ? 63 : 31);
BEQZ(s3, 8);
Expand Down Expand Up @@ -1623,7 +1622,7 @@ void emit_shrd32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, uin
SLLIxw(s1, s2, (rex.w ? 64 : 32) - c);
OR(s1, s1, s3);

if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_SF) {
SRLIxw(s3, s1, rex.w ? 63 : 31);
BEQZ(s3, 8);
Expand Down Expand Up @@ -1675,7 +1674,7 @@ void emit_shrd32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_ZF) {
BNEZ(s1, 8);
ORI(xFlags, xFlags, 1 << F_ZF);
Expand Down Expand Up @@ -1724,7 +1723,7 @@ void emit_shld32(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, int s2, int
IFX (X_PEND) {
SDxw(s1, xEmu, offsetof(x64emu_t, res));
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);
if (!rex.w) ZEROUP(s1);
IFX (X_ZF) {
BNEZ(s1, 8);
ORI(xFlags, xFlags, 1 << F_ZF);
Expand Down Expand Up @@ -1903,8 +1902,7 @@ void emit_rcl32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
SRLI_W(s5, s1, 33 - c);
OR(s1, s5, s4);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);

if (!rex.w) ZEROUP(s1);
IFX (X_CF) {
BSTRINS_D(xFlags, s3, F_CF, F_CF);
}
Expand Down Expand Up @@ -2061,8 +2059,7 @@ void emit_rcr32c(dynarec_la64_t* dyn, int ninst, rex_t rex, int s1, uint32_t c,
SLLI_D(s3, s1, (rex.w ? 65 : 33) - c);
OR(s1, s3, s4);
}
if (NEED_ZEROUP(s1)) ZEROUP(s1);

if (!rex.w) ZEROUP(s1);
IFX (X_CF) {
BSTRINS_D(xFlags, s5, F_CF, F_CF);
}
Expand Down
Loading