suyu/dynarmic
28
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement thumb1_ORR_reg

Browse source
This commit is contained in:
MerryMage 2016-07-10 09:06:38 +08:00
parent 3fe46d2c6f
commit 98a64a92b1
8 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/backend_x64/emit_x64.cpp
View file

@ -525,6 +525,15 @@ void EmitX64::EmitEor(IR::Value* value_) {
code->XOR(32, R(result), R(eorend));
}
void EmitX64::EmitOr(IR::Value* value_) {
auto value = reinterpret_cast<IR::Inst*>(value_);
X64Reg orend = reg_alloc.UseRegister(value->GetArg(1).get());
X64Reg result = reg_alloc.UseDefRegister(value->GetArg(0).get(), value);
code->OR(32, R(result), R(orend));
}
void EmitX64::EmitAddCycles(size_t cycles) {
ASSERT(cycles < std::numeric_limits<u32>::max());
code->SUB(64, MDisp(R15, offsetof(JitState, cycles_remaining)), Imm32(static_cast<u32>(cycles)));

1
src/backend_x64/emit_x64.h
View file

@ -57,6 +57,7 @@ public:
void EmitSubWithCarry(IR::Value* value);
void EmitAnd(IR::Value* value);
void EmitEor(IR::Value* value);
void EmitOr(IR::Value* value);
void EmitAddCycles(size_t cycles);

4
src/frontend/decoder/thumb1.h
View file

@ -56,7 +56,7 @@ private:
};
template <typename V>
static const std::array<Thumb1Matcher<V>, 25> g_thumb1_instruction_table {{
static const std::array<Thumb1Matcher<V>, 26> g_thumb1_instruction_table {{
#define INST(fn, name, bitstring) detail::detail<Thumb1Matcher, u16, 16>::GetMatcher<decltype(fn), fn>(name, bitstring)
@ -86,7 +86,7 @@ static const std::array<Thumb1Matcher<V>, 25> g_thumb1_instruction_table {{
{ INST(&V::thumb1_RSB_imm, "RSB (imm)", "0100001001nnnddd") },
{ INST(&V::thumb1_CMP_reg, "CMP (reg)", "0100001010mmmnnn") },
{ INST(&V::thumb1_CMN_reg, "CMN (reg)", "0100001011mmmnnn") },
//{ INST(&V::thumb1_ORRS_rr, "ORRS (rr)", "0100001100mmmddd") },
{ INST(&V::thumb1_ORR_reg, "ORR (reg)", "0100001100mmmddd") },
//{ INST(&V::thumb1_MULS_rr, "MULS (rr)", "0100001101mmmddd") },
//{ INST(&V::thumb1_BICS_rr, "BICS (rr)", "0100001110mmmddd") },
//{ INST(&V::thumb1_MVNS_rr, "MVNS (rr)", "0100001111mmmddd") },

4
src/frontend/disassembler_thumb.cpp
View file

@ -195,6 +195,10 @@ public:
return Common::StringFromFormat("cmn %s, %s", RegStr(n), RegStr(m));
}
std::string thumb1_ORR_reg(Reg m, Reg d_n) {
return Common::StringFromFormat("orrs %s, %s", RegStr(d_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));

1
src/frontend/ir/opcodes.inc
View file

@ -34,3 +34,4 @@ OPCODE(AddWithCarry, T::U32, T::U32, T::U32,
OPCODE(SubWithCarry, T::U32, T::U32, T::U32, T::U1 )
OPCODE(And, T::U32, T::U32, T::U32 )
OPCODE(Eor, T::U32, T::U32, T::U32 )
OPCODE(Or, T::U32, T::U32, T::U32 )

4
src/frontend/ir_emitter.cpp
View file

@ -128,6 +128,10 @@ IR::ValuePtr IREmitter::Eor(IR::ValuePtr a, IR::ValuePtr b) {
return Inst(IR::Opcode::Eor, {a, b});
}
IR::ValuePtr IREmitter::Or(IR::ValuePtr a, IR::ValuePtr b) {
return Inst(IR::Opcode::Or, {a, b});
}
void IREmitter::SetTerm(const IR::Terminal& terminal) {
ASSERT_MSG(block.terminal.which() == 0, "Terminal has already been set.");
block.terminal = terminal;

1
src/frontend/ir_emitter.h
View file

@ -60,6 +60,7 @@ public:
ResultAndCarryAndOverflow SubWithCarry(IR::ValuePtr a, IR::ValuePtr b, IR::ValuePtr carry_in);
IR::ValuePtr And(IR::ValuePtr a, IR::ValuePtr b);
IR::ValuePtr Eor(IR::ValuePtr a, IR::ValuePtr b);
IR::ValuePtr Or(IR::ValuePtr a, IR::ValuePtr b);
void SetTerm(const IR::Terminal& terminal);

10
src/frontend/translate_thumb.cpp
View file

@ -287,6 +287,16 @@ struct TranslatorVisitor final {
ir.SetVFlag(result.overflow);
return true;
}
bool thumb1_ORR_reg(Reg m, Reg d_n) {
Reg d = d_n, n = d_n;
// ORRS <Rdn>, <Rm>
// Rd cannot encode R15.
auto result = ir.Or(ir.GetRegister(m), ir.GetRegister(n));
ir.SetRegister(d, result);
ir.SetNFlag(ir.MostSignificantBit(result));
ir.SetZFlag(ir.IsZero(result));
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;