Fix to decode grouped AVX with VEX pp bits which should be handled as same as last-prefixes. This fixes below warnings in posttest with CONFIG_CRYPTO_SHA1_SSSE3=y. Warning: arch/x86/tools/test_get_len found difference at <sha1_transform_avx>:ffffffff810d5fc0 Warning: ffffffff810d6069: c5 f9 73 de 04 vpsrldq $0x4,%xmm6,%xmm0 Warning: objdump says 5 bytes, but insn_get_length() says 4 ... With this change, test_get_len can decode it correctly. $ arch/x86/tools/test_get_len -v -y ffffffff810d6069: c5 f9 73 de 04 vpsrldq $0x4,%xmm6,%xmm0 Succeed: decoded and checked 1 instructions Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: yrl.pp-manager.tt@hitachi.com Link: http://lkml.kernel.org/r/20120210053340.30429.73410.stgit@localhost.localdomain Signed-off-by: Ingo Molnar <mingo@elte.hu>
		
			
				
	
	
		
			97 lines
		
	
	
	
		
			2.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
	
		
			2.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * x86 instruction attribute tables
 | 
						|
 *
 | 
						|
 * Written by Masami Hiramatsu <mhiramat@redhat.com>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 | 
						|
 *
 | 
						|
 */
 | 
						|
#include <asm/insn.h>
 | 
						|
 | 
						|
/* Attribute tables are generated from opcode map */
 | 
						|
#include "inat-tables.c"
 | 
						|
 | 
						|
/* Attribute search APIs */
 | 
						|
insn_attr_t inat_get_opcode_attribute(insn_byte_t opcode)
 | 
						|
{
 | 
						|
	return inat_primary_table[opcode];
 | 
						|
}
 | 
						|
 | 
						|
int inat_get_last_prefix_id(insn_byte_t last_pfx)
 | 
						|
{
 | 
						|
	insn_attr_t lpfx_attr;
 | 
						|
 | 
						|
	lpfx_attr = inat_get_opcode_attribute(last_pfx);
 | 
						|
	return inat_last_prefix_id(lpfx_attr);
 | 
						|
}
 | 
						|
 | 
						|
insn_attr_t inat_get_escape_attribute(insn_byte_t opcode, int lpfx_id,
 | 
						|
				      insn_attr_t esc_attr)
 | 
						|
{
 | 
						|
	const insn_attr_t *table;
 | 
						|
	int n;
 | 
						|
 | 
						|
	n = inat_escape_id(esc_attr);
 | 
						|
 | 
						|
	table = inat_escape_tables[n][0];
 | 
						|
	if (!table)
 | 
						|
		return 0;
 | 
						|
	if (inat_has_variant(table[opcode]) && lpfx_id) {
 | 
						|
		table = inat_escape_tables[n][lpfx_id];
 | 
						|
		if (!table)
 | 
						|
			return 0;
 | 
						|
	}
 | 
						|
	return table[opcode];
 | 
						|
}
 | 
						|
 | 
						|
insn_attr_t inat_get_group_attribute(insn_byte_t modrm, int lpfx_id,
 | 
						|
				     insn_attr_t grp_attr)
 | 
						|
{
 | 
						|
	const insn_attr_t *table;
 | 
						|
	int n;
 | 
						|
 | 
						|
	n = inat_group_id(grp_attr);
 | 
						|
 | 
						|
	table = inat_group_tables[n][0];
 | 
						|
	if (!table)
 | 
						|
		return inat_group_common_attribute(grp_attr);
 | 
						|
	if (inat_has_variant(table[X86_MODRM_REG(modrm)]) && lpfx_id) {
 | 
						|
		table = inat_group_tables[n][lpfx_id];
 | 
						|
		if (!table)
 | 
						|
			return inat_group_common_attribute(grp_attr);
 | 
						|
	}
 | 
						|
	return table[X86_MODRM_REG(modrm)] |
 | 
						|
	       inat_group_common_attribute(grp_attr);
 | 
						|
}
 | 
						|
 | 
						|
insn_attr_t inat_get_avx_attribute(insn_byte_t opcode, insn_byte_t vex_m,
 | 
						|
				   insn_byte_t vex_p)
 | 
						|
{
 | 
						|
	const insn_attr_t *table;
 | 
						|
	if (vex_m > X86_VEX_M_MAX || vex_p > INAT_LSTPFX_MAX)
 | 
						|
		return 0;
 | 
						|
	/* At first, this checks the master table */
 | 
						|
	table = inat_avx_tables[vex_m][0];
 | 
						|
	if (!table)
 | 
						|
		return 0;
 | 
						|
	if (!inat_is_group(table[opcode]) && vex_p) {
 | 
						|
		/* If this is not a group, get attribute directly */
 | 
						|
		table = inat_avx_tables[vex_m][vex_p];
 | 
						|
		if (!table)
 | 
						|
			return 0;
 | 
						|
	}
 | 
						|
	return table[opcode];
 | 
						|
}
 | 
						|
 |