From d1db40a6e12d98d8c1efa06a5fcd02f35b3993f2 Mon Sep 17 00:00:00 2001
From: tuz358 <orca00358@gmail.com>
Date: Fri, 16 Mar 2018 14:58:24 +0900
Subject: [PATCH] Minor fixes

---
 include/instructions.h |  2 +-
 instructions.cpp       | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/instructions.h b/include/instructions.h
index 7b80612..65c3508 100644
--- a/include/instructions.h
+++ b/include/instructions.h
@@ -47,7 +47,7 @@ public:
   void template_rm32_r32(int calc_type);
   void calc_rm32_r32_case0to2(uint32_t addr, uint32_t dst, int calc_type);
   void template_r32_rm32(int calc_type);
-  void calc_r32_rm32(uint32_t *src, uint32_t *dst, int calc_type);
+  void calc_r32_rm32(uint32_t *dst, uint32_t *src, int calc_type);
   void template_eax_imm32(int calc_type);
 
   void add_rm32_r32();  // 0x01
diff --git a/instructions.cpp b/instructions.cpp
index e44e18e..b3ad5a9 100644
--- a/instructions.cpp
+++ b/instructions.cpp
@@ -199,7 +199,7 @@ void Instructions::calc_rm32_r32_case0to2(uint32_t addr, uint32_t dst, int calc_
 }
 
 void Instructions::template_r32_rm32(int calc_type){
-  uint32_t addr, dst, imm32;
+  uint32_t addr, src, imm32;
   uint8_t imm8;
 
   this->modrm = memory.read_uint8(this->eip);
@@ -211,9 +211,9 @@ void Instructions::template_r32_rm32(int calc_type){
       // addr : M
       this->eip++;
       addr = this->registers[this->M];
-      // dst : data of [M]
-      dst = memory.read_uint32(addr);
-      calc_r32_rm32(&this->registers[this->R], &dst, calc_type);
+      // src : data of [M]
+      src = memory.read_uint32(addr);
+      calc_r32_rm32(&this->registers[this->R], &src, calc_type);
       break;
     case 1:
       // operation R, [M+imm8]
@@ -221,9 +221,9 @@ void Instructions::template_r32_rm32(int calc_type){
       imm8 = memory.read_uint8(this->eip);
       // addr : M
       addr = this->registers[this->M];
-      // dst : data of [M+imm8]
-      dst = memory.read_uint32(addr + imm8);
-      calc_r32_rm32(&this->registers[this->R], &dst, calc_type);
+      // src : data of [M+imm8]
+      src = memory.read_uint32(addr + imm8);
+      calc_r32_rm32(&this->registers[this->R], &src, calc_type);
       this->eip++;
       break;
     case 2:
@@ -233,9 +233,9 @@ void Instructions::template_r32_rm32(int calc_type){
       imm32 = swap_endian32(imm32);
       // addr : M
       addr = this->registers[this->M];
-      // dst : data of [M+imm32]
-      dst = memory.read_uint32(addr + imm32);
-      calc_r32_rm32(&this->registers[this->R], &dst, calc_type);
+      // src : data of [M+imm32]
+      src = memory.read_uint32(addr + imm32);
+      calc_r32_rm32(&this->registers[this->R], &src, calc_type);
       this->eip += 4;
       break;
     default:
@@ -247,22 +247,22 @@ void Instructions::template_r32_rm32(int calc_type){
   }
 }
 
-void Instructions::calc_r32_rm32(uint32_t *src, uint32_t *dst, int calc_type){
+void Instructions::calc_r32_rm32(uint32_t *dst, uint32_t *src, int calc_type){
   switch (calc_type) {
     case ADD:
-      *src += *dst; break;
+      *dst += *src; break;
     case OR:
-      *src |= *dst; break;
+      *dst |= *src; break;
     case ADC:
-      *src += *dst + get_flag(CF); break;
+      *dst += *src + get_flag(CF); break;
     case SBB:
-      *src -= *dst + get_flag(CF); break;
+      *dst -= *src + get_flag(CF); break;
     case AND:
-      *src &= *dst; break;
+      *dst &= *src; break;
     case SUB:
-      *src -= *dst; break;
+      *dst -= *src; break;
     case XOR:
-      *src ^= *dst; break;
+      *dst ^= *src; break;
     case CMP:
       // TODO: implement
       break;