From b7a8cfdde98ea9380d2ea89a47fc16776dec8650 Mon Sep 17 00:00:00 2001 From: Hendiadyoin1 Date: Fri, 1 Apr 2022 13:55:38 +0200 Subject: [PATCH] LibX86: Correctly name CVTTSS2SI_r32_xmm2m32 This was previously erroneously called CVTTPS2PI_r32_xmm2m32, while the mnemonic was correctly CVTTSS2SI. --- Userland/DevTools/UserspaceEmulator/SoftCPU.cpp | 2 +- Userland/DevTools/UserspaceEmulator/SoftCPU.h | 2 +- Userland/Libraries/LibX86/Instruction.cpp | 2 +- Userland/Libraries/LibX86/Interpreter.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp index 50782cd0d9..07ec12d522 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp @@ -2914,7 +2914,7 @@ void SoftCPU::MOVHPS_m64_xmm2(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::MOVAPS_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::MOVAPS_xmm1m128_xmm2(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::CVTTPS2PI_mm1_xmm2m64(X86::Instruction const&) { TODO_INSN(); }; -void SoftCPU::CVTTPS2PI_r32_xmm2m32(X86::Instruction const&) { TODO_INSN(); }; +void SoftCPU::CVTTSS2SI_r32_xmm2m32(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::CVTPI2PS_xmm1_mm2m64(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::CVTSI2SS_xmm1_rm32(X86::Instruction const&) { TODO_INSN(); }; void SoftCPU::MOVNTPS_xmm1m128_xmm2(X86::Instruction const&) { TODO_INSN(); }; diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.h b/Userland/DevTools/UserspaceEmulator/SoftCPU.h index 070d451092..5ce677d9c6 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.h @@ -1130,7 +1130,7 @@ private: virtual void CVTSI2SS_xmm1_rm32(X86::Instruction const&) override; virtual void MOVNTPS_xmm1m128_xmm2(X86::Instruction const&) override; virtual void CVTTPS2PI_mm1_xmm2m64(X86::Instruction const&) override; - virtual void CVTTPS2PI_r32_xmm2m32(X86::Instruction const&) override; + virtual void CVTTSS2SI_r32_xmm2m32(X86::Instruction const&) override; virtual void CVTPS2PI_xmm1_mm2m64(X86::Instruction const&) override; virtual void CVTSS2SI_xmm1_rm32(X86::Instruction const&) override; virtual void UCOMISS_xmm1_xmm2m32(X86::Instruction const&) override; diff --git a/Userland/Libraries/LibX86/Instruction.cpp b/Userland/Libraries/LibX86/Instruction.cpp index 0d6fbc98e5..806f7a4f88 100644 --- a/Userland/Libraries/LibX86/Instruction.cpp +++ b/Userland/Libraries/LibX86/Instruction.cpp @@ -867,7 +867,7 @@ static void build_sse_f3(u8 op, char const* mnemonic, InstructionFormat format, build_sse_f3(0x2A, "CVTSI2SS", OP_xmm1_rm32, &Interpreter::CVTSI2SS_xmm1_rm32); build_sse_np(0x2B, "MOVNTPS", OP_xmm1m128_xmm2, &Interpreter::MOVNTPS_xmm1m128_xmm2); build_sse_np(0x2C, "CVTTPS2PI", OP_mm1_xmm2m64, &Interpreter::CVTTPS2PI_mm1_xmm2m64); - build_sse_f3(0x2C, "CVTTSS2SI", OP_r32_xmm2m32, &Interpreter::CVTTPS2PI_r32_xmm2m32); + build_sse_f3(0x2C, "CVTTSS2SI", OP_r32_xmm2m32, &Interpreter::CVTTSS2SI_r32_xmm2m32); build_sse_np(0x2D, "CVTPS2PI", OP_mm1_xmm2m64, &Interpreter::CVTPS2PI_xmm1_mm2m64); build_sse_f3(0x2D, "CVTSS2SI", OP_r32_xmm2m32, &Interpreter::CVTSS2SI_xmm1_rm32); build_sse_np(0x2E, "UCOMISS", OP_xmm1_xmm2m32, &Interpreter::UCOMISS_xmm1_xmm2m32); diff --git a/Userland/Libraries/LibX86/Interpreter.h b/Userland/Libraries/LibX86/Interpreter.h index d8fa0623a2..98c63aac68 100644 --- a/Userland/Libraries/LibX86/Interpreter.h +++ b/Userland/Libraries/LibX86/Interpreter.h @@ -676,7 +676,7 @@ public: virtual void MOVAPS_xmm1_xmm2m128(Instruction const&) = 0; virtual void MOVAPS_xmm1m128_xmm2(Instruction const&) = 0; virtual void CVTTPS2PI_mm1_xmm2m64(Instruction const&) = 0; - virtual void CVTTPS2PI_r32_xmm2m32(Instruction const&) = 0; + virtual void CVTTSS2SI_r32_xmm2m32(Instruction const&) = 0; virtual void CVTPI2PS_xmm1_mm2m64(Instruction const&) = 0; virtual void CVTSI2SS_xmm1_rm32(Instruction const&) = 0; virtual void MOVNTPS_xmm1m128_xmm2(Instruction const&) = 0;