summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-05-06 19:54:28 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-05-06 19:54:28 -0700
commit42a8caecb5891402c039a4154a8e17aee735afc2 (patch)
treec6bf37f840a916c7d3565182a5d5eea1878b39a1
parent7334e3ac2377f19af8c53fd55a240977632761a2 (diff)
downloadnasm-42a8caecb5891402c039a4154a8e17aee735afc2.tar.gz
nasm-42a8caecb5891402c039a4154a8e17aee735afc2.tar.bz2
nasm-42a8caecb5891402c039a4154a8e17aee735afc2.zip
Sandy Bridge, not Sandy Banks; add Westmere
-rw-r--r--insns.dat8
-rw-r--r--insns.h3
2 files changed, 6 insertions, 5 deletions
diff --git a/insns.dat b/insns.dat
index 7d8e050..23241b9 100644
--- a/insns.dat
+++ b/insns.dat
@@ -2024,10 +2024,10 @@ PFRCP mmxreg,mmxrm \323\2\x0F\x0F\110\1\x86 PENT,3DNOW,SQ,CYRIX
PFRSQRT mmxreg,mmxrm \323\2\x0F\x0F\110\1\x87 PENT,3DNOW,SQ,CYRIX
;# Intel AVX instructions
-VPERMIL2PS xmmreg,xmmreg,xmmrm,xmmreg,imm \260\103\101\1\x48\123\172\34 AVX,SANDYBANKS
-VPERMIL2PS xmmreg,xmmreg,xmmreg,xmmrm,imm \260\103\111\1\x48\132\172\14 AVX,SANDYBANKS
-VPERMIL2PS ymmreg,ymmreg,ymmrm,ymmreg,imm \260\103\105\1\x48\123\172\34 AVX,SANDYBANKS
-VPERMIL2PS ymmreg,ymmreg,ymmreg,ymmrm,imm \260\103\115\1\x48\132\172\14 AVX,SANDYBANKS
+VPERMIL2PS xmmreg,xmmreg,xmmrm,xmmreg,imm \260\103\101\1\x48\123\172\34 AVX,SANDYBRIDGE
+VPERMIL2PS xmmreg,xmmreg,xmmreg,xmmrm,imm \260\103\111\1\x48\132\172\14 AVX,SANDYBRIDGE
+VPERMIL2PS ymmreg,ymmreg,ymmrm,ymmreg,imm \260\103\105\1\x48\123\172\34 AVX,SANDYBRIDGE
+VPERMIL2PS ymmreg,ymmreg,ymmreg,ymmrm,imm \260\103\115\1\x48\132\172\14 AVX,SANDYBRIDGE
;# VIA (Centaur) security instructions
XSTORE void \3\x0F\xA7\xC0 PENT,CYRIX
diff --git a/insns.h b/insns.h
index 7a0ecff..7189a55 100644
--- a/insns.h
+++ b/insns.h
@@ -115,7 +115,8 @@ extern const struct disasm_index itable[256];
#define IF_PRESCOTT 0x09000000UL /* Prescott instructions */
#define IF_X86_64 0x0A000000UL /* x86-64 instruction (long or legacy mode) */
#define IF_NEHALEM 0x0B000000UL /* Nehalem instruction */
-#define IF_SANDYBANKS 0x0C000000UL /* Sandy Banks instruction */
+#define IF_WESTMERE 0x0C000000UL /* Westmere instruction */
+#define IF_SANDYBRIDE 0x0D000000UL /* Sandy Bridge instruction */
#define IF_X64 (IF_LONG|IF_X86_64)
#define IF_IA64 0x0F000000UL /* IA64 instructions (in x86 mode) */
#define IF_CYRIX 0x10000000UL /* Cyrix-specific instruction */