1 files changed, 13 insertions, 2 deletions
diff --git a/asm/intel64/xor.cpp b/asm/intel64/xor.cpp
index aba6fb5..1628558 100644
--- a/asm/intel64/xor.cpp
+++ b/asm/intel64/xor.cpp
@@ -12,9 +12,14 @@ using namespace std::string_literals;
 Op_xor::Op_xor(const Asm::Args& args)
 {
  if (args[0].type() == typeid(Asm::Args::Register8) && args[1].type() == typeid(Asm::Args::Register8)) { // xor reg8, reg8
-  // r8, r/m8: ModRM:reg (w), ModRM:r/m (r)
-  machine_code = std::vector<uint8_t>{ 0x32 } +
+  machine_code = std::vector<uint8_t>{ 0x30 } +
    ModRM(std::any_cast<Asm::Args::Register8>(args[0]).name(), std::any_cast<Asm::Args::Register8>(args[1]).name());
+ } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Register32)) { // xor reg32, reg32
+  machine_code = std::vector<uint8_t>{ 0x31 } +
+   ModRM(std::any_cast<Asm::Args::Register32>(args[0]).name(), std::any_cast<Asm::Args::Register32>(args[1]).name());
+ } else if (args[0].type() == typeid(Asm::Args::Register64) && args[1].type() == typeid(Asm::Args::Register64)) { // xor reg64, reg64
+  machine_code = REX("W") + std::vector<uint8_t>{ 0x31 } +
+   ModRM(std::any_cast<Asm::Args::Register64>(args[0]).name(), std::any_cast<Asm::Args::Register64>(args[1]).name());
  } else {
   throw std::runtime_error("Unimplemented: xor "s + args[0].type().name() + " "s + args[1].type().name());
  }
@@ -25,6 +30,12 @@ namespace {
 bool registered {
  registerOp(mangleName<Asm::Args::Register8, Asm::Args::Register8>("xor"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
                return std::make_shared<Op_xor>(args);
+            }) &&
+ registerOp(mangleName<Asm::Args::Register32, Asm::Args::Register32>("xor"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
+               return std::make_shared<Op_xor>(args);
+            }) &&
+ registerOp(mangleName<Asm::Args::Register64, Asm::Args::Register64>("xor"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
+               return std::make_shared<Op_xor>(args);
             })
 };