Do not use ZYAN_ASSERT for user passed arguments

zyantific · Dec 21, 2021 · e5fa624 · e5fa624
1 parent 4756724
commit e5fa624
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 114 deletions.
diff --git a/include/Zydis/DecoderTypes.h b/include/Zydis/DecoderTypes.h
@@ -1253,9 +1253,11 @@ typedef struct ZydisDecodedInstruction_
 typedef struct ZydisDecoderContext_
 {
     /**
-     * A pointer to the internal instruction definition.
+     * The instruction definition id.
+     *
+     * Only valid in combination with the instruction encoding.
      */
-    const void* definition;
+    ZyanU16 definition_id;
     /**
      * Contains the effective operand-size index.
      *

diff --git a/include/Zydis/Internal/DecoderData.h b/include/Zydis/Internal/DecoderData.h
@@ -193,6 +193,9 @@ typedef struct ZydisDecoderTreeNode_
     ZydisDecoderTreeNodeValue value;
 } ZydisDecoderTreeNode;
 
+// See `ZydisDecoderContext.instruction_id` 
+ZYAN_STATIC_ASSERT(sizeof(ZydisDecoderTreeNodeValue) == sizeof(ZyanU16));
+
 /* ---------------------------------------------------------------------------------------------- */
 
 #pragma pack(pop)