RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 16:07:35 +00:00
Code Issues Activity Actions

UserspaceEmulator: Tweak INC and SAR helpers to not be SoftCPU members

Browse source 
It's quite nice having these as compartmentalized free functions.
This commit is contained in:
Andreas Kling 2020-07-11 15:47:53 +02:00
parent e852768ba6
commit 7d41b95071
2 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

36
DevTools/UserspaceEmulator/SoftCPU.cpp
View file

@ -439,7 +439,7 @@ void SoftCPU::IMUL_reg32_RM32_imm32(const X86::Instruction&) { TODO(); }
void SoftCPU::IMUL_reg32_RM32_imm8(const X86::Instruction&) { TODO(); } void SoftCPU::IMUL_reg32_RM32_imm8(const X86::Instruction&) { TODO(); }
template<typename T> template<typename T>
T SoftCPU::inc_impl(T data) static T op_inc(SoftCPU& cpu, T data)
{ {
T result = 0; T result = 0;
u32 new_flags = 0; u32 new_flags = 0;
@ -463,33 +463,33 @@ T SoftCPU::inc_impl(T data)
"pop %%ebx" "pop %%ebx"
: "=b"(new_flags)); : "=b"(new_flags));
set_flags_oszap(new_flags); cpu.set_flags_oszap(new_flags);
return result; return result;
} }
void SoftCPU::INC_RM16(const X86::Instruction& insn) void SoftCPU::INC_RM16(const X86::Instruction& insn)
{ {
insn.modrm().write16(*this, insn, inc_impl(insn.modrm().read16(*this, insn))); insn.modrm().write16(*this, insn, op_inc(*this, insn.modrm().read16(*this, insn)));
} }
void SoftCPU::INC_RM32(const X86::Instruction& insn) void SoftCPU::INC_RM32(const X86::Instruction& insn)
{ {
insn.modrm().write32(*this, insn, inc_impl(insn.modrm().read32(*this, insn))); insn.modrm().write32(*this, insn, op_inc(*this, insn.modrm().read32(*this, insn)));
} }
void SoftCPU::INC_RM8(const X86::Instruction& insn) void SoftCPU::INC_RM8(const X86::Instruction& insn)
{ {
insn.modrm().write8(*this, insn, inc_impl(insn.modrm().read8(*this, insn))); insn.modrm().write8(*this, insn, op_inc(*this, insn.modrm().read8(*this, insn)));
} }
void SoftCPU::INC_reg16(const X86::Instruction& insn) void SoftCPU::INC_reg16(const X86::Instruction& insn)
{ {
gpr16(insn.reg16()) = inc_impl(gpr16(insn.reg16())); gpr16(insn.reg16()) = op_inc(*this, gpr16(insn.reg16()));
} }
void SoftCPU::INC_reg32(const X86::Instruction& insn) void SoftCPU::INC_reg32(const X86::Instruction& insn)
{ {
gpr32(insn.reg32()) = inc_impl(gpr32(insn.reg32())); gpr32(insn.reg32()) = op_inc(*this, gpr32(insn.reg32()));
} }
void SoftCPU::INSB(const X86::Instruction&) { TODO(); } void SoftCPU::INSB(const X86::Instruction&) { TODO(); }
@ -762,7 +762,7 @@ void SoftCPU::SAHF(const X86::Instruction&) { TODO(); }
void SoftCPU::SALC(const X86::Instruction&) { TODO(); } void SoftCPU::SALC(const X86::Instruction&) { TODO(); }
template<typename T> template<typename T>
T SoftCPU::sar_impl(T data, u8 steps) static T op_sar(SoftCPU& cpu, T data, u8 steps)
{ {
if (steps == 0) if (steps == 0)
return data; return data;
@ -785,62 +785,62 @@ T SoftCPU::sar_impl(T data, u8 steps)
"pop %%eax" "pop %%eax"
: "=a"(new_flags)); : "=a"(new_flags));
set_flags_oszapc(new_flags); cpu.set_flags_oszapc(new_flags);
return result; return result;
} }
void SoftCPU::SAR_RM16_1(const X86::Instruction& insn) void SoftCPU::SAR_RM16_1(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read16(*this, insn); auto data = insn.modrm().read16(*this, insn);
insn.modrm().write16(*this, insn, sar_impl(data, 1)); insn.modrm().write16(*this, insn, op_sar(*this, data, 1));
} }
void SoftCPU::SAR_RM16_CL(const X86::Instruction& insn) void SoftCPU::SAR_RM16_CL(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read16(*this, insn); auto data = insn.modrm().read16(*this, insn);
insn.modrm().write16(*this, insn, sar_impl(data, cl())); insn.modrm().write16(*this, insn, op_sar(*this, data, cl()));
} }
void SoftCPU::SAR_RM16_imm8(const X86::Instruction& insn) void SoftCPU::SAR_RM16_imm8(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read16(*this, insn); auto data = insn.modrm().read16(*this, insn);
insn.modrm().write16(*this, insn, sar_impl(data, insn.imm8())); insn.modrm().write16(*this, insn, op_sar(*this, data, insn.imm8()));
} }
void SoftCPU::SAR_RM32_1(const X86::Instruction& insn) void SoftCPU::SAR_RM32_1(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read32(*this, insn); auto data = insn.modrm().read32(*this, insn);
insn.modrm().write32(*this, insn, sar_impl(data, 1)); insn.modrm().write32(*this, insn, op_sar(*this, data, 1));
} }
void SoftCPU::SAR_RM32_CL(const X86::Instruction& insn) void SoftCPU::SAR_RM32_CL(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read32(*this, insn); auto data = insn.modrm().read32(*this, insn);
insn.modrm().write32(*this, insn, sar_impl(data, cl())); insn.modrm().write32(*this, insn, op_sar(*this, data, cl()));
} }
void SoftCPU::SAR_RM32_imm8(const X86::Instruction& insn) void SoftCPU::SAR_RM32_imm8(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read32(*this, insn); auto data = insn.modrm().read32(*this, insn);
insn.modrm().write32(*this, insn, sar_impl(data, insn.imm8())); insn.modrm().write32(*this, insn, op_sar(*this, data, insn.imm8()));
} }
void SoftCPU::SAR_RM8_1(const X86::Instruction& insn) void SoftCPU::SAR_RM8_1(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read8(*this, insn); auto data = insn.modrm().read8(*this, insn);
insn.modrm().write8(*this, insn, sar_impl(data, 1)); insn.modrm().write8(*this, insn, op_sar(*this, data, 1));
} }
void SoftCPU::SAR_RM8_CL(const X86::Instruction& insn) void SoftCPU::SAR_RM8_CL(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read8(*this, insn); auto data = insn.modrm().read8(*this, insn);
insn.modrm().write8(*this, insn, sar_impl(data, cl())); insn.modrm().write8(*this, insn, op_sar(*this, data, cl()));
} }
void SoftCPU::SAR_RM8_imm8(const X86::Instruction& insn) void SoftCPU::SAR_RM8_imm8(const X86::Instruction& insn)
{ {
auto data = insn.modrm().read8(*this, insn); auto data = insn.modrm().read8(*this, insn);
insn.modrm().write8(*this, insn, sar_impl(data, insn.imm8())); insn.modrm().write8(*this, insn, op_sar(*this, data, insn.imm8()));
} }
void SoftCPU::SBB_AL_imm8(const X86::Instruction&) { TODO(); } void SoftCPU::SBB_AL_imm8(const X86::Instruction&) { TODO(); }

5
DevTools/UserspaceEmulator/SoftCPU.h
View file

@ -767,11 +767,6 @@ private:
template<bool update_dest, typename Op> template<bool update_dest, typename Op>
void generic_reg8_RM8(Op, const X86::Instruction&); void generic_reg8_RM8(Op, const X86::Instruction&);
template<typename T>
T sar_impl(T data, u8 steps);
template<typename T>
T inc_impl(T);
private: private:
Emulator& m_emulator; Emulator& m_emulator;