gl_shader_decompiler: Implement LOP instructions.
This commit is contained in:
parent
5673ce39c7
commit
afdd657d30
|
@ -229,6 +229,14 @@ union Instruction {
|
||||||
BitField<42, 1, u64> negate_pred;
|
BitField<42, 1, u64> negate_pred;
|
||||||
} fmnmx;
|
} fmnmx;
|
||||||
|
|
||||||
|
union {
|
||||||
|
BitField<39, 1, u64> invert_a;
|
||||||
|
BitField<40, 1, u64> invert_b;
|
||||||
|
BitField<41, 2, LogicOperation> operation;
|
||||||
|
BitField<44, 2, u64> unk44;
|
||||||
|
BitField<48, 3, Pred> pred48;
|
||||||
|
} lop;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
BitField<53, 2, LogicOperation> operation;
|
BitField<53, 2, LogicOperation> operation;
|
||||||
BitField<55, 1, u64> invert_a;
|
BitField<55, 1, u64> invert_a;
|
||||||
|
@ -476,6 +484,9 @@ public:
|
||||||
I2I_C,
|
I2I_C,
|
||||||
I2I_R,
|
I2I_R,
|
||||||
I2I_IMM,
|
I2I_IMM,
|
||||||
|
LOP_C,
|
||||||
|
LOP_R,
|
||||||
|
LOP_IMM,
|
||||||
LOP32I,
|
LOP32I,
|
||||||
MOV_C,
|
MOV_C,
|
||||||
MOV_R,
|
MOV_R,
|
||||||
|
@ -675,6 +686,9 @@ private:
|
||||||
INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"),
|
INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"),
|
||||||
INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"),
|
INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"),
|
||||||
INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"),
|
INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"),
|
||||||
|
INST("0100110001000---", Id::LOP_C, Type::ArithmeticInteger, "LOP_C"),
|
||||||
|
INST("0101110001000---", Id::LOP_R, Type::ArithmeticInteger, "LOP_R"),
|
||||||
|
INST("0011100001000---", Id::LOP_IMM, Type::ArithmeticInteger, "LOP_IMM"),
|
||||||
INST("000001----------", Id::LOP32I, Type::ArithmeticIntegerImmediate, "LOP32I"),
|
INST("000001----------", Id::LOP32I, Type::ArithmeticIntegerImmediate, "LOP32I"),
|
||||||
INST("0100110001001---", Id::SHL_C, Type::Shift, "SHL_C"),
|
INST("0100110001001---", Id::SHL_C, Type::Shift, "SHL_C"),
|
||||||
INST("0101110001001---", Id::SHL_R, Type::Shift, "SHL_R"),
|
INST("0101110001001---", Id::SHL_R, Type::Shift, "SHL_R"),
|
||||||
|
|
|
@ -1043,12 +1043,7 @@ private:
|
||||||
}
|
}
|
||||||
case OpCode::Type::ArithmeticInteger: {
|
case OpCode::Type::ArithmeticInteger: {
|
||||||
std::string op_a = regs.GetRegisterAsInteger(instr.gpr8);
|
std::string op_a = regs.GetRegisterAsInteger(instr.gpr8);
|
||||||
|
std::string op_b;
|
||||||
if (instr.alu_integer.negate_a)
|
|
||||||
op_a = '-' + op_a;
|
|
||||||
|
|
||||||
std::string op_b = instr.alu_integer.negate_b ? "-" : "";
|
|
||||||
|
|
||||||
if (instr.is_b_imm) {
|
if (instr.is_b_imm) {
|
||||||
op_b += '(' + std::to_string(instr.alu.GetSignedImm20_20()) + ')';
|
op_b += '(' + std::to_string(instr.alu.GetSignedImm20_20()) + ')';
|
||||||
} else {
|
} else {
|
||||||
|
@ -1064,6 +1059,12 @@ private:
|
||||||
case OpCode::Id::IADD_C:
|
case OpCode::Id::IADD_C:
|
||||||
case OpCode::Id::IADD_R:
|
case OpCode::Id::IADD_R:
|
||||||
case OpCode::Id::IADD_IMM: {
|
case OpCode::Id::IADD_IMM: {
|
||||||
|
if (instr.alu_integer.negate_a)
|
||||||
|
op_a = "-(" + op_a + ')';
|
||||||
|
|
||||||
|
if (instr.alu_integer.negate_b)
|
||||||
|
op_b = "-(" + op_b + ')';
|
||||||
|
|
||||||
regs.SetRegisterToInteger(instr.gpr0, true, 0, op_a + " + " + op_b, 1, 1,
|
regs.SetRegisterToInteger(instr.gpr0, true, 0, op_a + " + " + op_b, 1, 1,
|
||||||
instr.alu.saturate_d);
|
instr.alu.saturate_d);
|
||||||
break;
|
break;
|
||||||
|
@ -1071,12 +1072,33 @@ private:
|
||||||
case OpCode::Id::ISCADD_C:
|
case OpCode::Id::ISCADD_C:
|
||||||
case OpCode::Id::ISCADD_R:
|
case OpCode::Id::ISCADD_R:
|
||||||
case OpCode::Id::ISCADD_IMM: {
|
case OpCode::Id::ISCADD_IMM: {
|
||||||
|
if (instr.alu_integer.negate_a)
|
||||||
|
op_a = "-(" + op_a + ')';
|
||||||
|
|
||||||
|
if (instr.alu_integer.negate_b)
|
||||||
|
op_b = "-(" + op_b + ')';
|
||||||
|
|
||||||
std::string shift = std::to_string(instr.alu_integer.shift_amount.Value());
|
std::string shift = std::to_string(instr.alu_integer.shift_amount.Value());
|
||||||
|
|
||||||
regs.SetRegisterToInteger(instr.gpr0, true, 0,
|
regs.SetRegisterToInteger(instr.gpr0, true, 0,
|
||||||
"((" + op_a + " << " + shift + ") + " + op_b + ')', 1, 1);
|
"((" + op_a + " << " + shift + ") + " + op_b + ')', 1, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case OpCode::Id::LOP_C:
|
||||||
|
case OpCode::Id::LOP_R:
|
||||||
|
case OpCode::Id::LOP_IMM: {
|
||||||
|
ASSERT_MSG(!instr.alu.lop.unk44, "Unimplemented");
|
||||||
|
ASSERT_MSG(instr.alu.lop.pred48 == Pred::UnusedIndex, "Unimplemented");
|
||||||
|
|
||||||
|
if (instr.alu.lop.invert_a)
|
||||||
|
op_a = "~(" + op_a + ')';
|
||||||
|
|
||||||
|
if (instr.alu.lop.invert_b)
|
||||||
|
op_b = "~(" + op_b + ')';
|
||||||
|
|
||||||
|
WriteLogicOperation(instr.gpr0, instr.alu.lop.operation, op_a, op_b);
|
||||||
|
break;
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
NGLOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}",
|
NGLOG_CRITICAL(HW_GPU, "Unhandled ArithmeticInteger instruction: {}",
|
||||||
opcode->GetName());
|
opcode->GetName());
|
||||||
|
|
Reference in New Issue