Fixed build without AVX512 and KNC

closes #72
zyantific · Nov 8, 2018 · 805f5e9 · 805f5e9
1 parent 339c5e7
commit 805f5e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Generated/DecoderTables.inc b/src/Generated/DecoderTables.inc
@@ -5662,7 +5662,7 @@ const ZydisDecoderTreeNode FILTERS_REX_B[][2] =
     { ZYDIS_DEFINITION(0x0, 0x39D), ZYDIS_DEFINITION(0x0, 0x73C) }
 };
 
-#ifndef ZYDIS_DISABLE_EVEX
+#ifndef ZYDIS_DISABLE_AVX512
 const ZydisDecoderTreeNode FILTERS_EVEX_B[][2] =
 {
     { ZYDIS_FILTER(ZYDIS_NODETYPE_FILTER_VECTOR_LENGTH, 0x0), ZYDIS_INVALID }, 
@@ -6606,7 +6606,7 @@ const ZydisDecoderTreeNode FILTERS_EVEX_B[][2] =
 };
 #endif
 
-#ifndef ZYDIS_DISABLE_MVEX
+#ifndef ZYDIS_DISABLE_KNC
 const ZydisDecoderTreeNode FILTERS_MVEX_E[][2] =
 {
     { ZYDIS_DEFINITION(0x1, 0xC7), ZYDIS_DEFINITION(0x1, 0xC8) }, 

diff --git a/src/Generated/InstructionDefinitions.inc b/src/Generated/InstructionDefinitions.inc
@@ -3757,7 +3757,7 @@ const ZydisInstructionDefinitionVEX ISTR_DEFINITIONS_VEX[] =
     { ZYDIS_MNEMONIC_VZEROUPPER ZYDIS_NOTMIN(0) ZYDIS_NOTMIN(0x0), 0, 0 ZYDIS_NOTMIN(0x0), ZYAN_FALSE ZYDIS_NOTMIN(ZYDIS_CATEGORY_AVX) ZYDIS_NOTMIN(ZYDIS_ISA_SET_AVX) ZYDIS_NOTMIN(ZYDIS_ISA_EXT_AVX) ZYDIS_NOTMIN(ZYDIS_BRANCH_TYPE_NONE) ZYDIS_NOTMIN(ZYDIS_EXCEPTION_CLASS_AVX8), ZYDIS_REG_CONSTRAINTS_UNUSED, ZYDIS_REG_CONSTRAINTS_UNUSED ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_WRITE), ZYDIS_REG_CONSTRAINTS_UNUSED, ZYAN_FALSE ZYDIS_NOTMIN(ZYDIS_VEX_STATIC_BROADCAST_NONE) }
 };
 
-#ifndef ZYDIS_DISABLE_EVEX
+#ifndef ZYDIS_DISABLE_AVX512
 const ZydisInstructionDefinitionEVEX ISTR_DEFINITIONS_EVEX[] =
 {
     { ZYDIS_MNEMONIC_V4FMADDPS ZYDIS_NOTMIN(4) ZYDIS_NOTMIN(0x7A2), 0, 0 ZYDIS_NOTMIN(0x0), ZYAN_FALSE ZYDIS_NOTMIN(ZYDIS_CATEGORY_AVX512_4FMAPS) ZYDIS_NOTMIN(ZYDIS_ISA_SET_AVX512_4FMAPS_512) ZYDIS_NOTMIN(ZYDIS_ISA_EXT_AVX512EVEX) ZYDIS_NOTMIN(ZYDIS_BRANCH_TYPE_NONE) ZYDIS_NOTMIN(ZYDIS_EXCEPTION_CLASS_E2), ZYDIS_REG_CONSTRAINTS_NONE, ZYDIS_REG_CONSTRAINTS_NONE ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE), ZYDIS_REG_CONSTRAINTS_NONE, ZYAN_FALSE ZYDIS_NOTMIN(ZYDIS_IVECTOR_LENGTH_DEFAULT) ZYDIS_NOTMIN(ZYDIS_TUPLETYPE_T1_4X) ZYDIS_NOTMIN(ZYDIS_IELEMENT_SIZE_32) ZYDIS_NOTMIN(ZYDIS_EVEX_FUNC_INVALID), ZYDIS_MASK_POLICY_ALLOWED, ZYAN_TRUE ZYDIS_NOTMIN(ZYDIS_MASK_OVERRIDE_DEFAULT) ZYDIS_NOTMIN(ZYDIS_EVEX_STATIC_BROADCAST_NONE) }, 
@@ -6785,7 +6785,7 @@ const ZydisInstructionDefinitionEVEX ISTR_DEFINITIONS_EVEX[] =
 };
 #endif
 
-#ifndef ZYDIS_DISABLE_MVEX
+#ifndef ZYDIS_DISABLE_KNC
 const ZydisInstructionDefinitionMVEX ISTR_DEFINITIONS_MVEX[] =
 {
     { ZYDIS_MNEMONIC_CLEVICT0 ZYDIS_NOTMIN(1) ZYDIS_NOTMIN(0x1A39), 0, 0 ZYDIS_NOTMIN(0x0), ZYAN_FALSE ZYDIS_NOTMIN(ZYDIS_CATEGORY_PREFETCH) ZYDIS_NOTMIN(ZYDIS_ISA_SET_KNCE) ZYDIS_NOTMIN(ZYDIS_ISA_EXT_KNCE) ZYDIS_NOTMIN(ZYDIS_BRANCH_TYPE_NONE) ZYDIS_NOTMIN(ZYDIS_EXCEPTION_CLASS_NONE), ZYDIS_REG_CONSTRAINTS_UNUSED, ZYDIS_REG_CONSTRAINTS_NONE ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE) ZYDIS_NOTMIN(ZYDIS_RW_ACTION_NONE), ZYDIS_REG_CONSTRAINTS_UNUSED, ZYAN_FALSE, ZYDIS_MVEX_FUNC_F_64, ZYDIS_MASK_POLICY_INVALID ZYDIS_NOTMIN(ZYAN_FALSE) ZYDIS_NOTMIN(ZYDIS_MVEX_STATIC_BROADCAST_NONE) },