diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-03-27 22:36:38 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-03-27 22:36:38 +0100 |
commit | 796b3319e6171a152e41e9719b42dbddf20e2957 (patch) | |
tree | 7d0febb2c1db2f37b218a2753585d9798b1e00e8 /src/video_core | |
parent | Merge pull request #3565 from ReinUsesLisp/image-format (diff) | |
download | yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar.gz yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar.bz2 yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar.lz yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar.xz yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.tar.zst yuzu-796b3319e6171a152e41e9719b42dbddf20e2957.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/shader/decode/arithmetic_integer.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp index 2fe787d6f..5d546ddec 100644 --- a/src/video_core/shader/decode/arithmetic_integer.cpp +++ b/src/video_core/shader/decode/arithmetic_integer.cpp @@ -235,34 +235,30 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { case OpCode::Id::LEA_IMM: case OpCode::Id::LEA_RZ: case OpCode::Id::LEA_HI: { - const auto [op_a, op_b, op_c] = [&]() -> std::tuple<Node, Node, Node> { + auto [op_a, op_b, op_c] = [&]() -> std::tuple<Node, Node, Node> { switch (opcode->get().GetId()) { case OpCode::Id::LEA_R2: { return {GetRegister(instr.gpr20), GetRegister(instr.gpr39), Immediate(static_cast<u32>(instr.lea.r2.entry_a))}; } - case OpCode::Id::LEA_R1: { const bool neg = instr.lea.r1.neg != 0; return {GetOperandAbsNegInteger(GetRegister(instr.gpr8), false, neg, true), GetRegister(instr.gpr20), Immediate(static_cast<u32>(instr.lea.r1.entry_a))}; } - case OpCode::Id::LEA_IMM: { const bool neg = instr.lea.imm.neg != 0; return {Immediate(static_cast<u32>(instr.lea.imm.entry_a)), GetOperandAbsNegInteger(GetRegister(instr.gpr8), false, neg, true), Immediate(static_cast<u32>(instr.lea.imm.entry_b))}; } - case OpCode::Id::LEA_RZ: { const bool neg = instr.lea.rz.neg != 0; return {GetConstBuffer(instr.lea.rz.cb_index, instr.lea.rz.cb_offset), GetOperandAbsNegInteger(GetRegister(instr.gpr8), false, neg, true), Immediate(static_cast<u32>(instr.lea.rz.entry_a))}; } - case OpCode::Id::LEA_HI: default: UNIMPLEMENTED_MSG("Unhandled LEA subinstruction: {}", opcode->get().GetName()); @@ -275,12 +271,10 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) { UNIMPLEMENTED_IF_MSG(instr.lea.pred48 != static_cast<u64>(Pred::UnusedIndex), "Unhandled LEA Predicate"); - const Node shifted_c = - Operation(OperationCode::ILogicalShiftLeft, NO_PRECISE, Immediate(1), op_c); - const Node mul_bc = Operation(OperationCode::IMul, NO_PRECISE, op_b, shifted_c); - const Node value = Operation(OperationCode::IAdd, NO_PRECISE, op_a, mul_bc); - - SetRegister(bb, instr.gpr0, value); + Node shifted_c = Operation(OperationCode::ILogicalShiftLeft, Immediate(1), std::move(op_c)); + Node mul_bc = Operation(OperationCode::IMul, std::move(op_b), std::move(shifted_c)); + Node value = Operation(OperationCode::IAdd, std::move(op_a), std::move(mul_bc)); + SetRegister(bb, instr.gpr0, std::move(value)); break; } |