From 1349c00b782eca3ea841bfa388301cb6fc908cc7 Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sun, 18 Oct 2020 20:39:56 +0200 Subject: Namespace Asm --- asm/intel64/add.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'asm/intel64/add.cpp') diff --git a/asm/intel64/add.cpp b/asm/intel64/add.cpp index 2de2219..106ffec 100644 --- a/asm/intel64/add.cpp +++ b/asm/intel64/add.cpp @@ -7,18 +7,18 @@ using namespace std::string_literals; -Op_add::Op_add(AsmArgs& args) +Op_add::Op_add(Asm::Args& args) { - if (args[0].type() == typeid(AsmArgs::Register32) && - std::any_cast(args[0]).name() == "eax" && - args[1].type() == typeid(AsmArgs::Immediate32)) + if (args[0].type() == typeid(Asm::Args::Register32) && + std::any_cast(args[0]).name() == "eax" && + args[1].type() == typeid(Asm::Args::Immediate32)) { // add eax, imm32 - machine_code = std::vector{ 0x05 } + std::any_cast(args[1]).getCode(); - } else if (args[0].type() == typeid(AsmArgs::Register64) && - std::any_cast(args[0]).name() == "rax" && - args[1].type() == typeid(AsmArgs::Immediate32)) + machine_code = std::vector{ 0x05 } + std::any_cast(args[1]).getCode(); + } else if (args[0].type() == typeid(Asm::Args::Register64) && + std::any_cast(args[0]).name() == "rax" && + args[1].type() == typeid(Asm::Args::Immediate32)) { // add rax, imm32 - machine_code = REX("W") + std::vector{ 0x05 } + std::any_cast(args[1]).getCode(); + machine_code = REX("W") + std::vector{ 0x05 } + std::any_cast(args[1]).getCode(); } else { throw std::runtime_error("Unimplemented: add "s + args[0].type().name() + " "s + args[1].type().name()); } @@ -27,10 +27,10 @@ Op_add::Op_add(AsmArgs& args) namespace { bool registered { - registerOp(mangleName("add"), [](AsmArgs& args) -> std::shared_ptr{ + registerOp(mangleName("add"), [](Asm::Args& args) -> std::shared_ptr{ return std::make_shared(args); }) && - registerOp(mangleName("add"), [](AsmArgs& args) -> std::shared_ptr{ + registerOp(mangleName("add"), [](Asm::Args& args) -> std::shared_ptr{ return std::make_shared(args); }) }; -- cgit v1.2.3