Fixes for MIB operands and jmpabs

mappzor · mappzor · commit d3a2711641cf · 2025-09-16T02:44:52.000+02:00
diff --git a/include/Zydis/Internal/EncoderData.h b/include/Zydis/Internal/EncoderData.h
@@ -218,7 +218,7 @@ typedef struct ZydisEncodableInstruction_
     /**
      * The vector length.
      */
-    ZyanU8 vector_length            ZYAN_BITFIELD(ZYDIS_MANDATORY_PREFIX_REQUIRED_BITS);
+    ZyanU8 vector_length            ZYAN_BITFIELD(ZYDIS_VECTOR_LENGTH_REQUIRED_BITS);
     /**
      * The accepted sizing hint.
      */
diff --git a/src/Encoder.c b/src/Encoder.c
@@ -2856,7 +2856,8 @@ static ZyanBool ZydisIsDefinitionCompatible(ZydisEncoderInstructionMatch *match,
     }
 
     ZyanU8 eosz = 0;
-    if (match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_NONE)
+    if ((match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_NONE) &&
+        (match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_ABSOLUTE))
     {
         switch (request->branch_width)
         {
@@ -3220,8 +3221,9 @@ static ZyanStatus ZydisFindMatchingDefinition(const ZydisEncoderRequest *request
         {
             continue;
         }
-        if ((base_definition->branch_type == ZYDIS_BRANCH_TYPE_NONE) &&
-            (request->branch_width != ZYDIS_BRANCH_WIDTH_NONE))
+        if (((base_definition->branch_type == ZYDIS_BRANCH_TYPE_NONE) ||
+             (base_definition->branch_type == ZYDIS_BRANCH_TYPE_ABSOLUTE)) &&
+             (request->branch_width != ZYDIS_BRANCH_WIDTH_NONE))
         {
             continue;
         }
@@ -4507,11 +4509,11 @@ static ZyanStatus ZydisEncoderCheckRequestSanity(const ZydisEncoderRequest *requ
     static const ZyanBool branch_lookup
         [ZYDIS_BRANCH_WIDTH_MAX_VALUE + 1][ZYDIS_BRANCH_TYPE_MAX_VALUE + 1] =
     {
-        /* NONE */ { ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_TRUE  },
-        /* 8    */ { ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE, ZYAN_FALSE },
-        /* 16   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE  },
-        /* 32   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE  },
-        /* 64   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE  },
+        /* NONE */ { ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE },
+        /* 8    */ { ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE, ZYAN_FALSE, ZYAN_FALSE },
+        /* 16   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE },
+        /* 32   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE },
+        /* 64   */ { ZYAN_TRUE,  ZYAN_FALSE, ZYAN_TRUE,  ZYAN_TRUE,  ZYAN_FALSE },
     };
     if (!branch_lookup[request->branch_width][request->branch_type])
     {
diff --git a/src/Generated/InstructionDefinitions.inc b/src/Generated/InstructionDefinitions.inc

Original file line number	Diff line number	Diff line change
`@@ -2856,7 +2856,8 @@ static ZyanBool ZydisIsDefinitionCompatible(ZydisEncoderInstructionMatch *match,`
`2856`	`2856`	`}`
`2857`	`2857`
`2858`	`2858`	`ZyanU8 eosz = 0;`
`2859`		`- if (match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_NONE)`
	`2859`	`+ if ((match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_NONE) &&`
	`2860`	`+ (match->base_definition->branch_type != ZYDIS_BRANCH_TYPE_ABSOLUTE))`
`2860`	`2861`	`{`
`2861`	`2862`	`switch (request->branch_width)`
`2862`	`2863`	`{`
`@@ -3220,8 +3221,9 @@ static ZyanStatus ZydisFindMatchingDefinition(const ZydisEncoderRequest *request`
`3220`	`3221`	`{`
`3221`	`3222`	`continue;`
`3222`	`3223`	`}`
`3223`		`- if ((base_definition->branch_type == ZYDIS_BRANCH_TYPE_NONE) &&`
`3224`		`- (request->branch_width != ZYDIS_BRANCH_WIDTH_NONE))`
	`3224`	`+ if (((base_definition->branch_type == ZYDIS_BRANCH_TYPE_NONE) \|\|`
	`3225`	`+ (base_definition->branch_type == ZYDIS_BRANCH_TYPE_ABSOLUTE)) &&`
	`3226`	`+ (request->branch_width != ZYDIS_BRANCH_WIDTH_NONE))`
`3225`	`3227`	`{`
`3226`	`3228`	`continue;`
`3227`	`3229`	`}`
`@@ -4507,11 +4509,11 @@ static ZyanStatus ZydisEncoderCheckRequestSanity(const ZydisEncoderRequest *requ`
`4507`	`4509`	`static const ZyanBool branch_lookup`
`4508`	`4510`	`[ZYDIS_BRANCH_WIDTH_MAX_VALUE + 1][ZYDIS_BRANCH_TYPE_MAX_VALUE + 1] =`
`4509`	`4511`	`{`
`4510`		`- /* NONE */ { ZYAN_TRUE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_TRUE },`
`4511`		`- /* 8 */ { ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE, ZYAN_FALSE },`
`4512`		`- /* 16 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE },`
`4513`		`- /* 32 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE },`
`4514`		`- /* 64 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE },`
	`4512`	`+ /* NONE */ { ZYAN_TRUE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE },`
	`4513`	`+ /* 8 */ { ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE, ZYAN_FALSE, ZYAN_FALSE },`
	`4514`	`+ /* 16 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE },`
	`4515`	`+ /* 32 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE },`
	`4516`	`+ /* 64 */ { ZYAN_TRUE, ZYAN_FALSE, ZYAN_TRUE, ZYAN_TRUE, ZYAN_FALSE },`
`4515`	`4517`	`};`
`4516`	`4518`	`if (!branch_lookup[request->branch_width][request->branch_type])`
`4517`	`4519`	`{`