From 5a36377c7cce103867d97630ca0bcfb1a75ec822 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Fri, 6 Mar 2015 12:28:31 +0800 Subject: [PATCH] x86: add GRP_VM for some VMX instructions --- arch/X86/X86Mapping.c | 84 +++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/X86/X86Mapping.c b/arch/X86/X86Mapping.c index cf0807657..93ae25ffb 100644 --- a/arch/X86/X86Mapping.c +++ b/arch/X86/X86Mapping.c @@ -6978,13 +6978,13 @@ static insn_map insns[] = { // full x86 instructions { X86_INVEPT32, X86_INS_INVEPT, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_INVEPT64, X86_INS_INVEPT, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { @@ -7020,13 +7020,13 @@ static insn_map insns[] = { // full x86 instructions { X86_INVVPID32, X86_INS_INVVPID, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_INVVPID64, X86_INS_INVVPID, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { @@ -30246,13 +30246,13 @@ static insn_map insns[] = { // full x86 instructions { X86_VMCLEARm, X86_INS_VMCLEAR, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMFUNC, X86_INS_VMFUNC, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -30882,7 +30882,7 @@ static insn_map insns[] = { // full x86 instructions { X86_VMLAUNCH, X86_INS_VMLAUNCH, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -33882,43 +33882,43 @@ static insn_map insns[] = { // full x86 instructions { X86_VMPTRLDm, X86_INS_VMPTRLD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMPTRSTm, X86_INS_VMPTRST, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMREAD32rm, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMREAD32rr, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMREAD64rm, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMREAD64rr, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMRESUME, X86_INS_VMRESUME, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -34536,37 +34536,37 @@ static insn_map insns[] = { // full x86 instructions { X86_VMWRITE32rm, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMWRITE32rr, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMWRITE64rm, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMWRITE64rr, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMXOFF, X86_INS_VMXOFF, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMXON, X86_INS_VMXON, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -56231,19 +56231,19 @@ static insn_map insns[] = { // reduce x86 instructions { X86_INVEPT32, X86_INS_INVEPT, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_INVEPT64, X86_INS_INVEPT, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_INVLPG, X86_INS_INVLPG, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -56273,13 +56273,13 @@ static insn_map insns[] = { // reduce x86 instructions { X86_INVVPID32, X86_INS_INVVPID, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_INVVPID64, X86_INS_INVVPID, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { @@ -61889,25 +61889,25 @@ static insn_map insns[] = { // reduce x86 instructions { X86_VMCALL, X86_INS_VMCALL, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMCLEARm, X86_INS_VMCLEAR, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMFUNC, X86_INS_VMFUNC, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMLAUNCH, X86_INS_VMLAUNCH, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -61931,43 +61931,43 @@ static insn_map insns[] = { // reduce x86 instructions { X86_VMPTRLDm, X86_INS_VMPTRLD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMPTRSTm, X86_INS_VMPTRST, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMREAD32rm, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMREAD32rr, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMREAD64rm, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMREAD64rr, X86_INS_VMREAD, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMRESUME, X86_INS_VMRESUME, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { @@ -61997,37 +61997,37 @@ static insn_map insns[] = { // reduce x86 instructions { X86_VMWRITE32rm, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMWRITE32rr, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_NOT64BITMODE, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_NOT64BITMODE, 0 }, 0, 0 #endif }, { X86_VMWRITE64rm, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMWRITE64rr, X86_INS_VMWRITE, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { X86_GRP_MODE64, 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, X86_GRP_MODE64, 0 }, 0, 0 #endif }, { X86_VMXOFF, X86_INS_VMXOFF, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, { X86_VMXON, X86_INS_VMXON, #ifndef CAPSTONE_DIET - { 0 }, { 0 }, { 0 }, 0, 0 + { 0 }, { 0 }, { X86_GRP_VM, 0 }, 0, 0 #endif }, {