From 39bccce4fdd1d5ebe312321c963e0325e4d696c5 Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sat, 21 Nov 2020 21:38:56 +0100 Subject: Bugfixing of stack (WIP) --- asm/intel64/bsf.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'asm/intel64/bsf.cpp') diff --git a/asm/intel64/bsf.cpp b/asm/intel64/bsf.cpp index 974be43..24a0ae0 100644 --- a/asm/intel64/bsf.cpp +++ b/asm/intel64/bsf.cpp @@ -16,10 +16,12 @@ Op_bsf::Op_bsf(const Asm::Args& args) machine_code = REX("W") + std::vector{ 0x0F, 0xBC } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).name()); } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Mem32Ptr64)) { // bsf reg32, [reg64] - machine_code = std::vector{ 0x0F, 0xBC } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).reg()); + Asm::Args::Mem32Ptr64 ptr{std::any_cast(args[1])}; + machine_code = std::vector{ 0x0F, 0xBC } + ModRM(std::any_cast(args[0]).name(), ptr.reg(), ptr.offs()); } else if (args[0].type() == typeid(Asm::Args::Register64) && args[1].type() == typeid(Asm::Args::Mem64Ptr64)) { // bsf reg64, [reg64] - machine_code = REX("W") + std::vector{ 0x0F, 0xBC } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).reg()); + Asm::Args::Mem64Ptr64 ptr{std::any_cast(args[1])}; + machine_code = REX("W") + std::vector{ 0x0F, 0xBC } + ModRM(std::any_cast(args[0]).name(), ptr.reg(), ptr.offs()); } else { throw std::runtime_error("Unimplemented: bsf "s + args[0].type().name() + " "s + args[1].type().name()); -- cgit v1.2.3