diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 56a4cc98..6408fb49 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,6 +59,7 @@ set(HEADERS frontend/decoder/decoder_detail.h frontend/decoder/thumb16.h frontend/decoder/thumb32.h + frontend/decoder/vfp2.h frontend/disassembler/disassembler.h frontend/ir/ir.h frontend/ir/ir_emitter.h diff --git a/src/frontend/decoder/vfp2.h b/src/frontend/decoder/vfp2.h index f3b656a8..be69ba7e 100644 --- a/src/frontend/decoder/vfp2.h +++ b/src/frontend/decoder/vfp2.h @@ -100,6 +100,7 @@ boost::optional&> DecodeVFP2(u32 instruction) { // VSTMDB // VPUSH INST(&V::vfp2_VLDR, "VLDR", "cccc1101UD01nnnndddd101zvvvvvvvv"), + INST(&V::vfp2_VSTR, "VSTR", "cccc1101UD00nnnndddd101zvvvvvvvv"), // VLDM // VLDMDB // VPOP diff --git a/src/frontend/disassembler/disassembler_arm.cpp b/src/frontend/disassembler/disassembler_arm.cpp index 2d94f063..4cf6a0c1 100644 --- a/src/frontend/disassembler/disassembler_arm.cpp +++ b/src/frontend/disassembler/disassembler_arm.cpp @@ -828,6 +828,11 @@ public: u32 imm32 = imm8 << 2; return Common::StringFromFormat("vldr%s %s, [%s, #%c%u]", CondToString(cond), FPRegStr(sz, Vd, D).c_str(), RegToString(n), U ? '+' : '-', imm32); } + + std::string vfp2_VSTR(Cond cond, bool U, bool D, Reg n, size_t Vd, bool sz, Imm8 imm8) { + u32 imm32 = imm8 << 2; + return Common::StringFromFormat("vstr%s %s, [%s, #%c%u]", CondToString(cond), FPRegStr(sz, Vd, D).c_str(), RegToString(n), U ? '+' : '-', imm32); + } }; std::string DisassembleArm(u32 instruction) { diff --git a/src/frontend/translate/translate_arm/translate_arm.h b/src/frontend/translate/translate_arm/translate_arm.h index 601c1c71..8abca956 100644 --- a/src/frontend/translate/translate_arm/translate_arm.h +++ b/src/frontend/translate/translate_arm/translate_arm.h @@ -353,6 +353,7 @@ struct ArmTranslatorVisitor final { // Floating-point load-store instructions bool vfp2_VLDR(Cond cond, bool U, bool D, Reg n, size_t Vd, bool sz, Imm8 imm8); + bool vfp2_VSTR(Cond cond, bool U, bool D, Reg n, size_t Vd, bool sz, Imm8 imm8); }; } // namespace Arm diff --git a/src/frontend/translate/translate_arm/vfp2.cpp b/src/frontend/translate/translate_arm/vfp2.cpp index 7f931c35..128aa45b 100644 --- a/src/frontend/translate/translate_arm/vfp2.cpp +++ b/src/frontend/translate/translate_arm/vfp2.cpp @@ -379,5 +379,23 @@ bool ArmTranslatorVisitor::vfp2_VLDR(Cond cond, bool U, bool D, Reg n, size_t Vd return true; } +bool ArmTranslatorVisitor::vfp2_VSTR(Cond cond, bool U, bool D, Reg n, size_t Vd, bool sz, Imm8 imm8) { + u32 imm32 = imm8 << 2; + ExtReg d = ToExtReg(sz, Vd, D); + // VSTR <{S,D}d>, [, #+/-] + if (ConditionPassed(cond)) { + auto base = n == Reg::PC ? ir.Imm32(ir.AlignPC(4)) : ir.GetRegister(n); + auto address = U ? ir.Add(base, ir.Imm32(imm32)) : ir.Sub(base, ir.Imm32(imm32)); + if (sz) { + auto d_u64 = ir.TransferFromFP64(ir.GetExtendedRegister(d)); + ir.WriteMemory32(address, ir.LeastSignificantWord(d_u64)); + ir.WriteMemory32(ir.Add(address, ir.Imm32(4)), ir.MostSignificantWord(d_u64).result); + } else { + ir.WriteMemory32(address, ir.TransferFromFP32(ir.GetExtendedRegister(d))); + } + } + return true; +} + } // namespace Arm } // namespace Dynarmic diff --git a/tests/arm/fuzz_arm.cpp b/tests/arm/fuzz_arm.cpp index 0add1adf..3a143bd8 100644 --- a/tests/arm/fuzz_arm.cpp +++ b/tests/arm/fuzz_arm.cpp @@ -423,10 +423,11 @@ TEST_CASE("VFP: VMOV", "[JitX64][vfp]") { } -TEST_CASE("VFP: VMOV (reg), VLDR", "[JitX64][vfp]") { - const std::array instructions = {{ +TEST_CASE("VFP: VMOV (reg), VLDR, VSTR", "[JitX64][vfp]") { + const std::array instructions = {{ InstructionGenerator("cccc11101D110000dddd101z01M0mmmm"), InstructionGenerator("cccc1101UD01nnnndddd101zvvvvvvvv"), + InstructionGenerator("cccc1101UD00nnnndddd101zvvvvvvvv"), }}; FuzzJitArm(1, 1, 10000, [&instructions]() -> u32 {