Mirrors/cpu-emulator
1
0
Fork 0
mirror of https://github.com/tuz358/cpu-emulator.git synced 2025-12-18 21:14:35 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add and_r32_rm32(0x23) instruction

Browse Source
This commit is contained in:
tuz358
2018-03-06 11:05:48 +09:00
parent a19884aeee
commit 6df7285495
2 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/instructions.h
View File

@@ -33,6 +33,7 @@ public:
void or_rm32_r32(); // 0x09 void or_rm32_r32(); // 0x09
void or_r32_rm32(); // 0x0b void or_r32_rm32(); // 0x0b
void and_rm32_r32(); // 0x21 void and_rm32_r32(); // 0x21
void and_r32_rm32(); // 0x23
void xor_rm32_r32(); // 0x31 void xor_rm32_r32(); // 0x31
void inc_eax(); // 0x40 void inc_eax(); // 0x40
void inc_ecx(); // 0x41 void inc_ecx(); // 0x41

61
instructions.cpp
View File

@@ -26,6 +26,7 @@ void Instructions::init_instructions(){
this->instructions[0x09] = &Instructions::or_rm32_r32; this->instructions[0x09] = &Instructions::or_rm32_r32;
this->instructions[0x0b] = &Instructions::or_r32_rm32; this->instructions[0x0b] = &Instructions::or_r32_rm32;
this->instructions[0x21] = &Instructions::and_rm32_r32; this->instructions[0x21] = &Instructions::and_rm32_r32;
this->instructions[0x23] = &Instructions::and_r32_rm32;
this->instructions[0x31] = &Instructions::xor_rm32_r32; this->instructions[0x31] = &Instructions::xor_rm32_r32;
this->instructions[0x40] = &Instructions::inc_eax; this->instructions[0x40] = &Instructions::inc_eax;
this->instructions[0x41] = &Instructions::inc_ecx; this->instructions[0x41] = &Instructions::inc_ecx;
@@ -136,7 +137,7 @@ void Instructions::add_rm32_r32(){
// addr : M // addr : M
addr = this->registers[this->M]; addr = this->registers[this->M];
// dst : data of [M+imm32] // dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32); // error dst = memory.read_uint32(addr + imm32);
memory.write_uint32(addr, dst + this->registers[this->R]); memory.write_uint32(addr, dst + this->registers[this->R]);
this->eip += 4; this->eip += 4;
break; break;
@@ -186,7 +187,7 @@ void Instructions::add_r32_rm32(){
// addr : M // addr : M
addr = this->registers[this->M]; addr = this->registers[this->M];
// dst : data of [M+imm32] // dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32); // error dst = memory.read_uint32(addr + imm32);
this->registers[this->R] += dst; this->registers[this->R] += dst;
this->eip += 4; this->eip += 4;
break; break;
@@ -243,7 +244,7 @@ void Instructions::or_rm32_r32(){
// addr : M // addr : M
addr = this->registers[this->M]; addr = this->registers[this->M];
// dst : data of [M+imm32] // dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32); // error dst = memory.read_uint32(addr + imm32);
memory.write_uint32(addr, dst | this->registers[this->R]); memory.write_uint32(addr, dst | this->registers[this->R]);
this->eip += 4; this->eip += 4;
break; break;
@@ -293,7 +294,7 @@ void Instructions::or_r32_rm32(){
// addr : M // addr : M
addr = this->registers[this->M]; addr = this->registers[this->M];
// dst : data of [M+imm32] // dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32); // error dst = memory.read_uint32(addr + imm32);
this->registers[this->R] |= dst; this->registers[this->R] |= dst;
this->eip += 4; this->eip += 4;
break; break;
@@ -343,7 +344,7 @@ void Instructions::and_rm32_r32(){
// addr : M // addr : M
addr = this->registers[this->M]; addr = this->registers[this->M];
// dst : data of [M+imm32] // dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32); // error dst = memory.read_uint32(addr + imm32);
memory.write_uint32(addr, dst & this->registers[this->R]); memory.write_uint32(addr, dst & this->registers[this->R]);
this->eip += 4; this->eip += 4;
break; break;
@@ -356,6 +357,56 @@ void Instructions::and_rm32_r32(){
} }
} }
void Instructions::and_r32_rm32(){
//printf("and_r32_rm32 called.\n");
uint32_t addr, dst, imm32;
uint8_t imm8;
this->modrm = memory.read_uint8(this->eip);
this->calc_modrm();
switch (this->mod) {
case 0:
// and R, [M]
// addr : M
this->eip++;
addr = this->registers[this->M];
// dst : data of [M]
dst = memory.read_uint32(addr);
this->registers[this->R] &= dst;
break;
case 1:
// and R, [M+imm8]
this->eip++;
imm8 = memory.read_uint8(this->eip);
// addr : M
addr = this->registers[this->M];
// dst : data of [M+imm8]
dst = memory.read_uint32(addr + imm8);
this->registers[this->R] &= dst;
this->eip++;
break;
case 2:
// and R, [M+imm32]
this->eip++;
imm32 = memory.read_uint32(this->eip);
imm32 = swap_endian32(imm32);
// addr : M
addr = this->registers[this->M];
// dst : data of [M+imm32]
dst = memory.read_uint32(addr + imm32);
this->registers[this->R] &= dst;
this->eip += 4;
break;
default:
// case mod == 3
// and R, M
this->eip++;
this->registers[this->R] &= this->registers[this->M];
break;
}
}
void Instructions::xor_rm32_r32(){ void Instructions::xor_rm32_r32(){
//printf("xor_rm32_r32 called.\n"); //printf("xor_rm32_r32 called.\n");
uint32_t addr, dst, imm32; uint32_t addr, dst, imm32;