x86: Update instruction decoder to support new AVX formats

Since new Intel software developers manual introduces
new format for AVX instruction set (including AVX2),
it is important to update x86-opcode-map.txt to fit
those changes.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20111205120557.15475.13236.stgit@cloud
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 12 insertions, 9 deletions

diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk
index eaf11f52fc0b..5f6a5b6c3a15 100644
--- a/arch/x86/tools/gen-insn-attr-x86.awk
+++ b/arch/x86/tools/gen-insn-attr-x86.awk
@@ -47,7 +47,7 @@ BEGIN {
         sep_expr = "^\\|$"
         group_expr = "^Grp[0-9A-Za-z]+"
 
-        imm_expr = "^[IJAO][a-z]"
+        imm_expr = "^[IJAOL][a-z]"
         imm_flag["Ib"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
         imm_flag["Jb"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
         imm_flag["Iw"] = "INAT_MAKE_IMM(INAT_IMM_WORD)"
@@ -59,6 +59,7 @@ BEGIN {
         imm_flag["Iv"] = "INAT_MAKE_IMM(INAT_IMM_VWORD)"
         imm_flag["Ob"] = "INAT_MOFFSET"
         imm_flag["Ov"] = "INAT_MOFFSET"
+        imm_flag["Lx"] = "INAT_MAKE_IMM(INAT_IMM_BYTE)"
 
         modrm_expr = "^([CDEGMNPQRSUVW/][a-z]+|NTA|T[012])"
         force64_expr = "\\([df]64\\)"
@@ -70,8 +71,12 @@ BEGIN {
         lprefix3_expr = "\\(F2\\)"
         max_lprefix = 4
 
-        vexok_expr = "\\(VEX\\)"
-        vexonly_expr = "\\(oVEX\\)"
+        # All opcodes starting with lower-case 'v' or with (v1) superscript
+        # accepts VEX prefix
+        vexok_opcode_expr = "^v.*"
+        vexok_expr = "\\(v1\\)"
+        # All opcodes with (v) superscript supports *only* VEX prefix
+        vexonly_expr = "\\(v\\)"
 
         prefix_expr = "\\(Prefix\\)"
         prefix_num["Operand-Size"] = "INAT_PFX_OPNDSZ"
@@ -85,8 +90,8 @@ BEGIN {
         prefix_num["SEG=GS"] = "INAT_PFX_GS"
         prefix_num["SEG=SS"] = "INAT_PFX_SS"
         prefix_num["Address-Size"] = "INAT_PFX_ADDRSZ"
-        prefix_num["2bytes-VEX"] = "INAT_PFX_VEX2"
-        prefix_num["3bytes-VEX"] = "INAT_PFX_VEX3"
+        prefix_num["VEX+1byte"] = "INAT_PFX_VEX2"
+        prefix_num["VEX+2byte"] = "INAT_PFX_VEX3"
 
         clear_vars()
 }
@@ -310,12 +315,10 @@ function convert_operands(count,opnd,       i,j,imm,mod)
                 if (match(opcode, fpu_expr))
                         flags = add_flags(flags, "INAT_MODRM")
 
-                # check VEX only code
+                # check VEX codes
                 if (match(ext, vexonly_expr))
                         flags = add_flags(flags, "INAT_VEXOK | INAT_VEXONLY")
-
-                # check VEX only code
-                if (match(ext, vexok_expr))
+                else if (match(ext, vexok_expr) || match(opcode, vexok_opcode_expr))
                         flags = add_flags(flags, "INAT_VEXOK")
 
                 # check prefixes