From 3fe46d2c6f591197d6da66b6a86937ac73ef1886 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Sun, 10 Jul 2016 08:55:56 +0800
Subject: [PATCH] Implement thumb1_CMN_reg
---
src/frontend/decoder/thumb1.h | 4 ++--
src/frontend/disassembler_thumb.cpp | 4 ++++
src/frontend/translate_thumb.cpp | 9 +++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/frontend/decoder/thumb1.h b/src/frontend/decoder/thumb1.h
index 248d6c3c..01057c87 100644
--- a/src/frontend/decoder/thumb1.h
+++ b/src/frontend/decoder/thumb1.h
@@ -56,7 +56,7 @@ private:
};
template <typename V>
-static const std::array<Thumb1Matcher<V>, 24> g_thumb1_instruction_table {{
+static const std::array<Thumb1Matcher<V>, 25> g_thumb1_instruction_table {{
#define INST(fn, name, bitstring) detail::detail<Thumb1Matcher, u16, 16>::GetMatcher<decltype(fn), fn>(name, bitstring)
@@ -85,7 +85,7 @@ static const std::array<Thumb1Matcher<V>, 24> g_thumb1_instruction_table {{
{ INST(&V::thumb1_TST_reg, "TST (reg)", "0100001000mmmnnn") },
{ INST(&V::thumb1_RSB_imm, "RSB (imm)", "0100001001nnnddd") },
{ INST(&V::thumb1_CMP_reg, "CMP (reg)", "0100001010mmmnnn") },
- //{ INST(&V::thumb1_CMN_rr, "CMN (rr)", "0100001011mmmnnn") },
+ { INST(&V::thumb1_CMN_reg, "CMN (reg)", "0100001011mmmnnn") },
//{ INST(&V::thumb1_ORRS_rr, "ORRS (rr)", "0100001100mmmddd") },
//{ INST(&V::thumb1_MULS_rr, "MULS (rr)", "0100001101mmmddd") },
//{ INST(&V::thumb1_BICS_rr, "BICS (rr)", "0100001110mmmddd") },
diff --git a/src/frontend/disassembler_thumb.cpp b/src/frontend/disassembler_thumb.cpp
index 632a89f4..325da510 100644
--- a/src/frontend/disassembler_thumb.cpp
+++ b/src/frontend/disassembler_thumb.cpp
@@ -191,6 +191,10 @@ public:
return Common::StringFromFormat("cmp %s, %s", RegStr(n), RegStr(m));
}
+ std::string thumb1_CMN_reg(Reg m, Reg n) {
+ return Common::StringFromFormat("cmn %s, %s", RegStr(n), RegStr(m));
+ }
+
std::string thumb1_ADD_reg_t2(bool d_n_hi, Reg m, Reg d_n_lo) {
Reg d_n = d_n_hi ? (d_n_lo + 8) : d_n_lo;
return Common::StringFromFormat("add %s, %s", RegStr(d_n), RegStr(m));
diff --git a/src/frontend/translate_thumb.cpp b/src/frontend/translate_thumb.cpp
index 6cf9a3bf..13ec616d 100644
--- a/src/frontend/translate_thumb.cpp
+++ b/src/frontend/translate_thumb.cpp
@@ -278,6 +278,15 @@ struct TranslatorVisitor final {
ir.SetVFlag(result.overflow);
return true;
}
+ bool thumb1_CMN_reg(Reg m, Reg n) {
+ // CMN <Rn>, <Rm>
+ auto result = ir.AddWithCarry(ir.GetRegister(n), ir.GetRegister(m), ir.Imm1(0));
+ ir.SetNFlag(ir.MostSignificantBit(result.result));
+ ir.SetZFlag(ir.IsZero(result.result));
+ ir.SetCFlag(result.carry);
+ ir.SetVFlag(result.overflow);
+ return true;
+ }
bool thumb1_ADD_reg_t2(bool d_n_hi, Reg m, Reg d_n_lo) {
Reg d_n = d_n_hi ? (d_n_lo + 8) : d_n_lo;