artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

shader: Fix ISCADD logic for PO/CC

Browse source
This commit is contained in:
ameerj 2021-03-28 20:16:26 -04:00
parent e860870dd2
commit cd9f75e223
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/shader_recompiler/frontend/maxwell/translate/impl/integer_scaled_add.cpp
View file

@ -30,23 +30,24 @@ void ISCADD(TranslatorVisitor& v, u64 insn, IR::U32 op_b) {
if (iscadd.neg_b != 0) { if (iscadd.neg_b != 0) {
op_b = v.ir.INeg(op_b); op_b = v.ir.INeg(op_b);
} }
} else {
// When PO is present, add one
op_b = v.ir.IAdd(op_b, v.ir.Imm32(1));
} }
// With the operands already processed, scale A // With the operands already processed, scale A
const IR::U32 scale{v.ir.Imm32(static_cast<u32>(iscadd.scale))}; const IR::U32 scale{v.ir.Imm32(static_cast<u32>(iscadd.scale))};
const IR::U32 scaled_a{v.ir.ShiftLeftLogical(op_a, scale)}; const IR::U32 scaled_a{v.ir.ShiftLeftLogical(op_a, scale)};
IR::U32 result{v.ir.IAdd(scaled_a, op_b)}; const IR::U32 result{v.ir.IAdd(scaled_a, op_b)};
if (po) {
// .PO adds one to the final result
result = v.ir.IAdd(result, v.ir.Imm32(1));
}
v.X(iscadd.dest_reg, result); v.X(iscadd.dest_reg, result);
if (iscadd.cc != 0) { if (iscadd.cc != 0) {
v.SetZFlag(v.ir.GetZeroFromOp(result)); v.SetZFlag(v.ir.GetZeroFromOp(result));
v.SetSFlag(v.ir.GetSignFromOp(result)); v.SetSFlag(v.ir.GetSignFromOp(result));
v.SetCFlag(v.ir.GetCarryFromOp(result)); const IR::U1 carry{v.ir.GetCarryFromOp(result)};
v.SetOFlag(v.ir.GetOverflowFromOp(result)); const IR::U1 overflow{v.ir.GetOverflowFromOp(result)};
v.SetCFlag(po ? v.ir.LogicalOr(carry, v.ir.GetCarryFromOp(op_b)) : carry);
v.SetOFlag(po ? v.ir.LogicalOr(overflow, v.ir.GetOverflowFromOp(op_b)) : overflow);
} }
} }