diff options
Diffstat (limited to 'src/arch/x86/isa')
| -rw-r--r-- | src/arch/x86/isa/decoder/two_byte_opcodes.isa | 10 | ||||
| -rw-r--r-- | src/arch/x86/isa/insts/system/segmentation.py | 57 |
2 files changed, 66 insertions, 1 deletions
diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa index ecd575a5d..717a8f26f 100644 --- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa +++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa @@ -118,7 +118,15 @@ default: Inst::LGDT(M); } } - 0x3: lidt_Ms(); + 0x3: decode MODE_SUBMODE { + 0x0: Inst::LIDT(M); + default: decode OPSIZE { + // 16 bit operand sizes are special, but only + // in legacy and compatability modes. + 0x2: Inst::LIDT_16(M); + default: Inst::LIDT(M); + } + } 0x4: smsw_Mw(); 0x6: lmsw_Mw(); 0x7: invlpg_M(); diff --git a/src/arch/x86/isa/insts/system/segmentation.py b/src/arch/x86/isa/insts/system/segmentation.py index 6067f64a0..e46941e53 100644 --- a/src/arch/x86/isa/insts/system/segmentation.py +++ b/src/arch/x86/isa/insts/system/segmentation.py @@ -110,4 +110,61 @@ def macroop LGDT_16_P wrbase gdtr, t2 wrlimit gdtr, t1 }; + +def macroop LIDT_M +{ + .adjust_env oszForPseudoDesc + + # Get the limit + ld t1, seg, sib, disp, dataSize=2 + # Get the base + ld t2, seg, sib, 'adjustedDisp + 2' + wrbase idtr, t2 + wrlimit idtr, t1 +}; + +def macroop LIDT_P +{ + .adjust_env oszForPseudoDesc + + rdip t7 + # Get the limit + ld t1, seg, riprel, disp, dataSize=2 + # Get the base + ld t2, seg, riprel, 'adjustedDisp + 2' + wrbase idtr, t2 + wrlimit idtr, t1 +}; + +# +# These versions are for when the original data size was 16 bits. The base is +# still 32 bits, but the top byte is zeroed before being used. +# + +def macroop LIDT_16_M +{ + .adjust_env oszForPseudoDesc + + # Get the limit + ld t1, seg, sib, disp, dataSize=2 + # Get the base + ld t2, seg, sib, 'adjustedDisp + 2', dataSize=4 + zexti t2, t2, 23 + wrbase idtr, t2 + wrlimit idtr, t1 +}; + +def macroop LIDT_16_P +{ + .adjust_env oszForPseudoDesc + + rdip t7 + # Get the limit + ld t1, seg, riprel, disp, dataSize=2 + # Get the base + ld t2, seg, riprel, 'adjustedDisp + 2', dataSize=4 + zexti t2, t2, 23 + wrbase idtr, t2 + wrlimit idtr, t1 +}; ''' |