Merge tag 'x86-fsgsbase-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / x86 / include / asm / inst.h

diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h
index d063841..bd7f024 100644 (file)
--- a/arch/x86/include/asm/inst.h
+++ b/arch/x86/include/asm/inst.h
@@ -12,7 +12,6 @@
 
 #define REG_TYPE_R32           0
 #define REG_TYPE_R64           1
-#define REG_TYPE_XMM           2
 #define REG_TYPE_INVALID       100
 
        .macro R32_NUM opd r32
@@ -123,77 +122,18 @@
 #endif
        .endm
 
-       .macro XMM_NUM opd xmm
-       \opd = REG_NUM_INVALID
-       .ifc \xmm,%xmm0
-       \opd = 0
-       .endif
-       .ifc \xmm,%xmm1
-       \opd = 1
-       .endif
-       .ifc \xmm,%xmm2
-       \opd = 2
-       .endif
-       .ifc \xmm,%xmm3
-       \opd = 3
-       .endif
-       .ifc \xmm,%xmm4
-       \opd = 4
-       .endif
-       .ifc \xmm,%xmm5
-       \opd = 5
-       .endif
-       .ifc \xmm,%xmm6
-       \opd = 6
-       .endif
-       .ifc \xmm,%xmm7
-       \opd = 7
-       .endif
-       .ifc \xmm,%xmm8
-       \opd = 8
-       .endif
-       .ifc \xmm,%xmm9
-       \opd = 9
-       .endif
-       .ifc \xmm,%xmm10
-       \opd = 10
-       .endif
-       .ifc \xmm,%xmm11
-       \opd = 11
-       .endif
-       .ifc \xmm,%xmm12
-       \opd = 12
-       .endif
-       .ifc \xmm,%xmm13
-       \opd = 13
-       .endif
-       .ifc \xmm,%xmm14
-       \opd = 14
-       .endif
-       .ifc \xmm,%xmm15
-       \opd = 15
-       .endif
-       .endm
-
        .macro REG_TYPE type reg
        R32_NUM reg_type_r32 \reg
        R64_NUM reg_type_r64 \reg
-       XMM_NUM reg_type_xmm \reg
        .if reg_type_r64 <> REG_NUM_INVALID
        \type = REG_TYPE_R64
        .elseif reg_type_r32 <> REG_NUM_INVALID
        \type = REG_TYPE_R32
-       .elseif reg_type_xmm <> REG_NUM_INVALID
-       \type = REG_TYPE_XMM
        .else
        \type = REG_TYPE_INVALID
        .endif
        .endm
 
-       .macro PFX_OPD_SIZE
-       .byte 0x66
-       .endm
-
        .macro PFX_REX opd1 opd2 W=0
        .if ((\opd1 | \opd2) & 8) || \W
        .byte 0x40 | ((\opd1 & 8) >> 3) | ((\opd2 & 8) >> 1) | (\W << 3)
@@ -204,109 +144,6 @@
        .byte \mod | (\opd1 & 7) | ((\opd2 & 7) << 3)
        .endm
 
-       .macro PSHUFB_XMM xmm1 xmm2
-       XMM_NUM pshufb_opd1 \xmm1
-       XMM_NUM pshufb_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX pshufb_opd1 pshufb_opd2
-       .byte 0x0f, 0x38, 0x00
-       MODRM 0xc0 pshufb_opd1 pshufb_opd2
-       .endm
-
-       .macro PCLMULQDQ imm8 xmm1 xmm2
-       XMM_NUM clmul_opd1 \xmm1
-       XMM_NUM clmul_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX clmul_opd1 clmul_opd2
-       .byte 0x0f, 0x3a, 0x44
-       MODRM 0xc0 clmul_opd1 clmul_opd2
-       .byte \imm8
-       .endm
-
-       .macro PEXTRD imm8 xmm gpr
-       R32_NUM extrd_opd1 \gpr
-       XMM_NUM extrd_opd2 \xmm
-       PFX_OPD_SIZE
-       PFX_REX extrd_opd1 extrd_opd2
-       .byte 0x0f, 0x3a, 0x16
-       MODRM 0xc0 extrd_opd1 extrd_opd2
-       .byte \imm8
-       .endm
-
-       .macro AESKEYGENASSIST rcon xmm1 xmm2
-       XMM_NUM aeskeygen_opd1 \xmm1
-       XMM_NUM aeskeygen_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aeskeygen_opd1 aeskeygen_opd2
-       .byte 0x0f, 0x3a, 0xdf
-       MODRM 0xc0 aeskeygen_opd1 aeskeygen_opd2
-       .byte \rcon
-       .endm
-
-       .macro AESIMC xmm1 xmm2
-       XMM_NUM aesimc_opd1 \xmm1
-       XMM_NUM aesimc_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aesimc_opd1 aesimc_opd2
-       .byte 0x0f, 0x38, 0xdb
-       MODRM 0xc0 aesimc_opd1 aesimc_opd2
-       .endm
-
-       .macro AESENC xmm1 xmm2
-       XMM_NUM aesenc_opd1 \xmm1
-       XMM_NUM aesenc_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aesenc_opd1 aesenc_opd2
-       .byte 0x0f, 0x38, 0xdc
-       MODRM 0xc0 aesenc_opd1 aesenc_opd2
-       .endm
-
-       .macro AESENCLAST xmm1 xmm2
-       XMM_NUM aesenclast_opd1 \xmm1
-       XMM_NUM aesenclast_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aesenclast_opd1 aesenclast_opd2
-       .byte 0x0f, 0x38, 0xdd
-       MODRM 0xc0 aesenclast_opd1 aesenclast_opd2
-       .endm
-
-       .macro AESDEC xmm1 xmm2
-       XMM_NUM aesdec_opd1 \xmm1
-       XMM_NUM aesdec_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aesdec_opd1 aesdec_opd2
-       .byte 0x0f, 0x38, 0xde
-       MODRM 0xc0 aesdec_opd1 aesdec_opd2
-       .endm
-
-       .macro AESDECLAST xmm1 xmm2
-       XMM_NUM aesdeclast_opd1 \xmm1
-       XMM_NUM aesdeclast_opd2 \xmm2
-       PFX_OPD_SIZE
-       PFX_REX aesdeclast_opd1 aesdeclast_opd2
-       .byte 0x0f, 0x38, 0xdf
-       MODRM 0xc0 aesdeclast_opd1 aesdeclast_opd2
-       .endm
-
-       .macro MOVQ_R64_XMM opd1 opd2
-       REG_TYPE movq_r64_xmm_opd1_type \opd1
-       .if movq_r64_xmm_opd1_type == REG_TYPE_XMM
-       XMM_NUM movq_r64_xmm_opd1 \opd1
-       R64_NUM movq_r64_xmm_opd2 \opd2
-       .else
-       R64_NUM movq_r64_xmm_opd1 \opd1
-       XMM_NUM movq_r64_xmm_opd2 \opd2
-       .endif
-       PFX_OPD_SIZE
-       PFX_REX movq_r64_xmm_opd1 movq_r64_xmm_opd2 1
-       .if movq_r64_xmm_opd1_type == REG_TYPE_XMM
-       .byte 0x0f, 0x7e
-       .else
-       .byte 0x0f, 0x6e
-       .endif
-       MODRM 0xc0 movq_r64_xmm_opd1 movq_r64_xmm_opd2
-       .endm
-
 .macro RDPID opd
        REG_TYPE rdpid_opd_type \opd
        .if rdpid_opd_type == REG_TYPE_R64