From d4f205ea2ff2800b253d4681afaa6af330bfa33b Mon Sep 17 00:00:00 2001 From: Christian Menard Date: Tue, 26 Nov 2013 17:51:07 +0100 Subject: [PATCH] x86: Implementation of Int3 and Int_Ib in long mode This is an implementation of the x86 int3 and int immediate instructions for long mode according to 'AMD64 Programmers Manual Volume 3'. --- src/arch/x86/isa/decoder/one_byte_opcodes.isa | 6 ++-- .../interrupts_and_exceptions.py | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/isa/decoder/one_byte_opcodes.isa b/src/arch/x86/isa/decoder/one_byte_opcodes.isa index a6173831c..92e5cd0a8 100644 --- a/src/arch/x86/isa/decoder/one_byte_opcodes.isa +++ b/src/arch/x86/isa/decoder/one_byte_opcodes.isa @@ -393,8 +393,8 @@ 0x3, 0x4: ret_far_real(); default: Inst::RET_FAR(); } - 0x4: int3(); - 0x5: decode FullSystemInt default int_Ib() { + 0x4: Inst::INT3(); + 0x5: decode FullSystemInt default inst_ib() { 0: decode IMMEDIATE { // Really only the LSB matters, but the decoder // will sign extend it, and there's no easy way to @@ -403,6 +403,8 @@ SyscallInst::int80('xc->syscall(Rax)', IsSyscall, IsNonSpeculative, IsSerializeAfter); } + + default: Inst::INT(Ib); } 0x6: decode MODE_SUBMODE { 0x0: Inst::UD2(); diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py index 19a344008..d50e40e61 100644 --- a/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py +++ b/src/arch/x86/isa/insts/general_purpose/control_transfer/interrupts_and_exceptions.py @@ -221,6 +221,34 @@ skipSegmentSquashing: def macroop IRET_VIRT { panic "Virtual mode iret isn't implemented!" }; + +def macroop INT3 { + + limm t1, 0x03, dataSize=8 + + rdip t7 + + # Are we in long mode? + rdm5reg t5 + andi t0, t5, 0x1, flags=(EZF,) + br rom_label("longModeSoftInterrupt"), flags=(CEZF,) + br rom_label("legacyModeInterrupt") +}; + +def macroop INT_I { + + #load the byte-sized interrupt vector specified in the instruction + .adjust_imm trimImm(8) + limm t1, imm, dataSize=8 + + rdip t7 + + # Are we in long mode? + rdm5reg t5 + andi t0, t5, 0x1, flags=(EZF,) + br rom_label("longModeSoftInterrupt"), flags=(CEZF,) + br rom_label("legacyModeInterrupt") +}; ''' #let {{ # class INT(Inst): -- 2.30.2