From 7250bbe5ae2d2ee6b0334bc462aab73f7d8dac0e Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Fri, 20 Nov 2020 10:59:18 +0100 Subject: Assembler bugfixes - tests run successfully now --- asm/intel64/add.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ asm/intel64/encode.cpp | 8 ++++---- 2 files changed, 47 insertions(+), 4 deletions(-) (limited to 'asm/intel64') diff --git a/asm/intel64/add.cpp b/asm/intel64/add.cpp index 957c27f..07b14a1 100644 --- a/asm/intel64/add.cpp +++ b/asm/intel64/add.cpp @@ -28,12 +28,34 @@ Op_add::Op_add(const Asm::Args& args) { // add rax, imm32 machine_code = REX("W") + std::vector{ 0x05 } + std::any_cast(args[1]).getCode(); + } else if (args[0].type() == typeid(Asm::Args::Register8) && args[1].type() == typeid(Asm::Args::Register8)) { // add reg8, reg8 + machine_code = std::vector{ 0x00 } + ModRM(std::any_cast(args[1]).name(), std::any_cast(args[0]).name()); + + } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Register32)) { // add reg32, reg32 + machine_code = std::vector{ 0x01 } + ModRM(std::any_cast(args[1]).name(), std::any_cast(args[0]).name()); + + } else if (args[0].type() == typeid(Asm::Args::Register64) && args[1].type() == typeid(Asm::Args::Register64)) { // add reg64, reg64 + machine_code = REX("W") + std::vector{ 0x01 } + ModRM(std::any_cast(args[1]).name(), std::any_cast(args[0]).name()); + } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Mem32Ptr64)) { // add reg32, [reg64] machine_code = std::vector{ 0x03 } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).reg()); } else if (args[0].type() == typeid(Asm::Args::Register64) && args[1].type() == typeid(Asm::Args::Mem64Ptr64)) { // add reg64, [reg64] machine_code = REX("W") + std::vector{ 0x03 } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).reg()); + } else if (args[0].type() == typeid(Asm::Args::Mem8Ptr64) && args[1].type() == typeid(Asm::Args::Immediate8)) { // add [reg64], imm8 + machine_code = std::vector{ 0x80 } + ModRM("/0", std::any_cast(args[0]).reg()) + std::any_cast(args[1]).getCode(); + + } else if (args[0].type() == typeid(Asm::Args::Mem32Ptr64) && args[1].type() == typeid(Asm::Args::Immediate32)) { // add [reg64], imm32 + machine_code = std::vector{ 0x81 } + ModRM("/0", std::any_cast(args[0]).reg()) + std::any_cast(args[1]).getCode(); + + } else if (args[0].type() == typeid(Asm::Args::Mem64Ptr64) && args[1].type() == typeid(Asm::Args::Immediate32)) { // add qword ptr [reg64], imm32 (sign-extended) + machine_code = REX("W") + std::vector{ 0x81 } + ModRM("/0", std::any_cast(args[0]).reg()) + std::any_cast(args[1]).getCode(); + + } else if (args[0].type() == typeid(Asm::Args::Mem64Ptr64) && args[1].type() == typeid(Asm::Args::Immediate64)) { // add qword ptr [reg64], imm32 (sign-extended) - reduce imm64 to imm32! + Asm::Args::Immediate32 imm32{std::any_cast(args[1])}; + machine_code = REX("W") + std::vector{ 0x81 } + ModRM("/0", std::any_cast(args[0]).reg()) + imm32.getCode(); + } else { throw std::runtime_error("Unimplemented: add "s + args[0].type().name() + " "s + args[1].type().name()); } @@ -48,10 +70,31 @@ bool registered { registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ return std::make_shared(args); }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ return std::make_shared(args); }) && registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("add"), [](const Asm::Args& args) -> std::shared_ptr{ // automatically converted to 32-bit (sign extended) if small enough. Intel doesn't support ADD ..., imm64 return std::make_shared(args); }) }; diff --git a/asm/intel64/encode.cpp b/asm/intel64/encode.cpp index 51ca7a0..1b35d89 100644 --- a/asm/intel64/encode.cpp +++ b/asm/intel64/encode.cpp @@ -14,7 +14,7 @@ namespace { std::shared_ptr makeLoadValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph) { if (data.type() != FlowGraph::DataType::Int) { - std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); + throw std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); } if (!data.storage()) @@ -41,7 +41,7 @@ std::shared_ptr makeLoadValue(const FlowGraph::Data& data, const FlowGraph:: std::shared_ptr makeStoreValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph) { if (data.type() != FlowGraph::DataType::Int) { - std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); + throw std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); } if (!data.storage()) @@ -60,7 +60,7 @@ std::shared_ptr makeStoreValue(const FlowGraph::Data& data, const FlowGraph: std::shared_ptr makeAddValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph) { if (data.type() != FlowGraph::DataType::Int) { - std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); + throw std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); } if (!data.storage()) @@ -87,7 +87,7 @@ std::shared_ptr makeAddValue(const FlowGraph::Data& data, const FlowGraph::G std::vector> makeMulValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph) { if (data.type() != FlowGraph::DataType::Int) { - std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); + throw std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type()))); } if (!data.storage()) -- cgit v1.2.3