mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
Add a bunch of OpSize32 tags to 64-bit mode only instructions to match their 32-bit mode counterparts for cases where there is also a OpSize16 instruction.
llvm-svn: 201550
This commit is contained in:
Craig Topper
parent
8091d0ad88
commit
b5b81fb98b
@ -22,11 +22,11 @@
|
||||
let isTerminator = 1, isReturn = 1, isBarrier = 1,
|
||||
hasCtrlDep = 1, FPForm = SpecialFP, SchedRW = [WriteJumpLd] in {
|
||||
def RETL : I <0xC3, RawFrm, (outs), (ins variable_ops),
|
||||
"ret{l}",
|
||||
[(X86retflag 0)], IIC_RET>, OpSize32, Requires<[Not64BitMode]>;
|
||||
"ret{l}", [(X86retflag 0)], IIC_RET>, OpSize32,
|
||||
Requires<[Not64BitMode]>;
|
||||
def RETQ : I <0xC3, RawFrm, (outs), (ins variable_ops),
|
||||
"ret{q}",
|
||||
[(X86retflag 0)], IIC_RET>, Requires<[In64BitMode]>;
|
||||
"ret{q}", [(X86retflag 0)], IIC_RET>, OpSize32,
|
||||
Requires<[In64BitMode]>;
|
||||
def RETW : I <0xC3, RawFrm, (outs), (ins),
|
||||
"ret{w}",
|
||||
[], IIC_RET>, OpSize16;
|
||||
@ -36,7 +36,7 @@ let isTerminator = 1, isReturn = 1, isBarrier = 1,
|
||||
Requires<[Not64BitMode]>;
|
||||
def RETIQ : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt, variable_ops),
|
||||
"ret{q}\t$amt",
|
||||
[(X86retflag timm:$amt)], IIC_RET_IMM>,
|
||||
[(X86retflag timm:$amt)], IIC_RET_IMM>, OpSize32,
|
||||
Requires<[In64BitMode]>;
|
||||
def RETIW : Ii16<0xC2, RawFrm, (outs), (ins i16imm:$amt),
|
||||
"ret{w}\t$amt",
|
||||
@ -265,7 +265,7 @@ let isCall = 1, Uses = [RSP], SchedRW = [WriteJump] in {
|
||||
// the 32-bit pcrel field that we have.
|
||||
def CALL64pcrel32 : Ii32PCRel<0xE8, RawFrm,
|
||||
(outs), (ins i64i32imm_pcrel:$dst),
|
||||
"call{q}\t$dst", [], IIC_CALL_RI>,
|
||||
"call{q}\t$dst", [], IIC_CALL_RI>, OpSize32,
|
||||
Requires<[In64BitMode]>;
|
||||
def CALL64r : I<0xFF, MRM2r, (outs), (ins GR64:$dst),
|
||||
"call{q}\t{*}$dst", [(X86call GR64:$dst)],
|
||||
|
||||
@ -968,7 +968,7 @@ def POP16rmm: I<0x8F, MRM0m, (outs), (ins i16mem:$dst), "pop{w}\t$dst", [],
|
||||
def POP32rmr: I<0x8F, MRM0r, (outs GR32:$reg), (ins), "pop{l}\t$reg", [],
|
||||
IIC_POP_REG>, OpSize32, Requires<[Not64BitMode]>;
|
||||
def POP32rmm: I<0x8F, MRM0m, (outs), (ins i32mem:$dst), "pop{l}\t$dst", [],
|
||||
IIC_POP_MEM>, Requires<[Not64BitMode]>;
|
||||
IIC_POP_MEM>, OpSize32, Requires<[Not64BitMode]>;
|
||||
|
||||
def POPF16 : I<0x9D, RawFrm, (outs), (ins), "popf{w}", [], IIC_POP_F>,
|
||||
OpSize16;
|
||||
@ -1014,19 +1014,19 @@ def PUSHF32 : I<0x9C, RawFrm, (outs), (ins), "pushf{l|d}", [], IIC_PUSH_F>,
|
||||
let Defs = [RSP], Uses = [RSP], neverHasSideEffects=1 in {
|
||||
let mayLoad = 1, SchedRW = [WriteLoad] in {
|
||||
def POP64r : I<0x58, AddRegFrm, (outs GR64:$reg), (ins), "pop{q}\t$reg", [],
|
||||
IIC_POP_REG>, Requires<[In64BitMode]>;
|
||||
IIC_POP_REG>, OpSize32, Requires<[In64BitMode]>;
|
||||
def POP64rmr: I<0x8F, MRM0r, (outs GR64:$reg), (ins), "pop{q}\t$reg", [],
|
||||
IIC_POP_REG>, Requires<[In64BitMode]>;
|
||||
IIC_POP_REG>, OpSize32, Requires<[In64BitMode]>;
|
||||
def POP64rmm: I<0x8F, MRM0m, (outs), (ins i64mem:$dst), "pop{q}\t$dst", [],
|
||||
IIC_POP_MEM>, Requires<[In64BitMode]>;
|
||||
IIC_POP_MEM>, OpSize32, Requires<[In64BitMode]>;
|
||||
} // mayLoad, SchedRW
|
||||
let mayStore = 1, SchedRW = [WriteStore] in {
|
||||
def PUSH64r : I<0x50, AddRegFrm, (outs), (ins GR64:$reg), "push{q}\t$reg", [],
|
||||
IIC_PUSH_REG>, Requires<[In64BitMode]>;
|
||||
IIC_PUSH_REG>, OpSize32, Requires<[In64BitMode]>;
|
||||
def PUSH64rmr: I<0xFF, MRM6r, (outs), (ins GR64:$reg), "push{q}\t$reg", [],
|
||||
IIC_PUSH_REG>, Requires<[In64BitMode]>;
|
||||
IIC_PUSH_REG>, OpSize32, Requires<[In64BitMode]>;
|
||||
def PUSH64rmm: I<0xFF, MRM6m, (outs), (ins i64mem:$src), "push{q}\t$src", [],
|
||||
IIC_PUSH_MEM>, Requires<[In64BitMode]>;
|
||||
IIC_PUSH_MEM>, OpSize32, Requires<[In64BitMode]>;
|
||||
} // mayStore, SchedRW
|
||||
}
|
||||
|
||||
@ -1038,15 +1038,16 @@ def PUSH64i16 : Ii16<0x68, RawFrm, (outs), (ins i16imm:$imm),
|
||||
"push{w}\t$imm", [], IIC_PUSH_IMM>, OpSize16,
|
||||
Requires<[In64BitMode]>;
|
||||
def PUSH64i32 : Ii32S<0x68, RawFrm, (outs), (ins i64i32imm:$imm),
|
||||
"push{q}\t$imm", [], IIC_PUSH_IMM>, Requires<[In64BitMode]>;
|
||||
"push{q}\t$imm", [], IIC_PUSH_IMM>, OpSize32,
|
||||
Requires<[In64BitMode]>;
|
||||
}
|
||||
|
||||
let Defs = [RSP, EFLAGS], Uses = [RSP], mayLoad = 1, neverHasSideEffects=1 in
|
||||
def POPF64 : I<0x9D, RawFrm, (outs), (ins), "popfq", [], IIC_POP_FD>,
|
||||
Requires<[In64BitMode]>, Sched<[WriteLoad]>;
|
||||
OpSize32, Requires<[In64BitMode]>, Sched<[WriteLoad]>;
|
||||
let Defs = [RSP], Uses = [RSP, EFLAGS], mayStore = 1, neverHasSideEffects=1 in
|
||||
def PUSHF64 : I<0x9C, RawFrm, (outs), (ins), "pushfq", [], IIC_PUSH_F>,
|
||||
Requires<[In64BitMode]>, Sched<[WriteStore]>;
|
||||
OpSize32, Requires<[In64BitMode]>, Sched<[WriteStore]>;
|
||||
|
||||
let Defs = [EDI, ESI, EBP, EBX, EDX, ECX, EAX, ESP], Uses = [ESP],
|
||||
mayLoad = 1, neverHasSideEffects = 1, SchedRW = [WriteLoad] in {
|
||||
@ -1672,7 +1673,7 @@ def XCHG32ar : I<0x90, AddRegFrm, (outs), (ins GR32:$src),
|
||||
// xchg %eax, %eax needs to clear upper 32-bits of RAX so is not a NOP.
|
||||
def XCHG32ar64 : I<0x90, AddRegFrm, (outs), (ins GR32_NOAX:$src),
|
||||
"xchg{l}\t{$src, %eax|eax, $src}", [], IIC_XCHG_REG>,
|
||||
Requires<[In64BitMode]>;
|
||||
OpSize32, Requires<[In64BitMode]>;
|
||||
def XCHG64ar : RI<0x90, AddRegFrm, (outs), (ins GR64:$src),
|
||||
"xchg{q}\t{$src, %rax|rax, $src}", [], IIC_XCHG_REG>;
|
||||
} // SchedRW
|
||||
|
||||
@ -6756,8 +6756,7 @@ let Defs = [EFLAGS], Predicates = [HasPOPCNT] in {
|
||||
def POPCNT16rr : I<0xB8, MRMSrcReg, (outs GR16:$dst), (ins GR16:$src),
|
||||
"popcnt{w}\t{$src, $dst|$dst, $src}",
|
||||
[(set GR16:$dst, (ctpop GR16:$src)), (implicit EFLAGS)],
|
||||
IIC_SSE_POPCNT_RR>,
|
||||
OpSize16, XS;
|
||||
IIC_SSE_POPCNT_RR>, OpSize16, XS;
|
||||
def POPCNT16rm : I<0xB8, MRMSrcMem, (outs GR16:$dst), (ins i16mem:$src),
|
||||
"popcnt{w}\t{$src, $dst|$dst, $src}",
|
||||
[(set GR16:$dst, (ctpop (loadi16 addr:$src))),
|
||||
@ -6766,12 +6765,11 @@ let Defs = [EFLAGS], Predicates = [HasPOPCNT] in {
|
||||
def POPCNT32rr : I<0xB8, MRMSrcReg, (outs GR32:$dst), (ins GR32:$src),
|
||||
"popcnt{l}\t{$src, $dst|$dst, $src}",
|
||||
[(set GR32:$dst, (ctpop GR32:$src)), (implicit EFLAGS)],
|
||||
IIC_SSE_POPCNT_RR>,
|
||||
XS;
|
||||
IIC_SSE_POPCNT_RR>, OpSize32, XS;
|
||||
def POPCNT32rm : I<0xB8, MRMSrcMem, (outs GR32:$dst), (ins i32mem:$src),
|
||||
"popcnt{l}\t{$src, $dst|$dst, $src}",
|
||||
[(set GR32:$dst, (ctpop (loadi32 addr:$src))),
|
||||
(implicit EFLAGS)], IIC_SSE_POPCNT_RM>, XS;
|
||||
(implicit EFLAGS)], IIC_SSE_POPCNT_RM>, OpSize32, XS;
|
||||
|
||||
def POPCNT64rr : RI<0xB8, MRMSrcReg, (outs GR64:$dst), (ins GR64:$src),
|
||||
"popcnt{q}\t{$src, $dst|$dst, $src}",
|
||||
|
||||
@ -302,9 +302,11 @@ def PUSHGS32 : I<0xa8, RawFrm, (outs), (ins),
|
||||
"push{l}\t{%gs|gs}", [], IIC_PUSH_SR>, TB,
|
||||
OpSize32, Requires<[Not64BitMode]>;
|
||||
def PUSHFS64 : I<0xa0, RawFrm, (outs), (ins),
|
||||
"push{q}\t{%fs|fs}", [], IIC_PUSH_SR>, TB, Requires<[In64BitMode]>;
|
||||
"push{q}\t{%fs|fs}", [], IIC_PUSH_SR>, TB,
|
||||
OpSize32, Requires<[In64BitMode]>;
|
||||
def PUSHGS64 : I<0xa8, RawFrm, (outs), (ins),
|
||||
"push{q}\t{%gs|gs}", [], IIC_PUSH_SR>, TB, Requires<[In64BitMode]>;
|
||||
"push{q}\t{%gs|gs}", [], IIC_PUSH_SR>, TB,
|
||||
OpSize32, Requires<[In64BitMode]>;
|
||||
|
||||
// No "pop cs" instruction.
|
||||
def POPSS16 : I<0x17, RawFrm, (outs), (ins),
|
||||
@ -334,16 +336,18 @@ def POPFS32 : I<0xa1, RawFrm, (outs), (ins),
|
||||
"pop{l}\t{%fs|fs}", [], IIC_POP_SR>, TB,
|
||||
OpSize32, Requires<[Not64BitMode]>;
|
||||
def POPFS64 : I<0xa1, RawFrm, (outs), (ins),
|
||||
"pop{q}\t{%fs|fs}", [], IIC_POP_SR>, TB, Requires<[In64BitMode]>;
|
||||
|
||||
"pop{q}\t{%fs|fs}", [], IIC_POP_SR>, TB,
|
||||
OpSize32, Requires<[In64BitMode]>;
|
||||
|
||||
def POPGS16 : I<0xa9, RawFrm, (outs), (ins),
|
||||
"pop{w}\t{%gs|gs}", [], IIC_POP_SR>, OpSize16, TB;
|
||||
def POPGS32 : I<0xa9, RawFrm, (outs), (ins),
|
||||
"pop{l}\t{%gs|gs}", [], IIC_POP_SR>, TB,
|
||||
OpSize32, Requires<[Not64BitMode]>;
|
||||
def POPGS64 : I<0xa9, RawFrm, (outs), (ins),
|
||||
"pop{q}\t{%gs|gs}", [], IIC_POP_SR>, TB, Requires<[In64BitMode]>;
|
||||
|
||||
"pop{q}\t{%gs|gs}", [], IIC_POP_SR>, TB,
|
||||
OpSize32, Requires<[In64BitMode]>;
|
||||
|
||||
|
||||
def LDS16rm : I<0xc5, MRMSrcMem, (outs GR16:$dst), (ins opaque32mem:$src),
|
||||
"lds{w}\t{$src, $dst|$dst, $src}", [], IIC_LXS>, OpSize16;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user