diff --git a/include/instructions.h b/include/instructions.h index 581752e..a6ae8e3 100644 --- a/include/instructions.h +++ b/include/instructions.h @@ -91,6 +91,7 @@ public: void mov_ebp_imm32(); // 0xbd void mov_esi_imm32(); // 0xbe void mov_edi_imm32(); // 0xbf + void leave(); // 0xc9 void call_imm32(); // 0xe8 void jmp_imm8(); // 0xeb void hlt(); // 0xf4 diff --git a/instructions.cpp b/instructions.cpp index cb730e4..3319f03 100644 --- a/instructions.cpp +++ b/instructions.cpp @@ -87,6 +87,7 @@ void Instructions::init_instructions(){ this->instructions[0xbd] = &Instructions::mov_ebp_imm32; this->instructions[0xbe] = &Instructions::mov_esi_imm32; this->instructions[0xbf] = &Instructions::mov_edi_imm32; + this->instructions[0xc9] = &Instructions::leave; this->instructions[0xe8] = &Instructions::call_imm32; this->instructions[0xeb] = &Instructions::jmp_imm8; this->instructions[0xf4] = &Instructions::hlt; @@ -1063,6 +1064,15 @@ void Instructions::mov_edi_imm32(){ this->eip += 4; } +void Instructions::leave(){ + //printf("leave called.\n"); + + // mov esp, ebp + this->registers[4] = this->registers[5]; + // pop ebp + this->pop_ebp(); +} + void Instructions::call_imm32(){ //printf("call_imm32 called.\n");