Skip to content

Compare all 64 bits in the relational branches #208

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

Open
Sinan-Karakaya wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Compare all 64 bits in the relational branches #208

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
12 changes: 8 additions & 4 deletions ps2xRecomp/src/lib/control_flow_emitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,25 +404,29 @@ namespace ps2recomp
case OPCODE_BNE:
case OPCODE_BNEL:
return fmt::format("GPR_U64(ctx, {}) != GPR_U64(ctx, {})", rsReg, rtReg);
// The R5900 compares the full 64-bit GPR for the relational branches, as it
// already does for BEQ/BNE above. Comparing only the low word takes the wrong
// branch whenever the upper half is significant, which happens with the
// dsll32/dsra32 sign-extension idiom compilers emit ahead of these opcodes.
case OPCODE_BLEZ:
case OPCODE_BLEZL:
return fmt::format("GPR_S32(ctx, {}) <= 0", rsReg);
return fmt::format("GPR_S64(ctx, {}) <= 0", rsReg);
case OPCODE_BGTZ:
case OPCODE_BGTZL:
return fmt::format("GPR_S32(ctx, {}) > 0", rsReg);
return fmt::format("GPR_S64(ctx, {}) > 0", rsReg);
case OPCODE_REGIMM:
switch (m_branchInst.rt)
{
case REGIMM_BLTZ:
case REGIMM_BLTZL:
case REGIMM_BLTZAL:
case REGIMM_BLTZALL:
return fmt::format("GPR_S32(ctx, {}) < 0", rsReg);
return fmt::format("GPR_S64(ctx, {}) < 0", rsReg);
case REGIMM_BGEZ:
case REGIMM_BGEZL:
case REGIMM_BGEZAL:
case REGIMM_BGEZALL:
return fmt::format("GPR_S32(ctx, {}) >= 0", rsReg);
return fmt::format("GPR_S64(ctx, {}) >= 0", rsReg);
default:
return "false";
}
Expand Down