mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

thumb32: Implement LDRSH variants

Browse source
This commit is contained in:
Lioncash 2021-03-09 17:20:55 -05:00
parent 7a9bdc8f21
commit 921998f6e9
3 changed files with 104 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/frontend/A32/decoder/thumb32.inc
View file

@ -166,15 +166,15 @@ INST(thumb32_LDRH_reg, "LDRH (reg)", "111110000011nnnntttt00
INST(thumb32_LDRHT, "LDRHT", "111110000011nnnntttt1110iiiiiiii") INST(thumb32_LDRHT, "LDRHT", "111110000011nnnntttt1110iiiiiiii")
INST(thumb32_LDRH_imm8, "LDRH (imm8)", "111110000011nnnntttt1PUWiiiiiiii") INST(thumb32_LDRH_imm8, "LDRH (imm8)", "111110000011nnnntttt1PUWiiiiiiii")
INST(thumb32_LDRH_imm12, "LDRH (imm12)", "111110001011nnnnttttiiiiiiiiiiii") INST(thumb32_LDRH_imm12, "LDRH (imm12)", "111110001011nnnnttttiiiiiiiiiiii")
//INST(thumb32_LDRSH_lit, "LDRSH (lit)", "11111001-0111111----------------") INST(thumb32_NOP, "NOP", "11111001-01111111111------------")
//INST(thumb32_LDRSH_reg, "LDRSH (reg)", "111110010011--------000000------") INST(thumb32_LDRSH_lit, "LDRSH (lit)", "11111001U0111111ttttiiiiiiiiiiii")
//INST(thumb32_LDRSHT, "LDRSHT", "111110010011--------1110--------") INST(thumb32_NOP, "NOP", "111110010011----1111000000------")
//INST(thumb32_LDRSH_imm8, "LDRSH (imm8)", "111110010011--------1-----------") INST(thumb32_LDRSH_reg, "LDRSH (reg)", "111110010011nnnntttt000000iimmmm")
//INST(thumb32_LDRSH_imm12, "LDRSH (imm12)", "111110011011--------------------") INST(thumb32_LDRSHT, "LDRSHT", "111110010011nnnntttt1110iiiiiiii")
//INST(thumb32_NOP, "NOP", "111110010011----1111000000------") INST(thumb32_NOP, "NOP", "111110010011----11111100--------")
//INST(thumb32_NOP, "NOP", "111110010011----11111100--------") INST(thumb32_NOP, "NOP", "111110011011----1111------------")
//INST(thumb32_NOP, "NOP", "11111001-01111111111------------") INST(thumb32_LDRSH_imm8, "LDRSH (imm8)", "111110010011nnnntttt1PUWiiiiiiii")
//INST(thumb32_NOP, "NOP", "111110011011----1111------------") INST(thumb32_LDRSH_imm12, "LDRSH (imm12)", "111110011011nnnnttttiiiiiiiiiiii")
// Load Word // Load Word
INST(thumb32_LDR_lit, "LDR (lit)", "11111000U1011111ttttiiiiiiiiiiii") INST(thumb32_LDR_lit, "LDR (lit)", "11111000U1011111ttttiiiiiiiiiiii")

125
src/frontend/A32/translate/impl/thumb32_load_halfword.cpp
View file

@ -7,31 +7,61 @@
namespace Dynarmic::A32 { namespace Dynarmic::A32 {
bool ThumbTranslatorVisitor::thumb32_LDRH_lit(bool U, Reg t, Imm<12> imm12) { using ExtensionFunction = IR::U32 (IREmitter::*)(const IR::U16&);
const auto imm32 = imm12.ZeroExtend();
const auto base = ir.AlignPC(4);
const auto address = U ? (base + imm32) : (base - imm32);
const auto data = ir.ZeroExtendHalfToWord(ir.ReadMemory16(ir.Imm32(address)));
ir.SetRegister(t, data); static bool LoadHalfLiteral(ThumbTranslatorVisitor& v, bool U, Reg t, Imm<12> imm12,
ExtensionFunction ext_fn) {
const auto imm32 = imm12.ZeroExtend();
const auto base = v.ir.AlignPC(4);
const auto address = U ? (base + imm32) : (base - imm32);
const auto data = (v.ir.*ext_fn)(v.ir.ReadMemory16(v.ir.Imm32(address)));
v.ir.SetRegister(t, data);
return true; return true;
} }
bool ThumbTranslatorVisitor::thumb32_LDRH_reg(Reg n, Reg t, Imm<2> imm2, Reg m) { static bool LoadHalfRegister(ThumbTranslatorVisitor& v, Reg n, Reg t, Imm<2> imm2, Reg m,
ExtensionFunction ext_fn) {
if (m == Reg::PC) { if (m == Reg::PC) {
return UnpredictableInstruction(); return v.UnpredictableInstruction();
} }
const IR::U32 reg_m = ir.GetRegister(m); const IR::U32 reg_m = v.ir.GetRegister(m);
const IR::U32 reg_n = ir.GetRegister(n); const IR::U32 reg_n = v.ir.GetRegister(n);
const IR::U32 offset = ir.LogicalShiftLeft(reg_m, ir.Imm8(imm2.ZeroExtend<u8>())); const IR::U32 offset = v.ir.LogicalShiftLeft(reg_m, v.ir.Imm8(imm2.ZeroExtend<u8>()));
const IR::U32 address = ir.Add(reg_n, offset); const IR::U32 address = v.ir.Add(reg_n, offset);
const IR::U32 data = ir.ZeroExtendHalfToWord(ir.ReadMemory16(address)); const IR::U32 data = (v.ir.*ext_fn)(v.ir.ReadMemory16(address));
ir.SetRegister(t, data); v.ir.SetRegister(t, data);
return true; return true;
} }
static bool LoadHalfImmediate(ThumbTranslatorVisitor& v, Reg n, Reg t, bool P, bool U, bool W,
Imm<12> imm12, ExtensionFunction ext_fn) {
const u32 imm32 = imm12.ZeroExtend();
const IR::U32 reg_n = v.ir.GetRegister(n);
const IR::U32 offset_address = U ? v.ir.Add(reg_n, v.ir.Imm32(imm32))
: v.ir.Sub(reg_n, v.ir.Imm32(imm32));
const IR::U32 address = P ? offset_address
: reg_n;
const IR::U32 data = (v.ir.*ext_fn)(v.ir.ReadMemory16(address));
if (W) {
v.ir.SetRegister(n, offset_address);
}
v.ir.SetRegister(t, data);
return true;
}
bool ThumbTranslatorVisitor::thumb32_LDRH_lit(bool U, Reg t, Imm<12> imm12) {
return LoadHalfLiteral(*this, U, t, imm12, &IREmitter::ZeroExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRH_reg(Reg n, Reg t, Imm<2> imm2, Reg m) {
return LoadHalfRegister(*this, n, t, imm2, m, &IREmitter::ZeroExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8) { bool ThumbTranslatorVisitor::thumb32_LDRH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8) {
if (!P && !W) { if (!P && !W) {
return UndefinedInstruction(); return UndefinedInstruction();
@ -43,30 +73,13 @@ bool ThumbTranslatorVisitor::thumb32_LDRH_imm8(Reg n, Reg t, bool P, bool U, boo
return UnpredictableInstruction(); return UnpredictableInstruction();
} }
const u32 imm32 = imm8.ZeroExtend(); return LoadHalfImmediate(*this, n, t, P, U, W, Imm<12>{imm8.ZeroExtend()},
const IR::U32 reg_n = ir.GetRegister(n); &IREmitter::ZeroExtendHalfToWord);
const IR::U32 offset_address = U ? ir.Add(reg_n, ir.Imm32(imm32))
: ir.Sub(reg_n, ir.Imm32(imm32));
const IR::U32 address = P ? offset_address
: reg_n;
const IR::U32 data = ir.ZeroExtendHalfToWord(ir.ReadMemory16(address));
if (W) {
ir.SetRegister(n, offset_address);
}
ir.SetRegister(t, data);
return true;
} }
bool ThumbTranslatorVisitor::thumb32_LDRH_imm12(Reg n, Reg t, Imm<12> imm12) { bool ThumbTranslatorVisitor::thumb32_LDRH_imm12(Reg n, Reg t, Imm<12> imm12) {
const auto imm32 = imm12.ZeroExtend(); return LoadHalfImmediate(*this, n, t, true, true, false, imm12,
const auto reg_n = ir.GetRegister(n); &IREmitter::ZeroExtendHalfToWord);
const auto address = ir.Add(reg_n, ir.Imm32(imm32));
const auto data = ir.ZeroExtendHalfToWord(ir.ReadMemory16(address));
ir.SetRegister(t, data);
return true;
} }
bool ThumbTranslatorVisitor::thumb32_LDRHT(Reg n, Reg t, Imm<8> imm8) { bool ThumbTranslatorVisitor::thumb32_LDRHT(Reg n, Reg t, Imm<8> imm8) {
@ -83,4 +96,46 @@ bool ThumbTranslatorVisitor::thumb32_LDRHT(Reg n, Reg t, Imm<8> imm8) {
return thumb32_LDRH_imm8(n, t, true, true, false, imm8); return thumb32_LDRH_imm8(n, t, true, true, false, imm8);
} }
bool ThumbTranslatorVisitor::thumb32_LDRSH_lit(bool U, Reg t, Imm<12> imm12) {
return LoadHalfLiteral(*this, U, t, imm12, &IREmitter::SignExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRSH_reg(Reg n, Reg t, Imm<2> imm2, Reg m) {
return LoadHalfRegister(*this, n, t, imm2, m, &IREmitter::SignExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRSH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8) {
if (!P && !W) {
return UndefinedInstruction();
}
if (t == Reg::PC && W) {
return UnpredictableInstruction();
}
if (W && n == t) {
return UnpredictableInstruction();
}
return LoadHalfImmediate(*this, n, t, P, U, W, Imm<12>{imm8.ZeroExtend()},
&IREmitter::SignExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRSH_imm12(Reg n, Reg t, Imm<12> imm12) {
return LoadHalfImmediate(*this, n, t, true, true, false, imm12,
&IREmitter::SignExtendHalfToWord);
}
bool ThumbTranslatorVisitor::thumb32_LDRSHT(Reg n, Reg t, Imm<8> imm8) {
// TODO: Add an unpredictable instruction path if this
// is executed in hypervisor mode if we ever support
// privileged execution levels.
if (t == Reg::PC) {
return UnpredictableInstruction();
}
// Treat it as a normal LDRSH, given we don't support
// execution levels other than EL0 currently.
return thumb32_LDRSH_imm8(n, t, true, true, false, imm8);
}
} // namespace Dynarmic::A32 } // namespace Dynarmic::A32

5
src/frontend/A32/translate/impl/translate_thumb.h
View file

@ -273,6 +273,11 @@ struct ThumbTranslatorVisitor final {
bool thumb32_LDRH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8); bool thumb32_LDRH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8);
bool thumb32_LDRH_imm12(Reg n, Reg t, Imm<12> imm12); bool thumb32_LDRH_imm12(Reg n, Reg t, Imm<12> imm12);
bool thumb32_LDRHT(Reg n, Reg t, Imm<8> imm8); bool thumb32_LDRHT(Reg n, Reg t, Imm<8> imm8);
bool thumb32_LDRSH_lit(bool U, Reg t, Imm<12> imm12);
bool thumb32_LDRSH_reg(Reg n, Reg t, Imm<2> imm2, Reg m);
bool thumb32_LDRSH_imm8(Reg n, Reg t, bool P, bool U, bool W, Imm<8> imm8);
bool thumb32_LDRSH_imm12(Reg n, Reg t, Imm<12> imm12);
bool thumb32_LDRSHT(Reg n, Reg t, Imm<8> imm8);
// thumb32 load word instructions // thumb32 load word instructions
bool thumb32_LDR_lit(bool U, Reg t, Imm<12> imm12); bool thumb32_LDR_lit(bool U, Reg t, Imm<12> imm12);