thumb32: Implement AND (immediate)

This commit is contained in:
MerryMage 2021-02-18 01:11:06 +00:00
parent 5bf676d93e
commit 6f3c5dc1d9
3 changed files with 21 additions and 2 deletions

View file

@ -54,7 +54,7 @@
// Data Processing (Modified Immediate)
INST(thumb32_TST_imm, "TST (imm)", "11110v000001nnnn0vvv1111vvvvvvvv")
//INST(thumb32_AND_imm, "AND (imm)", "11110-00000-----0---------------")
INST(thumb32_AND_imm, "AND (imm)", "11110v00000Snnnn0vvvddddvvvvvvvv")
//INST(thumb32_BIC_imm, "BIC (imm)", "11110-00001-----0---------------")
//INST(thumb32_MOV_imm, "MOV (imm)", "11110000010-11110---------------")
//INST(thumb32_ORR_imm, "ORR (imm)", "11110-00010-----0---------------")

View file

@ -12,7 +12,7 @@ bool ThumbTranslatorVisitor::thumb32_TST_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8
return UnpredictableInstruction();
}
const auto imm_carry = ThumbExpandImm_C(rotate, imm8, ir.GetCFlag());
const auto imm_carry = ThumbExpandImm_C(i, imm3, imm8, ir.GetCFlag());
const auto result = ir.And(ir.GetRegister(n), ir.Imm32(imm_carry.imm32));
ir.SetNFlag(ir.MostSignificantBit(result));
@ -21,4 +21,22 @@ bool ThumbTranslatorVisitor::thumb32_TST_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8
return true;
}
bool ThumbTranslatorVisitor::thumb32_AND_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8) {
ASSERT_MSG(!(d == Reg::PC && S), "Decode error");
if ((d == Reg::PC && !S) || n == Reg::PC) {
return UnpredictableInstruction();
}
const auto imm_carry = ThumbExpandImm_C(i, imm3, imm8, ir.GetCFlag());
const auto result = ir.And(ir.GetRegister(n), ir.Imm32(imm_carry.imm32));
ir.SetRegister(d, result);
if (S) {
ir.SetNFlag(ir.MostSignificantBit(result));
ir.SetZFlag(ir.IsZero(result));
ir.SetCFlag(imm_carry.carry);
}
return true;
}
} // namespace Dynarmic::A32

View file

@ -150,6 +150,7 @@ struct ThumbTranslatorVisitor final {
// thumb32 data processing (modified immediate) instructions
bool thumb32_TST_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8> imm8);
bool thumb32_AND_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8);
// thumb32 miscellaneous control instructions
bool thumb32_UDF();