diff --git a/include/instructions.h b/include/instructions.h index f29a504..ce01a1d 100644 --- a/include/instructions.h +++ b/include/instructions.h @@ -35,6 +35,7 @@ public: void or_r32_rm32(); // 0x0b void or_eax_imm32(); // 0x0d void adc_rm32_r32(); // 0x11 + void adc_r32_rm32(); // 0x13 void and_rm32_r32(); // 0x21 void and_r32_rm32(); // 0x23 void and_eax_imm32(); // 0x25 diff --git a/instructions.cpp b/instructions.cpp index 5cf51d9..2f13fb7 100644 --- a/instructions.cpp +++ b/instructions.cpp @@ -27,6 +27,7 @@ void Instructions::init_instructions(){ this->instructions[0x0b] = &Instructions::or_r32_rm32; this->instructions[0x0d] = &Instructions::or_eax_imm32; this->instructions[0x11] = &Instructions::adc_rm32_r32; + this->instructions[0x13] = &Instructions::adc_r32_rm32; this->instructions[0x21] = &Instructions::and_rm32_r32; this->instructions[0x23] = &Instructions::and_r32_rm32; this->instructions[0x25] = &Instructions::and_eax_imm32; @@ -382,6 +383,56 @@ void Instructions::adc_rm32_r32(){ } } +void Instructions::adc_r32_rm32(){ + //printf("adc_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: + // adc 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 + CF; + break; + case 1: + // adc 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 + CF; + this->eip++; + break; + case 2: + // adc 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 + CF; + this->eip += 4; + break; + default: + // case mod == 3 + // adc R, M + this->eip++; + this->registers[this->R] += this->registers[this->M] + CF; + break; + } +} + void Instructions::and_rm32_r32(){ //printf("and_rm32_r32 called.\n"); uint32_t addr, dst, imm32;