From 300219dc8519720a36525c7b40c6a327580fe0bd Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sun, 15 Nov 2020 22:05:14 +0100 Subject: Evaluation (WIP) --- asm/assembler.h | 16 ++++++++++++++++ asm/intel64/encode.cpp | 22 +++++++++++++++++----- asm/intel64/mov.cpp | 24 ++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) (limited to 'asm') diff --git a/asm/assembler.h b/asm/assembler.h index bd291b8..e719ea4 100644 --- a/asm/assembler.h +++ b/asm/assembler.h @@ -111,6 +111,22 @@ public: int32_t m_offs; }; + // 64 bit Ptr to 64 bit Memory + class Mem64Ptr64 + { + public: + Mem64Ptr64(const std::string& reg, int32_t offs = 0): m_reg(reg), m_offs(offs) {} + Mem64Ptr64(const std::string& reg, const std::string& reg2 = ""s, int32_t offs = 0): m_reg(reg), m_reg2(reg2), m_offs(offs) {} + std::string reg() { return m_reg; } + std::string reg2() { return m_reg2; } + int32_t offs() { return m_offs; } + + private: + std::string m_reg; + std::string m_reg2; + int32_t m_offs; + }; + class Label { public: diff --git a/asm/intel64/encode.cpp b/asm/intel64/encode.cpp index 03a7897..681e407 100644 --- a/asm/intel64/encode.cpp +++ b/asm/intel64/encode.cpp @@ -47,7 +47,19 @@ void Asm::toMachineCode(const FlowGraph::Graph& graph, Segment& segment) FlowGraph::BinaryOperation& op {dynamic_cast(*node)}; auto operands {op.operands()}; - // TODO: ignore destination (0) for now + +#if 0 + if (op.type() == FlowGraph::BinaryOperationType::Add) { + segment.push_back(loadmakeOp("add", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate32(immediate2)}})); + } else if (op.type() == FlowGraph::BinaryOperationType::Multiply) { + segment.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("ebx"), Asm::Args::Immediate32(immediate2)}})); + segment.push_back(makeOp("mul", Asm::Args{{Asm::Args::Register32("ebx")}})); + } else + throw std::runtime_error("ICE: Asm: Unsupported binary operation type: "s + std::to_string(static_cast(op.type()))); +#endif + + + if (operands[1].type() != FlowGraph::DataType::Int) { std::runtime_error("Bad type for operand 1: "s + std::to_string(int(operands[1].type()))); @@ -83,11 +95,11 @@ void Asm::toMachineCode(const FlowGraph::Graph& graph, Segment& segment) } catch (const std::bad_cast& ex) { std::runtime_error("Bad value for operand 2: Constant expected"); } - - segment.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("edi"), Asm::Args::Immediate32(immediate1)}})); + segment.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate32(immediate1)}})); + if (op.type() == FlowGraph::BinaryOperationType::Add) { - segment.push_back(makeOp("add", Asm::Args{{Asm::Args::Register32("edi"), Asm::Args::Immediate32(immediate2)}})); + segment.push_back(makeOp("add", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate32(immediate2)}})); } else if (op.type() == FlowGraph::BinaryOperationType::Multiply) { segment.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("ebx"), Asm::Args::Immediate32(immediate2)}})); segment.push_back(makeOp("mul", Asm::Args{{Asm::Args::Register32("ebx")}})); @@ -103,7 +115,7 @@ void Asm::toMachineCode(const FlowGraph::Graph& graph, Segment& segment) //FlowGraph::DestroyScopeOp& op {dynamic_cast(*node)}; segment.push_back(makeOp("pop", Asm::Args{{Asm::Args::Register64("rbp")}})); - // Move + // Move eax for exit() via rdi segment.push_back(makeOp("xor", Asm::Args{{Asm::Args::Register64("rdi"), Asm::Args::Register64("rdi")}})); segment.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("edi"), Asm::Args::Register32("eax")}})); } else if (typeid(node_deref) == typeid(FlowGraph::DataNode)) { diff --git a/asm/intel64/mov.cpp b/asm/intel64/mov.cpp index 6426238..e36b40d 100644 --- a/asm/intel64/mov.cpp +++ b/asm/intel64/mov.cpp @@ -32,6 +32,18 @@ Op_mov::Op_mov(const Asm::Args& args) } else if (args[0].type() == typeid(Asm::Args::Register64) && args[1].type() == typeid(Asm::Args::Immediate64)) { // mov reg64, imm64 machine_code = std::vector{ REX("W") + static_cast(0xB8 + RegNo(std::any_cast(args[0]).name())) } + std::any_cast(args[1]).getCode(); + } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Mem32Ptr64)) { // mov reg32, [reg64] + machine_code = std::vector{ 0x8B } + 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)) { // mov reg64, [reg64] + machine_code = REX("W") + std::vector{ 0x8B } + ModRM(std::any_cast(args[0]).name(), std::any_cast(args[1]).reg()); + + } else if (args[0].type() == typeid(Asm::Args::Mem32Ptr64) && args[1].type() == typeid(Asm::Args::Register32)) { // mov [reg64], reg32 + machine_code = std::vector{ 0x89 } + ModRM(std::any_cast(args[1]).name(), std::any_cast(args[0]).reg()); + + } else if (args[0].type() == typeid(Asm::Args::Mem64Ptr64) && args[1].type() == typeid(Asm::Args::Register64)) { // mov [reg64], reg64 + machine_code = REX("W") + std::vector{ 0x89 } + ModRM(std::any_cast(args[1]).name(), std::any_cast(args[0]).reg()); + } else { throw std::runtime_error("Unimplemented: mov "s + args[0].type().name() + " "s + args[1].type().name()); } @@ -54,6 +66,18 @@ bool registered { }) && registerOp(mangleName("mov"), [](const Asm::Args& args) -> std::shared_ptr{ return std::make_shared(args); + }) && + registerOp(mangleName("mov"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("mov"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("mov"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); + }) && + registerOp(mangleName("mov"), [](const Asm::Args& args) -> std::shared_ptr{ + return std::make_shared(args); }) }; -- cgit v1.2.3