RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00
Code Issues Projects Releases Wiki Activity

[x86] Disambiguate [LS][IG]DT{32,64}m and add 16-bit versions, fix aliases

Browse Source 
llvm-svn: 198755
This commit is contained in:
David Woodhouse 2014-01-08 12:57:55 +00:00
parent 38e7bff9f3
commit 7d0744dadf
5 changed files with 92 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Target/X86/X86InstrInfo.td
View File

@ -2204,14 +2204,18 @@ def : MnemonicAlias<"iret", "iretl", "att">;
def : MnemonicAlias<"sysret", "sysretl", "att">; def : MnemonicAlias<"sysret", "sysretl", "att">;
def : MnemonicAlias<"sysexit", "sysexitl", "att">; def : MnemonicAlias<"sysexit", "sysexitl", "att">;
def : MnemonicAlias<"lgdtl", "lgdt", "att">, Requires<[Not64BitMode]>; def : MnemonicAlias<"lgdt", "lgdtw", "att">, Requires<[In16BitMode]>;
def : MnemonicAlias<"lgdtq", "lgdt", "att">, Requires<[In64BitMode]>; def : MnemonicAlias<"lgdt", "lgdtl", "att">, Requires<[In32BitMode]>;
def : MnemonicAlias<"lidtl", "lidt", "att">, Requires<[Not64BitMode]>; def : MnemonicAlias<"lgdt", "lgdtq", "att">, Requires<[In64BitMode]>;
def : MnemonicAlias<"lidtq", "lidt", "att">, Requires<[In64BitMode]>; def : MnemonicAlias<"lidt", "lidtw", "att">, Requires<[In16BitMode]>;
def : MnemonicAlias<"sgdtl", "sgdt", "att">, Requires<[Not64BitMode]>; def : MnemonicAlias<"lidt", "lidtl", "att">, Requires<[In32BitMode]>;
def : MnemonicAlias<"sgdtq", "sgdt", "att">, Requires<[In64BitMode]>; def : MnemonicAlias<"lidt", "lidtq", "att">, Requires<[In64BitMode]>;
def : MnemonicAlias<"sidtl", "sidt", "att">, Requires<[Not64BitMode]>; def : MnemonicAlias<"sgdt", "sgdtw", "att">, Requires<[In16BitMode]>;
def : MnemonicAlias<"sidtq", "sidt", "att">, Requires<[In64BitMode]>; def : MnemonicAlias<"sgdt", "sgdtl", "att">, Requires<[In32BitMode]>;
def : MnemonicAlias<"sgdt", "sgdtq", "att">, Requires<[In64BitMode]>;
def : MnemonicAlias<"sidt", "sidtw", "att">, Requires<[In16BitMode]>;
def : MnemonicAlias<"sidt", "sidtl", "att">, Requires<[In32BitMode]>;
def : MnemonicAlias<"sidt", "sidtq", "att">, Requires<[In64BitMode]>;
// Floating point stack aliases. // Floating point stack aliases.

24
lib/Target/X86/X86InstrSystem.td
View File

@ -387,12 +387,16 @@ def VERWm : I<0x00, MRM5m, (outs), (ins i16mem:$seg),
let SchedRW = [WriteSystem] in { let SchedRW = [WriteSystem] in {
def SGDT16m : I<0x01, MRM0m, (outs opaque48mem:$dst), (ins), def SGDT16m : I<0x01, MRM0m, (outs opaque48mem:$dst), (ins),
"sgdt{w}\t$dst", [], IIC_SGDT>, TB, OpSize, Requires<[Not64BitMode]>; "sgdt{w}\t$dst", [], IIC_SGDT>, TB, OpSize, Requires<[Not64BitMode]>;
def SGDTm : I<0x01, MRM0m, (outs opaque48mem:$dst), (ins), def SGDT32m : I<0x01, MRM0m, (outs opaque48mem:$dst), (ins),
"sgdt\t$dst", [], IIC_SGDT>, OpSize16, TB; "sgdt{l}\t$dst", [], IIC_SGDT>, OpSize16, TB, Requires <[Not64BitMode]>;
def SGDT64m : I<0x01, MRM0m, (outs opaque80mem:$dst), (ins),
"sgdt{q}\t$dst", [], IIC_SGDT>, TB, Requires <[In64BitMode]>;
def SIDT16m : I<0x01, MRM1m, (outs opaque48mem:$dst), (ins), def SIDT16m : I<0x01, MRM1m, (outs opaque48mem:$dst), (ins),
"sidt{w}\t$dst", [], IIC_SIDT>, TB, OpSize, Requires<[Not64BitMode]>; "sidt{w}\t$dst", [], IIC_SIDT>, TB, OpSize, Requires<[Not64BitMode]>;
def SIDTm : I<0x01, MRM1m, (outs opaque48mem:$dst), (ins), def SIDT32m : I<0x01, MRM1m, (outs opaque48mem:$dst), (ins),
"sidt\t$dst", []>, OpSize16, TB; "sidt{l}\t$dst", []>, OpSize16, TB, Requires <[Not64BitMode]>;
def SIDT64m : I<0x01, MRM1m, (outs opaque80mem:$dst), (ins),
"sidt{q}\t$dst", []>, TB, Requires <[In64BitMode]>;
def SLDT16r : I<0x00, MRM0r, (outs GR16:$dst), (ins), def SLDT16r : I<0x00, MRM0r, (outs GR16:$dst), (ins),
"sldt{w}\t$dst", [], IIC_SLDT>, TB, OpSize; "sldt{w}\t$dst", [], IIC_SLDT>, TB, OpSize;
def SLDT16m : I<0x00, MRM0m, (outs i16mem:$dst), (ins), def SLDT16m : I<0x00, MRM0m, (outs i16mem:$dst), (ins),
@ -409,12 +413,16 @@ def SLDT64m : RI<0x00, MRM0m, (outs i16mem:$dst), (ins),
def LGDT16m : I<0x01, MRM2m, (outs), (ins opaque48mem:$src), def LGDT16m : I<0x01, MRM2m, (outs), (ins opaque48mem:$src),
"lgdt{w}\t$src", [], IIC_LGDT>, TB, OpSize, Requires<[Not64BitMode]>; "lgdt{w}\t$src", [], IIC_LGDT>, TB, OpSize, Requires<[Not64BitMode]>;
def LGDTm : I<0x01, MRM2m, (outs), (ins opaque48mem:$src), def LGDT32m : I<0x01, MRM2m, (outs), (ins opaque48mem:$src),
"lgdt\t$src", [], IIC_LGDT>, OpSize16, TB; "lgdt{l}\t$src", [], IIC_LGDT>, OpSize16, TB, Requires<[Not64BitMode]>;
def LGDT64m : I<0x01, MRM2m, (outs), (ins opaque80mem:$src),
"lgdt{q}\t$src", [], IIC_LGDT>, TB, Requires<[In64BitMode]>;
def LIDT16m : I<0x01, MRM3m, (outs), (ins opaque48mem:$src), def LIDT16m : I<0x01, MRM3m, (outs), (ins opaque48mem:$src),
"lidt{w}\t$src", [], IIC_LIDT>, TB, OpSize, Requires<[Not64BitMode]>; "lidt{w}\t$src", [], IIC_LIDT>, TB, OpSize, Requires<[Not64BitMode]>;
def LIDTm : I<0x01, MRM3m, (outs), (ins opaque48mem:$src), def LIDT32m : I<0x01, MRM3m, (outs), (ins opaque48mem:$src),
"lidt\t$src", [], IIC_LIDT>, OpSize16, TB; "lidt{l}\t$src", [], IIC_LIDT>, OpSize16, TB, Requires<[Not64BitMode]>;
def LIDT64m : I<0x01, MRM3m, (outs), (ins opaque80mem:$src),
"lidt{q}\t$src", [], IIC_LIDT>, TB, Requires<[In64BitMode]>;
def LLDT16r : I<0x00, MRM2r, (outs), (ins GR16:$src), def LLDT16r : I<0x00, MRM2r, (outs), (ins GR16:$src),
"lldt{w}\t$src", [], IIC_LLDT_REG>, TB; "lldt{w}\t$src", [], IIC_LLDT_REG>, TB;
def LLDT16m : I<0x00, MRM2m, (outs), (ins i16mem:$src), def LLDT16m : I<0x00, MRM2m, (outs), (ins i16mem:$src),

48
test/MC/X86/x86-16.s
View File

@ -583,6 +583,54 @@ pshufw $90, %mm4, %mm0
// CHECK: encoding: [0x67,0x63,0x59,0x06] // CHECK: encoding: [0x67,0x63,0x59,0x06]
arpl %bx,6(%ecx) arpl %bx,6(%ecx)
// CHECK: lgdtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x50,0x04]
lgdtw 4(%eax)
// CHECK: lgdtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x50,0x04]
lgdt 4(%eax)
// CHECK: lgdtl 4(%eax)
// CHECK: encoding: [0x67,0x66,0x0f,0x01,0x50,0x04]
lgdtl 4(%eax)
// CHECK: lidtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x58,0x04]
lidtw 4(%eax)
// CHECK: lidtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x58,0x04]
lidt 4(%eax)
// CHECK: lidtl 4(%eax)
// CHECK: encoding: [0x67,0x66,0x0f,0x01,0x58,0x04]
lidtl 4(%eax)
// CHECK: sgdtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x40,0x04]
sgdtw 4(%eax)
// CHECK: sgdtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x40,0x04]
sgdt 4(%eax)
// CHECK: sgdtl 4(%eax)
// CHECK: encoding: [0x67,0x66,0x0f,0x01,0x40,0x04]
sgdtl 4(%eax)
// CHECK: sidtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x48,0x04]
sidtw 4(%eax)
// CHECK: sidtw 4(%eax)
// CHECK: encoding: [0x67,0x0f,0x01,0x48,0x04]
sidt 4(%eax)
// CHECK: sidtl 4(%eax)
// CHECK: encoding: [0x67,0x66,0x0f,0x01,0x48,0x04]
sidtl 4(%eax)
// CHECK: fcompi %st(2) // CHECK: fcompi %st(2)
// CHECK: encoding: [0xdf,0xf2] // CHECK: encoding: [0xdf,0xf2]
fcompi %st(2), %st fcompi %st(2), %st

16
test/MC/X86/x86-32.s
View File

@ -719,11 +719,11 @@ pshufw $90, %mm4, %mm0
// CHECK: encoding: [0x66,0x0f,0x01,0x50,0x04] // CHECK: encoding: [0x66,0x0f,0x01,0x50,0x04]
lgdtw 4(%eax) lgdtw 4(%eax)
// CHECK: lgdt 4(%eax) // CHECK: lgdtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x50,0x04] // CHECK: encoding: [0x0f,0x01,0x50,0x04]
lgdt 4(%eax) lgdt 4(%eax)
// CHECK: lgdt 4(%eax) // CHECK: lgdtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x50,0x04] // CHECK: encoding: [0x0f,0x01,0x50,0x04]
lgdtl 4(%eax) lgdtl 4(%eax)
@ -731,11 +731,11 @@ pshufw $90, %mm4, %mm0
// CHECK: encoding: [0x66,0x0f,0x01,0x58,0x04] // CHECK: encoding: [0x66,0x0f,0x01,0x58,0x04]
lidtw 4(%eax) lidtw 4(%eax)
// CHECK: lidt 4(%eax) // CHECK: lidtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x58,0x04] // CHECK: encoding: [0x0f,0x01,0x58,0x04]
lidt 4(%eax) lidt 4(%eax)
// CHECK: lidt 4(%eax) // CHECK: lidtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x58,0x04] // CHECK: encoding: [0x0f,0x01,0x58,0x04]
lidtl 4(%eax) lidtl 4(%eax)
@ -743,11 +743,11 @@ pshufw $90, %mm4, %mm0
// CHECK: encoding: [0x66,0x0f,0x01,0x40,0x04] // CHECK: encoding: [0x66,0x0f,0x01,0x40,0x04]
sgdtw 4(%eax) sgdtw 4(%eax)
// CHECK: sgdt 4(%eax) // CHECK: sgdtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x40,0x04] // CHECK: encoding: [0x0f,0x01,0x40,0x04]
sgdt 4(%eax) sgdt 4(%eax)
// CHECK: sgdt 4(%eax) // CHECK: sgdtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x40,0x04] // CHECK: encoding: [0x0f,0x01,0x40,0x04]
sgdtl 4(%eax) sgdtl 4(%eax)
@ -755,11 +755,11 @@ pshufw $90, %mm4, %mm0
// CHECK: encoding: [0x66,0x0f,0x01,0x48,0x04] // CHECK: encoding: [0x66,0x0f,0x01,0x48,0x04]
sidtw 4(%eax) sidtw 4(%eax)
// CHECK: sidt 4(%eax) // CHECK: sidtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x48,0x04] // CHECK: encoding: [0x0f,0x01,0x48,0x04]
sidt 4(%eax) sidt 4(%eax)
// CHECK: sidt 4(%eax) // CHECK: sidtl 4(%eax)
// CHECK: encoding: [0x0f,0x01,0x48,0x04] // CHECK: encoding: [0x0f,0x01,0x48,0x04]
sidtl 4(%eax) sidtl 4(%eax)

16
test/MC/X86/x86-64.s
View File

@ -951,35 +951,35 @@ decw %ax // CHECK: decw %ax # encoding: [0x66,0xff,0xc8]
decl %eax // CHECK: decl %eax # encoding: [0xff,0xc8] decl %eax // CHECK: decl %eax # encoding: [0xff,0xc8]
// rdar://8416805 // rdar://8416805
// CHECK: lgdt 4(%rax) // CHECK: lgdtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x50,0x04] // CHECK: encoding: [0x0f,0x01,0x50,0x04]
lgdt 4(%rax) lgdt 4(%rax)
// CHECK: lgdt 4(%rax) // CHECK: lgdtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x50,0x04] // CHECK: encoding: [0x0f,0x01,0x50,0x04]
lgdtq 4(%rax) lgdtq 4(%rax)
// CHECK: lidt 4(%rax) // CHECK: lidtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x58,0x04] // CHECK: encoding: [0x0f,0x01,0x58,0x04]
lidt 4(%rax) lidt 4(%rax)
// CHECK: lidt 4(%rax) // CHECK: lidtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x58,0x04] // CHECK: encoding: [0x0f,0x01,0x58,0x04]
lidtq 4(%rax) lidtq 4(%rax)
// CHECK: sgdt 4(%rax) // CHECK: sgdtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x40,0x04] // CHECK: encoding: [0x0f,0x01,0x40,0x04]
sgdt 4(%rax) sgdt 4(%rax)
// CHECK: sgdt 4(%rax) // CHECK: sgdtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x40,0x04] // CHECK: encoding: [0x0f,0x01,0x40,0x04]
sgdtq 4(%rax) sgdtq 4(%rax)
// CHECK: sidt 4(%rax) // CHECK: sidtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x48,0x04] // CHECK: encoding: [0x0f,0x01,0x48,0x04]
sidt 4(%rax) sidt 4(%rax)
// CHECK: sidt 4(%rax) // CHECK: sidtq 4(%rax)
// CHECK: encoding: [0x0f,0x01,0x48,0x04] // CHECK: encoding: [0x0f,0x01,0x48,0x04]
sidtq 4(%rax) sidtq 4(%rax)