X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..316670eb35587141e969394ae8537d66b9211e80:/bsd/dev/i386/dis_tables.c
diff --git a/bsd/dev/i386/dis_tables.c b/bsd/dev/i386/dis_tables.c
index 08519b456..bfaa4bc79 100644
--- a/bsd/dev/i386/dis_tables.c
+++ b/bsd/dev/i386/dis_tables.c
@@ -1,4 +1,5 @@
/*
+ *
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
@@ -19,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -27,8 +28,9 @@
/* All Rights Reserved */
-/* #pragma ident "@(#)dis_tables.c 1.13 06/06/15 SMI" */
-
+/*
+ * #pragma ident "@(#)dis_tables.c 1.18 08/05/24 SMI"
+ */
#if !defined(__APPLE__)
#include "dis_tables.h"
#else
@@ -36,6 +38,7 @@
#include <sys/dtrace_glue.h>
#include <sys/dis_tables.h>
+
#endif /* __APPLE__ */
/* BEGIN CSTYLED */
@@ -63,7 +66,9 @@
#ifdef DIS_TEXT
extern char *strncpy(char *, const char *, size_t);
extern size_t strlen(const char *);
+#if !defined(__APPLE__)
extern int strcmp(const char *, const char *);
+#endif /* __APPLE__ */
extern int strncmp(const char *, const char *, size_t);
extern size_t strlcat(char *, const char *, size_t);
#endif
@@ -109,6 +114,7 @@ enum {
MO, /* memory only (no registers) */
PREF,
SWAPGS,
+ MONITOR_MWAIT,
R,
RA,
SEG,
@@ -155,6 +161,7 @@ enum {
CWD, /* so data16 can be evaluated for cwd and variants */
RET, /* single immediate 16-bit operand */
MOVZ, /* for movs and movz, with different size operands */
+ CRC32, /* for crc32, with different size operands */
XADDB, /* for xaddb */
MOVSXZ, /* AMD64 mov sign extend 32 to 64 bit instruction */
@@ -169,6 +176,7 @@ enum {
MMOS, /* Prefixable MMX/SIMD-Int mm -> mm/mem */
MMOMS, /* Prefixable MMX/SIMD-Int mm -> mem */
MMOPM, /* MMX/SIMD-Int mm/mem -> mm,imm8 */
+ MMOPM_66o, /* MMX/SIMD-Int 0x66 optional mm/mem -> mm,imm8 */
MMOPRM, /* Prefixable MMX/SIMD-Int r32/mem -> mm,imm8 */
MMOSH, /* Prefixable MMX mm,imm8 */
MM, /* MMX/SIMD-Int mm/mem -> mm */
@@ -183,12 +191,19 @@ enum {
XMMOM, /* Prefixable SIMD xmm -> mem */
XMMOMS, /* Prefixable SIMD mem -> xmm */
XMM, /* SIMD xmm/mem -> xmm */
+ XMM_66r, /* SIMD 0x66 prefix required xmm/mem -> xmm */
+ XMM_66o, /* SIMD 0x66 prefix optional xmm/mem -> xmm */
XMMXIMPL, /* SIMD xmm -> xmm (mem) */
XMM3P, /* SIMD xmm -> r32,imm8 */
+ XMM3PM_66r, /* SIMD 0x66 prefix required xmm -> r32/mem,imm8 */
XMMP, /* SIMD xmm/mem w/to xmm,imm8 */
+ XMMP_66o, /* SIMD 0x66 prefix optional xmm/mem w/to xmm,imm8 */
+ XMMP_66r, /* SIMD 0x66 prefix required xmm/mem w/to xmm,imm8 */
XMMPRM, /* SIMD r32/mem -> xmm,imm8 */
+ XMMPRM_66r, /* SIMD 0x66 prefix required r32/mem -> xmm,imm8 */
XMMS, /* SIMD xmm -> xmm/mem */
XMMM, /* SIMD mem -> xmm */
+ XMMM_66r, /* SIMD 0x66 prefix required mem -> xmm */
XMMMS, /* SIMD xmm -> mem */
XMM3MX, /* SIMD r32/mem -> xmm */
XMM3MXS, /* SIMD xmm -> r32/mem */
@@ -198,6 +213,8 @@ enum {
XMMXMM, /* SIMD xmm/mem -> mm */
XMMMX, /* SIMD mm -> xmm */
XMMXM, /* SIMD xmm -> mm */
+ XMMX2I, /* SIMD xmm -> xmm, imm, imm */
+ XMM2I, /* SIMD xmm, imm, imm */
XMMFENCE, /* SIMD lfence or mfence */
XMMSFNC /* SIMD sfence (none or mem) */
};
@@ -454,7 +471,7 @@ const instable_t dis_op0F00[8] = {
*/
const instable_t dis_op0F01[8] = {
-/* [0] */ TNSZ("sgdt",MO,6), TNSZ("sidt",MO,6), TNSZ("lgdt",MO,6), TNSZ("lidt",MO,6),
+/* [0] */ TNSZ("sgdt",MO,6), TNSZ("sidt",MONITOR_MWAIT,6), TNSZ("lgdt",MO,6), TNSZ("lidt",MO,6),
/* [4] */ TNSZ("smsw",M,2), INVALID, TNSZ("lmsw",M,2), TNS("invlpg",SWAPGS),
};
@@ -591,7 +608,7 @@ const instable_t dis_opSIMDdata16[256] = {
/* [70] */ TNSZ("pshufd",XMMP,16), INVALID, INVALID, INVALID,
/* [74] */ TNSZ("pcmpeqb",XMM,16), TNSZ("pcmpeqw",XMM,16), TNSZ("pcmpeqd",XMM,16), INVALID,
-/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ TNSZ("extrq",XMM2I,16), TNSZ("extrq",XMM,16), INVALID, INVALID,
/* [7C] */ INVALID, INVALID, TNSZ("movd",XMM3MXS,4), TNSZ("movdqa",XMMS,16),
/* [80] */ INVALID, INVALID, INVALID, INVALID,
@@ -651,7 +668,7 @@ const instable_t dis_opSIMDrepnz[256] = {
/* [20] */ INVALID, INVALID, INVALID, INVALID,
/* [24] */ INVALID, INVALID, INVALID, INVALID,
-/* [28] */ INVALID, INVALID, TNSZ("cvtsi2sd",XMM3MX,4),INVALID,
+/* [28] */ INVALID, INVALID, TNSZ("cvtsi2sd",XMM3MX,4),TNSZ("movntsd",XMMMS,8),
/* [2C] */ TNSZ("cvttsd2si",XMMXM3,8),TNSZ("cvtsd2si",XMMXM3,8),INVALID, INVALID,
/* [30] */ INVALID, INVALID, INVALID, INVALID,
@@ -676,7 +693,7 @@ const instable_t dis_opSIMDrepnz[256] = {
/* [70] */ TNSZ("pshuflw",XMMP,16),INVALID, INVALID, INVALID,
/* [74] */ INVALID, INVALID, INVALID, INVALID,
-/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ TNSZ("insertq",XMMX2I,16),TNSZ("insertq",XMM,8),INVALID, INVALID,
/* [7C] */ INVALID, INVALID, INVALID, INVALID,
/* [80] */ INVALID, INVALID, INVALID, INVALID,
@@ -736,7 +753,7 @@ const instable_t dis_opSIMDrepz[256] = {
/* [20] */ INVALID, INVALID, INVALID, INVALID,
/* [24] */ INVALID, INVALID, INVALID, INVALID,
-/* [28] */ INVALID, INVALID, TNSZ("cvtsi2ss",XMM3MX,4),INVALID,
+/* [28] */ INVALID, INVALID, TNSZ("cvtsi2ss",XMM3MX,4),TNSZ("movntss",XMMMS,4),
/* [2C] */ TNSZ("cvttss2si",XMMXM3,4),TNSZ("cvtss2si",XMMXM3,4),INVALID, INVALID,
/* [30] */ INVALID, INVALID, INVALID, INVALID,
@@ -781,8 +798,8 @@ const instable_t dis_opSIMDrepz[256] = {
/* [B0] */ INVALID, INVALID, INVALID, INVALID,
/* [B4] */ INVALID, INVALID, INVALID, INVALID,
-/* [B8] */ INVALID, INVALID, INVALID, INVALID,
-/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ TS("popcnt",MRw), INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, TS("lzcnt",MRw), INVALID, INVALID,
/* [C0] */ INVALID, INVALID, TNSZ("cmpss",XMMP,4), INVALID,
/* [C4] */ INVALID, INVALID, INVALID, INVALID,
@@ -805,6 +822,170 @@ const instable_t dis_opSIMDrepz[256] = {
/* [FC] */ INVALID, INVALID, INVALID, INVALID,
};
+const instable_t dis_op0F38[256] = {
+/* [00] */ TNSZ("pshufb",XMM_66o,16),TNSZ("phaddw",XMM_66o,16),TNSZ("phaddd",XMM_66o,16),TNSZ("phaddsw",XMM_66o,16),
+/* [04] */ TNSZ("pmaddubsw",XMM_66o,16),TNSZ("phsubw",XMM_66o,16), TNSZ("phsubd",XMM_66o,16),TNSZ("phsubsw",XMM_66o,16),
+/* [08] */ TNSZ("psignb",XMM_66o,16),TNSZ("psignw",XMM_66o,16),TNSZ("psignd",XMM_66o,16),TNSZ("pmulhrsw",XMM_66o,16),
+/* [0C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [10] */ TNSZ("pblendvb",XMM_66r,16),INVALID, INVALID, INVALID,
+/* [14] */ TNSZ("blendvps",XMM_66r,16),TNSZ("blendvpd",XMM_66r,16),INVALID, TNSZ("ptest",XMM_66r,16),
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ TNSZ("pabsb",XMM_66o,16),TNSZ("pabsw",XMM_66o,16),TNSZ("pabsd",XMM_66o,16),INVALID,
+
+/* [20] */ TNSZ("pmovsxbw",XMM_66r,16),TNSZ("pmovsxbd",XMM_66r,16),TNSZ("pmovsxbq",XMM_66r,16),TNSZ("pmovsxwd",XMM_66r,16),
+/* [24] */ TNSZ("pmovsxwq",XMM_66r,16),TNSZ("pmovsxdq",XMM_66r,16),INVALID, INVALID,
+/* [28] */ TNSZ("pmuldq",XMM_66r,16),TNSZ("pcmpeqq",XMM_66r,16),TNSZ("movntdqa",XMMM_66r,16),TNSZ("packusdw",XMM_66r,16),
+/* [2C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [30] */ TNSZ("pmovzxbw",XMM_66r,16),TNSZ("pmovzxbd",XMM_66r,16),TNSZ("pmovzxbq",XMM_66r,16),TNSZ("pmovzxwd",XMM_66r,16),
+/* [34] */ TNSZ("pmovzxwq",XMM_66r,16),TNSZ("pmovzxdq",XMM_66r,16),INVALID, TNSZ("pcmpgtq",XMM_66r,16),
+/* [38] */ TNSZ("pminsb",XMM_66r,16),TNSZ("pminsd",XMM_66r,16),TNSZ("pminuw",XMM_66r,16),TNSZ("pminud",XMM_66r,16),
+/* [3C] */ TNSZ("pmaxsb",XMM_66r,16),TNSZ("pmaxsd",XMM_66r,16),TNSZ("pmaxuw",XMM_66r,16),TNSZ("pmaxud",XMM_66r,16),
+
+/* [40] */ TNSZ("pmulld",XMM_66r,16),TNSZ("phminposuw",XMM_66r,16),INVALID, INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, INVALID, INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ INVALID, INVALID, INVALID, INVALID,
+/* [5C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [60] */ INVALID, INVALID, INVALID, INVALID,
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ INVALID, INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [8C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, INVALID, INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ INVALID, INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, INVALID, INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ TNS("crc32b",CRC32), TS("crc32",CRC32), INVALID, INVALID,
+/* [F4] */ INVALID, INVALID, INVALID, INVALID,
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
+const instable_t dis_op0F3A[256] = {
+/* [00] */ INVALID, INVALID, INVALID, INVALID,
+/* [04] */ INVALID, INVALID, INVALID, INVALID,
+/* [08] */ TNSZ("roundps",XMMP_66r,16),TNSZ("roundpd",XMMP_66r,16),TNSZ("roundss",XMMP_66r,16),TNSZ("roundsd",XMMP_66r,16),
+/* [0C] */ TNSZ("blendps",XMMP_66r,16),TNSZ("blendpd",XMMP_66r,16),TNSZ("pblendw",XMMP_66r,16),TNSZ("palignr",XMMP_66o,16),
+
+/* [10] */ INVALID, INVALID, INVALID, INVALID,
+/* [14] */ TNSZ("pextrb",XMM3PM_66r,8),TNSZ("pextrw",XMM3PM_66r,16),TSZ("pextr",XMM3PM_66r,16),TNSZ("extractps",XMM3PM_66r,16),
+/* [18] */ INVALID, INVALID, INVALID, INVALID,
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [20] */ TNSZ("pinsrb",XMMPRM_66r,8),TNSZ("insertps",XMMP_66r,16),TSZ("pinsr",XMMPRM_66r,16),INVALID,
+/* [24] */ INVALID, INVALID, INVALID, INVALID,
+/* [28] */ INVALID, INVALID, INVALID, INVALID,
+/* [2C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [30] */ INVALID, INVALID, INVALID, INVALID,
+/* [34] */ INVALID, INVALID, INVALID, INVALID,
+/* [38] */ INVALID, INVALID, INVALID, INVALID,
+/* [3C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [40] */ TNSZ("dpps",XMMP_66r,16),TNSZ("dppd",XMMP_66r,16),TNSZ("mpsadbw",XMMP_66r,16),INVALID,
+/* [44] */ INVALID, INVALID, INVALID, INVALID,
+/* [48] */ INVALID, INVALID, INVALID, INVALID,
+/* [4C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [50] */ INVALID, INVALID, INVALID, INVALID,
+/* [54] */ INVALID, INVALID, INVALID, INVALID,
+/* [58] */ INVALID, INVALID, INVALID, INVALID,
+/* [5C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [60] */ TNSZ("pcmpestrm",XMMP_66r,16),TNSZ("pcmpestri",XMMP_66r,16),TNSZ("pcmpistrm",XMMP_66r,16),TNSZ("pcmpistri",XMMP_66r,16),
+/* [64] */ INVALID, INVALID, INVALID, INVALID,
+/* [68] */ INVALID, INVALID, INVALID, INVALID,
+/* [6C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [70] */ INVALID, INVALID, INVALID, INVALID,
+/* [74] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [7C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [80] */ INVALID, INVALID, INVALID, INVALID,
+/* [84] */ INVALID, INVALID, INVALID, INVALID,
+/* [88] */ INVALID, INVALID, INVALID, INVALID,
+/* [8C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [90] */ INVALID, INVALID, INVALID, INVALID,
+/* [94] */ INVALID, INVALID, INVALID, INVALID,
+/* [98] */ INVALID, INVALID, INVALID, INVALID,
+/* [9C] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [A0] */ INVALID, INVALID, INVALID, INVALID,
+/* [A4] */ INVALID, INVALID, INVALID, INVALID,
+/* [A8] */ INVALID, INVALID, INVALID, INVALID,
+/* [AC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [B0] */ INVALID, INVALID, INVALID, INVALID,
+/* [B4] */ INVALID, INVALID, INVALID, INVALID,
+/* [B8] */ INVALID, INVALID, INVALID, INVALID,
+/* [BC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [C0] */ INVALID, INVALID, INVALID, INVALID,
+/* [C4] */ INVALID, INVALID, INVALID, INVALID,
+/* [C8] */ INVALID, INVALID, INVALID, INVALID,
+/* [CC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [D0] */ INVALID, INVALID, INVALID, INVALID,
+/* [D4] */ INVALID, INVALID, INVALID, INVALID,
+/* [D8] */ INVALID, INVALID, INVALID, INVALID,
+/* [DC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [E0] */ INVALID, INVALID, INVALID, INVALID,
+/* [E4] */ INVALID, INVALID, INVALID, INVALID,
+/* [E8] */ INVALID, INVALID, INVALID, INVALID,
+/* [EC] */ INVALID, INVALID, INVALID, INVALID,
+
+/* [F0] */ INVALID, INVALID, INVALID, INVALID,
+/* [F4] */ INVALID, INVALID, INVALID, INVALID,
+/* [F8] */ INVALID, INVALID, INVALID, INVALID,
+/* [FC] */ INVALID, INVALID, INVALID, INVALID,
+};
+
/*
* Decode table for 0x0F opcodes
*/
@@ -819,7 +1000,12 @@ const instable_t dis_op0F[16][16] = {
/* [10] */ TNSZ("movups",XMMO,16), TNSZ("movups",XMMOS,16),TNSZ("movlps",XMMO,8), TNSZ("movlps",XMMOS,8),
/* [14] */ TNSZ("unpcklps",XMMO,16),TNSZ("unpckhps",XMMO,16),TNSZ("movhps",XMMOM,8),TNSZ("movhps",XMMOMS,8),
/* [18] */ IND(dis_op0F18), INVALID, INVALID, INVALID,
+#if !defined(__APPLE__)
+/* [1C] */ INVALID, INVALID, INVALID, INVALID,
+#else
+/* Need to handle multi-byte NOP */
/* [1C] */ INVALID, INVALID, INVALID, TS("nop",Mw),
+#endif /* __APPLE __ */
}, {
/* [20] */ TSy("mov",SREG), TSy("mov",SREG), TSy("mov",SREG), TSy("mov",SREG),
/* [24] */ TSx("mov",SREG), INVALID, TSx("mov",SREG), INVALID,
@@ -848,7 +1034,7 @@ const instable_t dis_op0F[16][16] = {
}, {
/* [70] */ TNSZ("pshufw",MMOPM,8), TNS("psrXXX",MR), TNS("psrXXX",MR), TNS("psrXXX",MR),
/* [74] */ TNSZ("pcmpeqb",MMO,8), TNSZ("pcmpeqw",MMO,8), TNSZ("pcmpeqd",MMO,8), TNS("emms",NORM),
-/* [78] */ INVALID, INVALID, INVALID, INVALID,
+/* [78] */ TNS("INVALID",XMMO), TNS("INVALID",XMMO), INVALID, INVALID,
/* [7C] */ INVALID, INVALID, TNSZ("movd",MMOS,4), TNSZ("movq",MMOS,8),
}, {
/* [80] */ TNS("jo",D), TNS("jno",D), TNS("jb",D), TNS("jae",D),
@@ -868,7 +1054,7 @@ const instable_t dis_op0F[16][16] = {
}, {
/* [B0] */ TNS("cmpxchgb",RMw), TS("cmpxchg",RMw), TS("lss",MR), TS("btr",RMw),
/* [B4] */ TS("lfs",MR), TS("lgs",MR), TS("movzb",MOVZ), TNS("movzwl",MOVZ),
-/* [B8] */ INVALID, INVALID, IND(dis_op0FBA), TS("btc",RMw),
+/* [B8] */ TNS("INVALID",MRw), INVALID, IND(dis_op0FBA), TS("btc",RMw),
/* [BC] */ TS("bsf",MRw), TS("bsr",MRw), TS("movsb",MOVZ), TNS("movswl",MOVZ),
}, {
/* [C0] */ TNS("xaddb",XADDB), TS("xadd",RMw), TNSZ("cmpps",XMMOPM,16),TNS("movnti",RM),
@@ -1150,14 +1336,30 @@ const instable_t dis_distable[16][16] = {
/* [1,C] */ TNS("sbbb",IA), TS("sbb",IA), TSx("push",SEG), TSx("pop",SEG),
}, {
/* [2,0] */ TNS("andb",RMw), TS("and",RMw), TNS("andb",MRw), TS("and",MRw),
+#if !defined(__APPLE__)
/* [2,4] */ TNS("andb",IA), TS("and",IA), TNSx("%es:",OVERRIDE), TNSx("daa",NORM),
+#else
+/* [2,4] */ TNS("andb",IA), TS("and",IA), TNS("%es:",OVERRIDE), TNSx("daa",NORM),
+#endif /* __APPLE__ */
/* [2,8] */ TNS("subb",RMw), TS("sub",RMw), TNS("subb",MRw), TS("sub",MRw),
+#if !defined(__APPLE__)
/* [2,C] */ TNS("subb",IA), TS("sub",IA), TNSx("%cs:",OVERRIDE), TNSx("das",NORM),
+#else
+/* [2,C] */ TNS("subb",IA), TS("sub",IA), TNS("%cs:",OVERRIDE), TNSx("das",NORM),
+#endif /* __APPLE__ */
}, {
/* [3,0] */ TNS("xorb",RMw), TS("xor",RMw), TNS("xorb",MRw), TS("xor",MRw),
+#if !defined(__APPLE__)
/* [3,4] */ TNS("xorb",IA), TS("xor",IA), TNSx("%ss:",OVERRIDE), TNSx("aaa",NORM),
+#else
+/* [3,4] */ TNS("xorb",IA), TS("xor",IA), TNS("%ss:",OVERRIDE), TNSx("aaa",NORM),
+#endif /* __APPLE__ */
/* [3,8] */ TNS("cmpb",RMw), TS("cmp",RMw), TNS("cmpb",MRw), TS("cmp",MRw),
+#if !defined(__APPLE__)
/* [3,C] */ TNS("cmpb",IA), TS("cmp",IA), TNSx("%ds:",OVERRIDE), TNSx("aas",NORM),
+#else
+/* [3,C] */ TNS("cmpb",IA), TS("cmp",IA), TNS("%ds:",OVERRIDE), TNSx("aas",NORM),
+#endif /* __APPLE__ */
}, {
/* [4,0] */ TSx("inc",R), TSx("inc",R), TSx("inc",R), TSx("inc",R),
/* [4,4] */ TSx("inc",R), TSx("inc",R), TSx("inc",R), TSx("inc",R),
@@ -1243,9 +1445,6 @@ const instable_t dis_distable[16][16] = {
#define REX_X 0x02 /* high order bit extension of SIB index field */
#define REX_B 0x01 /* extends ModRM r_m, SIB base, or opcode reg */
-static uint_t opnd_size; /* SIZE16, SIZE32 or SIZE64 */
-static uint_t addr_size; /* SIZE16, SIZE32 or SIZE64 */
-
/*
* Even in 64 bit mode, usually only 4 byte immediate operands are supported.
*/
@@ -1344,6 +1543,7 @@ dtrace_get_modrm(dis86_t *x, uint_t *mode, uint_t *reg, uint_t *r_m)
static void
dtrace_rex_adjust(uint_t rex_prefix, uint_t mode, uint_t *reg, uint_t *r_m)
{
+#pragma unused (mode)
if (reg != NULL && r_m == NULL) {
if (rex_prefix & REX_B)
*reg += 8;
@@ -1365,8 +1565,8 @@ dtrace_imm_opnd(dis86_t *x, int wbit, int size, int opindex)
int byte;
int valsize;
- if (x->d86_numopnds < opindex + 1)
- x->d86_numopnds = opindex + 1;
+ if (x->d86_numopnds < (uint_t)opindex + 1)
+ x->d86_numopnds = (uint_t)opindex + 1;
switch (wbit) {
case BYTE_OPND:
@@ -1409,7 +1609,7 @@ dtrace_imm_opnd(dis86_t *x, int wbit, int size, int opindex)
}
/* Do sign extension */
if (x->d86_bytes[x->d86_len - 1] & 0x80) {
- for (; i < sizeof (uint64_t); i++)
+ for (; i < (int)sizeof (uint64_t); i++)
x->d86_opnd[opindex].d86_value |=
(uint64_t)0xff << (i * 8);
}
@@ -1446,6 +1646,8 @@ dtrace_check_override(dis86_t *x, int opindex)
(void) strlcat(x->d86_opnd[opindex].d86_prefix,
x->d86_seg_prefix, PFIXLEN);
}
+#else
+ #pragma unused (opindex)
#endif
x->d86_seg_prefix = NULL;
}
@@ -1472,10 +1674,12 @@ dtrace_get_operand(dis86_t *x, uint_t mode, uint_t r_m, int wbit, int opindex)
int dispsize; /* size of displacement in bytes */
#ifdef DIS_TEXT
char *opnd = x->d86_opnd[opindex].d86_opnd;
+#else
+ #pragma unused (wbit)
#endif
- if (x->d86_numopnds < opindex + 1)
- x->d86_numopnds = opindex + 1;
+ if (x->d86_numopnds < (uint_t)opindex + 1)
+ x->d86_numopnds = (uint_t)opindex + 1;
if (x->d86_error)
return;
@@ -1682,12 +1886,38 @@ dtrace_get_operand(dis86_t *x, uint_t mode, uint_t r_m, int wbit, int opindex)
/*
* Similar, but for 2 operands plus an immediate.
+ * vbit indicates direction
+ * 0 for "opcode imm, r, r_m" or
+ * 1 for "opcode imm, r_m, r"
*/
-#define THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, w2, immsize) { \
+#define THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, w2, immsize, vbit) { \
dtrace_get_modrm(x, &mode, ®, &r_m); \
dtrace_rex_adjust(rex_prefix, mode, ®, &r_m); \
- dtrace_get_operand(x, mode, r_m, wbit, 1); \
- dtrace_get_operand(x, REG_ONLY, reg, w2, 2); \
+ dtrace_get_operand(x, mode, r_m, wbit, 2-vbit); \
+ dtrace_get_operand(x, REG_ONLY, reg, w2, 1+vbit); \
+ dtrace_imm_opnd(x, wbit, immsize, 0); \
+}
+
+/*
+ * Similar, but for 2 operands plus two immediates.
+ */
+#define FOUROPERAND(x, mode, reg, r_m, rex_prefix, wbit, w2, immsize) { \
+ dtrace_get_modrm(x, &mode, ®, &r_m); \
+ dtrace_rex_adjust(rex_prefix, mode, ®, &r_m); \
+ dtrace_get_operand(x, mode, r_m, wbit, 2); \
+ dtrace_get_operand(x, REG_ONLY, reg, w2, 3); \
+ dtrace_imm_opnd(x, wbit, immsize, 1); \
+ dtrace_imm_opnd(x, wbit, immsize, 0); \
+}
+
+/*
+ * 1 operands plus two immediates.
+ */
+#define ONEOPERAND_TWOIMM(x, mode, reg, r_m, rex_prefix, wbit, immsize) { \
+ dtrace_get_modrm(x, &mode, ®, &r_m); \
+ dtrace_rex_adjust(rex_prefix, mode, ®, &r_m); \
+ dtrace_get_operand(x, mode, r_m, wbit, 2); \
+ dtrace_imm_opnd(x, wbit, immsize, 1); \
dtrace_imm_opnd(x, wbit, immsize, 0); \
}
@@ -1712,7 +1942,9 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
#else
#define NOMEM /* nothing */
#endif
- uint_t wbit; /* opcode wbit, 0 is 8 bit, !0 for opnd_size */
+ uint_t opnd_size; /* SIZE16, SIZE32 or SIZE64 */
+ uint_t addr_size; /* SIZE16, SIZE32 or SIZE64 */
+ uint_t wbit = 0; /* opcode wbit, 0 is 8 bit, !0 for opnd_size */
uint_t w2; /* wbit value for second operand */
uint_t vbit;
uint_t mode = 0; /* mode value from ModRM byte */
@@ -1739,6 +1971,8 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
uint_t rex_prefix = 0; /* amd64 register extension prefix */
size_t off;
+ instable_t dp_mmx;
+
x->d86_len = 0;
x->d86_rmindex = -1;
x->d86_error = 0;
@@ -1746,7 +1980,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
x->d86_numopnds = 0;
x->d86_seg_prefix = NULL;
x->d86_mnem[0] = 0;
- for (i = 0; i < 3; ++i) {
+ for (i = 0; i < 4; ++i) {
x->d86_opnd[i].d86_opnd[0] = 0;
x->d86_opnd[i].d86_prefix[0] = 0;
x->d86_opnd[i].d86_value_size = 0;
@@ -1779,6 +2013,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
x->d86_check_func != NULL && x->d86_check_func(x->d86_data)) {
#ifdef DIS_TEXT
(void) strncpy(x->d86_mnem, ".byte\t0", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
#endif
goto done;
}
@@ -1891,6 +2126,76 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
dp = (instable_t *)&dis_op0F7123[opcode5][subcode];
} else if ((opcode4 == 0xc) && (opcode5 >= 0x8)) {
dp = (instable_t *)&dis_op0FC8[0];
+ } else if ((opcode4 == 0x3) && (opcode5 == 0xA)) {
+ opcode_bytes = 3;
+ if (dtrace_get_opcode(x, &opcode6, &opcode7) != 0)
+ goto error;
+ if (opnd_size == SIZE16)
+ opnd_size = SIZE32;
+
+ dp = (instable_t *)&dis_op0F3A[(opcode6<<4)|opcode7];
+#ifdef DIS_TEXT
+ if (LIT_STRNEQL(dp->it_name, "INVALID"))
+ goto error;
+#endif
+ switch (dp->it_adrmode) {
+ case XMMP_66r:
+ case XMMPRM_66r:
+ case XMM3PM_66r:
+ if (opnd_size_prefix == 0) {
+ goto error;
+ }
+ break;
+ case XMMP_66o:
+ if (opnd_size_prefix == 0) {
+ /* SSSE3 MMX instructions */
+ dp_mmx = *dp;
+ dp = &dp_mmx;
+ dp->it_adrmode = MMOPM_66o;
+#ifdef DIS_MEM
+ dp->it_size = 8;
+#endif
+ }
+ break;
+ default:
+ goto error;
+ }
+ } else if ((opcode4 == 0x3) && (opcode5 == 0x8)) {
+ opcode_bytes = 3;
+ if (dtrace_get_opcode(x, &opcode6, &opcode7) != 0)
+ goto error;
+ dp = (instable_t *)&dis_op0F38[(opcode6<<4)|opcode7];
+#ifdef DIS_TEXT
+ if (LIT_STRNEQL(dp->it_name, "INVALID"))
+ goto error;
+#endif
+ switch (dp->it_adrmode) {
+ case XMM_66r:
+ case XMMM_66r:
+ if (opnd_size_prefix == 0) {
+ goto error;
+ }
+ break;
+ case XMM_66o:
+ if (opnd_size_prefix == 0) {
+ /* SSSE3 MMX instructions */
+ dp_mmx = *dp;
+ dp = &dp_mmx;
+ dp->it_adrmode = MM;
+#ifdef DIS_MEM
+ dp->it_size = 8;
+#endif
+ }
+ break;
+ case CRC32:
+ if (rep_prefix != 0xF2) {
+ goto error;
+ }
+ rep_prefix = 0;
+ break;
+ default:
+ goto error;
+ }
} else {
dp = (instable_t *)&dis_op0F[opcode4][opcode5];
}
@@ -1940,8 +2245,8 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
/*
* at this point we should have a correct (or invalid) opcode
*/
- if (cpu_mode == SIZE64 && dp->it_invalid64 ||
- cpu_mode != SIZE64 && dp->it_invalid32)
+ if ((cpu_mode == SIZE64 && dp->it_invalid64) ||
+ (cpu_mode != SIZE64 && dp->it_invalid32))
goto error;
if (dp->it_indirect != TERM)
goto error;
@@ -2033,6 +2338,27 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
opnd_size = SIZE32;
}
break;
+ case MRw:
+ if (rep_prefix) {
+ if (rep_prefix == 0xf3) {
+
+ /*
+ * Calculate our offset in dis_op0F
+ */
+ if ((uintptr_t)dp - (uintptr_t)dis_op0F
+ > sizeof (dis_op0F))
+ goto error;
+
+ off = ((uintptr_t)dp - (uintptr_t)dis_op0F) /
+ sizeof (instable_t);
+
+ dp = (instable_t *)&dis_opSIMDrepz[off];
+ rep_prefix = 0;
+ } else {
+ goto error;
+ }
+ }
+ break;
}
/*
@@ -2061,7 +2387,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
if (dp->it_adrmode != CBW &&
dp->it_adrmode != CWD &&
dp->it_adrmode != XMMSFNC) {
- if (strcmp(dp->it_name, "INVALID") == 0)
+ if (LIT_STRNEQL(dp->it_name, "INVALID"))
goto error;
(void) strlcat(x->d86_mnem, dp->it_name, OPLEN);
if (dp->it_suffix) {
@@ -2073,6 +2399,13 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
break;
}
x->d86_mnem[i - 1] = *types[opnd_size];
+ } else if ((opnd_size == 2) && (opcode_bytes == 3) &&
+ ((opcode6 == 1 && opcode7 == 6) ||
+ (opcode6 == 2 && opcode7 == 2))) {
+ /*
+ * To handle PINSRD and PEXTRD
+ */
+ (void) strlcat(x->d86_mnem, "d", OPLEN);
} else {
(void) strlcat(x->d86_mnem, types[opnd_size],
OPLEN);
@@ -2096,8 +2429,10 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
*/
case MOVSXZ:
#ifdef DIS_TEXT
- if (rex_prefix == 0)
+ if (rex_prefix == 0) {
(void) strncpy(x->d86_mnem, "movzld", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
+ }
#endif
dtrace_get_modrm(x, &mode, ®, &r_m);
dtrace_rex_adjust(rex_prefix, mode, ®, &r_m);
@@ -2126,6 +2461,20 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
wbit = WBIT(opcode5);
dtrace_get_operand(x, mode, r_m, wbit, 0);
break;
+ case CRC32:
+ opnd_size = SIZE32;
+ if (rex_prefix & REX_W)
+ opnd_size = SIZE64;
+ x->d86_opnd_size = opnd_size;
+
+ dtrace_get_modrm(x, &mode, ®, &r_m);
+ dtrace_rex_adjust(rex_prefix, mode, ®, &r_m);
+ dtrace_get_operand(x, REG_ONLY, reg, LONG_OPND, 1);
+ wbit = WBIT(opcode7);
+ if (opnd_size_prefix)
+ x->d86_opnd_size = opnd_size = SIZE16;
+ dtrace_get_operand(x, mode, r_m, wbit, 0);
+ break;
/*
* imul instruction, with either 8-bit or longer immediate
@@ -2134,7 +2483,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
case IMUL:
wbit = LONG_OPND;
THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, LONG_OPND,
- OPSIZE(opnd_size, opcode2 == 0x9));
+ OPSIZE(opnd_size, opcode2 == 0x9), 1);
break;
/* memory or register operand to register, with 'w' bit */
@@ -2163,7 +2512,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
case MMS:
case MMOS:
#ifdef DIS_TEXT
- wbit = strcmp(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
+ wbit = !LIT_STRNEQL(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
#else
wbit = LONG_OPND;
#endif
@@ -2325,6 +2674,7 @@ just_mem:
if (cpu_mode == SIZE64 && mode == 3 && r_m == 0) {
#ifdef DIS_TEXT
(void) strncpy(x->d86_mnem, "swapgs", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
#endif
NOMEM;
break;
@@ -2346,6 +2696,28 @@ just_mem:
wbit = BYTE_OPND;
goto just_mem;
+ case MONITOR_MWAIT:
+ if (mode == 3) {
+ if (r_m == 0) {
+#ifdef DIS_TEXT
+ (void) strncpy(x->d86_mnem, "monitor", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
+#endif
+ NOMEM;
+ break;
+ } else if (r_m == 1) {
+#ifdef DIS_TEXT
+ (void) strncpy(x->d86_mnem, "mwait", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
+#endif
+ NOMEM;
+ break;
+ } else {
+ goto error;
+ }
+ }
+ /*FALLTHROUGH*/
+
case MO:
/* Similar to M, but only memory (no direct registers) */
wbit = LONG_OPND;
@@ -2451,7 +2823,7 @@ just_mem:
case MM:
case MMO:
#ifdef DIS_TEXT
- wbit = strcmp(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
+ wbit = !LIT_STRNEQL(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
#else
wbit = LONG_OPND;
#endif
@@ -2460,7 +2832,7 @@ just_mem:
case MMOIMPL:
#ifdef DIS_TEXT
- wbit = strcmp(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
+ wbit = !LIT_STRNEQL(dp->it_name, "movd") ? MM_OPND : LONG_OPND;
#else
wbit = LONG_OPND;
#endif
@@ -2485,24 +2857,32 @@ xmm3p:
if (mode != REG_ONLY)
goto error;
- THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, LONG_OPND, 1);
+ THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, LONG_OPND, 1,
+ 1);
NOMEM;
break;
+ case XMM3PM_66r:
+ THREEOPERAND(x, mode, reg, r_m, rex_prefix, LONG_OPND, XMM_OPND,
+ 1, 0);
+ break;
+
/* MMX/SIMD-Int predicated r32/mem to mm reg */
case MMOPRM:
wbit = LONG_OPND;
w2 = MM_OPND;
goto xmmprm;
case XMMPRM:
+ case XMMPRM_66r:
wbit = LONG_OPND;
w2 = XMM_OPND;
xmmprm:
- THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, w2, 1);
+ THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, w2, 1, 1);
break;
/* MMX/SIMD-Int predicated mm/mem to mm reg */
case MMOPM:
+ case MMOPM_66o:
wbit = w2 = MM_OPND;
goto xmmprm;
@@ -2518,6 +2898,8 @@ xmmprm:
/* SIMD memory or xmm reg operand to xmm reg */
case XMM:
+ case XMM_66o:
+ case XMM_66r:
case XMMO:
case XMMXIMPL:
wbit = XMM_OPND;
@@ -2533,10 +2915,13 @@ xmmprm:
* movhps and movlhps behave similarly.
*/
if (mode == REG_ONLY) {
- if (strcmp(dp->it_name, "movlps") == 0)
+ if (LIT_STRNEQL(dp->it_name, "movlps"))
(void) strncpy(x->d86_mnem, "movhlps", OPLEN);
- else if (strcmp(dp->it_name, "movhps") == 0)
+ x->d86_mnem[OPLEN - 1] = '\0';
+ } else if (LIT_STRNEQL(dp->it_name, "movhps")) {
(void) strncpy(x->d86_mnem, "movlhps", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
+ }
}
#endif
if (dp->it_adrmode == XMMXIMPL)
@@ -2550,9 +2935,9 @@ xmmprm:
case XMMOMS:
dtrace_get_modrm(x, &mode, ®, &r_m);
#ifdef DIS_TEXT
- if ((strcmp(dp->it_name, "movlps") == 0 ||
- strcmp(dp->it_name, "movhps") == 0 ||
- strcmp(dp->it_name, "movntps") == 0) &&
+ if ((LIT_STRNEQL(dp->it_name, "movlps") ||
+ LIT_STRNEQL(dp->it_name, "movhps") ||
+ LIT_STRNEQL(dp->it_name, "movntps")) &&
mode == REG_ONLY)
goto error;
#endif
@@ -2562,14 +2947,16 @@ xmmprm:
/* SIMD memory to xmm reg */
case XMMM:
+ case XMMM_66r:
case XMMOM:
wbit = XMM_OPND;
dtrace_get_modrm(x, &mode, ®, &r_m);
#ifdef DIS_TEXT
if (mode == REG_ONLY) {
- if (strcmp(dp->it_name, "movhps") == 0)
+ if (LIT_STRNEQL(dp->it_name, "movhps")) {
(void) strncpy(x->d86_mnem, "movlhps", OPLEN);
- else
+ x->d86_mnem[OPLEN - 1] = '\0';
+ } else
goto error;
}
#endif
@@ -2624,9 +3011,12 @@ xmmprm:
/* SIMD predicated memory or xmm reg with/to xmm reg */
case XMMP:
+ case XMMP_66r:
+ case XMMP_66o:
case XMMOPM:
wbit = XMM_OPND;
- THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, XMM_OPND, 1);
+ THREEOPERAND(x, mode, reg, r_m, rex_prefix, wbit, XMM_OPND, 1,
+ 1);
#ifdef DIS_TEXT
/*
@@ -2645,6 +3035,7 @@ xmmprm:
goto error;
(void) strncpy(x->d86_mnem, "cmp", OPLEN);
+ x->d86_mnem[OPLEN - 1] = '\0';
(void) strlcat(x->d86_mnem, dis_PREDSUFFIX[pred],
OPLEN);
(void) strlcat(x->d86_mnem,
@@ -2657,6 +3048,17 @@ xmmprm:
#endif
break;
+ case XMMX2I:
+ FOUROPERAND(x, mode, reg, r_m, rex_prefix, XMM_OPND, XMM_OPND,
+ 1);
+ NOMEM;
+ break;
+
+ case XMM2I:
+ ONEOPERAND_TWOIMM(x, mode, reg, r_m, rex_prefix, XMM_OPND, 1);
+ NOMEM;
+ break;
+
/* immediate operand to accumulator */
case IA:
wbit = WBIT(opcode2);
@@ -3270,8 +3672,8 @@ dtrace_disx86_str(dis86_t *dis, uint_t mode, uint64_t pc, char *buf,
lookup = dis->d86_sym_lookup;
if (tgt != 0) {
- /* Print symbol, if found, for tgt */
- if (lookup(dis->d86_data, tgt, NULL, 0) == 0) {
+ if ((dis->d86_flags & DIS_F_NOIMMSYM) == 0 &&
+ lookup(dis->d86_data, tgt, NULL, 0) == 0) {
(void) strlcat(buf, "\t<", buflen);
curlen = strlen(buf);
lookup(dis->d86_data, tgt, buf + curlen,