From efa07ef088bfdb2bd96ae80df15bde7d8cff8e20 Mon Sep 17 00:00:00 2001 From: tuz358 Date: Tue, 13 Mar 2018 11:02:10 +0900 Subject: [PATCH] Add sbb_r32_rm32(0x1b) instruction --- include/instructions.h | 1 + instructions.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/include/instructions.h b/include/instructions.h index c40799f..05c1e7d 100644 --- a/include/instructions.h +++ b/include/instructions.h @@ -38,6 +38,7 @@ public: void adc_r32_rm32(); // 0x13 void adc_eax_imm32(); // 0x15 void sbb_rm32_r32(); // 0x19 + void sbb_r32_rm32(); // 0x1b void and_rm32_r32(); // 0x21 void and_r32_rm32(); // 0x23 void and_eax_imm32(); // 0x25 diff --git a/instructions.cpp b/instructions.cpp index 83a54e3..7e3a85c 100644 --- a/instructions.cpp +++ b/instructions.cpp @@ -30,6 +30,7 @@ void Instructions::init_instructions(){ this->instructions[0x13] = &Instructions::adc_r32_rm32; this->instructions[0x15] = &Instructions::adc_eax_imm32; this->instructions[0x19] = &Instructions::sbb_rm32_r32; + this->instructions[0x1b] = &Instructions::sbb_r32_rm32; this->instructions[0x21] = &Instructions::and_rm32_r32; this->instructions[0x23] = &Instructions::and_r32_rm32; this->instructions[0x25] = &Instructions::and_eax_imm32; @@ -492,6 +493,56 @@ void Instructions::sbb_rm32_r32(){ } } +void Instructions::sbb_r32_rm32(){ + //printf("sbb_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: + // sbb 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 + get_flag(CF); + break; + case 1: + // sbb 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 + get_flag(CF); + this->eip++; + break; + case 2: + // sbb 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 + get_flag(CF); + this->eip += 4; + break; + default: + // case mod == 3 + // sbb R, M + this->eip++; + this->registers[this->R] -= this->registers[this->M] + get_flag(CF); + break; + } +} + void Instructions::and_rm32_r32(){ //printf("and_rm32_r32 called.\n"); uint32_t addr, dst, imm32;