diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp index 40f897242d..2b9a565045 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp @@ -2926,7 +2926,7 @@ VPU_INSTRUCTION(CVTPI2PS_xmm1_mm2m64); VPU_INSTRUCTION(CVTSI2SS_xmm1_rm32); VPU_INSTRUCTION(MOVNTPS_xmm1m128_xmm2); VPU_INSTRUCTION(CVTPS2PI_xmm1_mm2m64); -VPU_INSTRUCTION(CVTSS2SI_xmm1_rm32); +VPU_INSTRUCTION(CVTSS2SI_r32_xmm2m32); VPU_INSTRUCTION(UCOMISS_xmm1_xmm2m32); VPU_INSTRUCTION(COMISS_xmm1_xmm2m32); VPU_INSTRUCTION(MOVMSKPS_reg_xmm); diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.h b/Userland/DevTools/UserspaceEmulator/SoftCPU.h index fec118ca78..c8831a047a 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.h @@ -1133,7 +1133,7 @@ private: virtual void CVTTPS2PI_mm1_xmm2m64(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 CVTSS2SI_r32_xmm2m32(X86::Instruction const&) override; virtual void UCOMISS_xmm1_xmm2m32(X86::Instruction const&) override; virtual void COMISS_xmm1_xmm2m32(X86::Instruction const&) override; virtual void MOVMSKPS_reg_xmm(X86::Instruction const&) override; diff --git a/Userland/DevTools/UserspaceEmulator/SoftVPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftVPU.cpp index 02ac73d242..c66876c22e 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftVPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftVPU.cpp @@ -218,7 +218,7 @@ void SoftVPU::CVTTSS2SI_r32_xmm2m32(X86::Instruction const& insn) m_cpu.gpr32(insn.reg32()) = ValueWithShadow::create_initialized((u32)lround(value)); } void SoftVPU::CVTPS2PI_xmm1_mm2m64(X86::Instruction const&) { TODO(); } -void SoftVPU::CVTSS2SI_xmm1_rm32(X86::Instruction const& insn) +void SoftVPU::CVTSS2SI_r32_xmm2m32(X86::Instruction const& insn) { // FIXME: Raise Invalid, Precision insn.modrm().write32(m_cpu, insn, diff --git a/Userland/DevTools/UserspaceEmulator/SoftVPU.h b/Userland/DevTools/UserspaceEmulator/SoftVPU.h index 68bebf8c80..a0dbf18d71 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftVPU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftVPU.h @@ -127,7 +127,7 @@ private: void CVTTPS2PI_mm1_xmm2m64(X86::Instruction const&); void CVTTSS2SI_r32_xmm2m32(X86::Instruction const&); void CVTPS2PI_xmm1_mm2m64(X86::Instruction const&); - void CVTSS2SI_xmm1_rm32(X86::Instruction const&); + void CVTSS2SI_r32_xmm2m32(X86::Instruction const&); void UCOMISS_xmm1_xmm2m32(X86::Instruction const&); void COMISS_xmm1_xmm2m32(X86::Instruction const&); void MOVMSKPS_reg_xmm(X86::Instruction const&); diff --git a/Userland/Libraries/LibX86/Instruction.cpp b/Userland/Libraries/LibX86/Instruction.cpp index 806f7a4f88..eb82da9a74 100644 --- a/Userland/Libraries/LibX86/Instruction.cpp +++ b/Userland/Libraries/LibX86/Instruction.cpp @@ -869,7 +869,7 @@ static void build_sse_f3(u8 op, char const* mnemonic, InstructionFormat format, build_sse_np(0x2C, "CVTTPS2PI", OP_mm1_xmm2m64, &Interpreter::CVTTPS2PI_mm1_xmm2m64); 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_f3(0x2D, "CVTSS2SI", OP_r32_xmm2m32, &Interpreter::CVTSS2SI_r32_xmm2m32); build_sse_np(0x2E, "UCOMISS", OP_xmm1_xmm2m32, &Interpreter::UCOMISS_xmm1_xmm2m32); build_sse_np(0x2F, "COMISS", OP_xmm1_xmm2m32, &Interpreter::COMISS_xmm1_xmm2m32); diff --git a/Userland/Libraries/LibX86/Interpreter.h b/Userland/Libraries/LibX86/Interpreter.h index 98c63aac68..2cb489ecc4 100644 --- a/Userland/Libraries/LibX86/Interpreter.h +++ b/Userland/Libraries/LibX86/Interpreter.h @@ -681,7 +681,7 @@ public: virtual void CVTSI2SS_xmm1_rm32(Instruction const&) = 0; virtual void MOVNTPS_xmm1m128_xmm2(Instruction const&) = 0; virtual void CVTPS2PI_xmm1_mm2m64(Instruction const&) = 0; - virtual void CVTSS2SI_xmm1_rm32(Instruction const&) = 0; + virtual void CVTSS2SI_r32_xmm2m32(Instruction const&) = 0; virtual void UCOMISS_xmm1_xmm2m32(Instruction const&) = 0; virtual void COMISS_xmm1_xmm2m32(Instruction const&) = 0; virtual void MOVMSKPS_reg_xmm(Instruction const&) = 0;