Fixed MVEX tests

mappzor · mappzor · commit 5d9e375d5a9e · 2024-10-17T17:14:46.000+02:00
diff --git a/src/SharedData.c b/src/SharedData.c
@@ -133,7 +133,7 @@ void ZydisGetElementInfo(ZydisInternalElementType element, ZydisElementType* typ
     {
         ZydisElementType type;
         ZydisElementSize size;
-    } lookup[ZYDIS_IELEMENT_TYPE_MAX_VALUE + 1] =
+    } lookup[] =
     {
         { ZYDIS_ELEMENT_TYPE_INVALID  ,   0 },
         { ZYDIS_ELEMENT_TYPE_INVALID  ,   0 },
@@ -166,7 +166,7 @@ void ZydisGetElementInfo(ZydisInternalElementType element, ZydisElementType* typ
         { ZYDIS_ELEMENT_TYPE_CC       ,   3 },
         { ZYDIS_ELEMENT_TYPE_CC       ,   5 }
     };
-
+    ZYAN_STATIC_ASSERT(ZYAN_ARRAY_LENGTH(lookup) == ZYDIS_IELEMENT_TYPE_MAX_VALUE + 1);
     ZYAN_ASSERT((ZyanUSize)element < ZYAN_ARRAY_LENGTH(lookup));
 
     *type = lookup[element].type;
diff --git a/tests/cases/default_038.in b/tests/cases/default_038.in
@@ -1 +1 @@
--64 3eff10
+-64 3eff10
diff --git a/tests/cases/default_039.in b/tests/cases/default_039.in
@@ -1 +1 @@
--64 3e2eff10
+-64 3e2eff10
diff --git a/tests/cases/default_040.in b/tests/cases/default_040.in
@@ -1 +1 @@
--64 2e3eff10
+-64 2e3eff10
diff --git a/tests/cases/default_041.in b/tests/cases/default_041.in
@@ -1 +1 @@
--32 3eff10
+-32 3eff10
diff --git a/tests/cases/default_042.in b/tests/cases/default_042.in
@@ -1 +1 @@
--32 3e2eff10
+-32 3e2eff10
diff --git a/tests/cases/default_043.in b/tests/cases/default_043.in
@@ -1 +1 @@
--32 2e3eff10
+-32 2e3eff10
diff --git a/tests/cases/jmp_far_16.in b/tests/cases/jmp_far_16.in
@@ -1 +1 @@
--32 669AADE44E6D
+-32 669AADE44E6D
diff --git a/tests/cases/jmp_far_32.in b/tests/cases/jmp_far_32.in
@@ -1 +1 @@
--32 9AADEADDE44E6D
+-32 9AADEADDE44E6D
diff --git a/tests/cases/mvex_000.in b/tests/cases/mvex_000.in
@@ -1 +1 @@
--64 627271ac45cf
+-knc -64 627271ac45cf
diff --git a/tests/cases/mvex_001.in b/tests/cases/mvex_001.in
@@ -1 +1 @@
--64 62c2e9159a19
+-knc -64 62c2e9159a19
diff --git a/tests/cases/mvex_002.in b/tests/cases/mvex_002.in
@@ -1 +1 @@
--64 6262191eb530
+-knc -64 6262191eb530
diff --git a/tests/cases/mvex_003.in b/tests/cases/mvex_003.in
@@ -1 +1 @@
--64 6251680c59f4
+-knc -64 6251680c59f4
diff --git a/tests/cases/mvex_004.in b/tests/cases/mvex_004.in
@@ -1 +1 @@
--64 6202719d9a528f
+-knc -64 6202719d9a528f
diff --git a/tests/cases/mvex_005.in b/tests/cases/mvex_005.in
@@ -1 +1 @@
--64 62a149fadb8ce932280891
+-knc -64 62a149fadb8ce932280891
diff --git a/tests/cases/mvex_006.in b/tests/cases/mvex_006.in
@@ -1 +1 @@
--64 6272891fbcf5
+-knc -64 6272891fbcf5
diff --git a/tests/cases/mvex_007.in b/tests/cases/mvex_007.in
@@ -1 +1 @@
--64 620241c46530
+-knc -64 620241c46530
diff --git a/tests/cases/mvex_008.in b/tests/cases/mvex_008.in
@@ -1 +1 @@
--64 6222794b3f56a7
+-knc -64 6222794b3f56a7
diff --git a/tests/cases/mvex_009.in b/tests/cases/mvex_009.in
@@ -1 +1 @@
--64 6272593eae37
+-knc -64 6272593eae37
diff --git a/tests/cases/mvex_010.in b/tests/cases/mvex_010.in
@@ -1 +1 @@
--64 62e16126fa457b
+-knc -64 62e16126fa457b
diff --git a/tests/cases/mvex_011.in b/tests/cases/mvex_011.in
@@ -1 +1 @@
--64 6202b120526c83be
+-knc -64 6202b120526c83be
diff --git a/tests/cases/mvex_012.in b/tests/cases/mvex_012.in
@@ -1 +1 @@
--64 6202013ecc7ec5
+-knc -64 6202013ecc7ec5
diff --git a/tests/cases/mvex_013.in b/tests/cases/mvex_013.in
@@ -1 +1 @@
--64 62c2392d3b83c176fcab
+-knc -64 62c2392d3b83c176fcab
diff --git a/tests/cases/mvex_014.in b/tests/cases/mvex_014.in
@@ -1 +1 @@
--64 62d261b2b5fe
+-knc -64 62d261b2b5fe
diff --git a/tests/cases/mvex_015.in b/tests/cases/mvex_015.in
@@ -1 +1 @@
--64 625201719ae0
+-knc -64 625201719ae0
diff --git a/tests/cases/mvex_016.in b/tests/cases/mvex_016.in
@@ -1 +1 @@
--64 629168cfc2a34446843069
+-knc -64 629168cfc2a34446843069
diff --git a/tests/cases/mvex_017.in b/tests/cases/mvex_017.in
@@ -1 +1 @@
--64 62f2f12dbe6f9e
+-knc -64 62f2f12dbe6f9e
diff --git a/tests/cases/mvex_018.in b/tests/cases/mvex_018.in
@@ -1 +1 @@
--64 43656212414dcc14e0
+-knc -64 43656212414dcc14e0
diff --git a/tests/cases/mvex_019.in b/tests/cases/mvex_019.in
@@ -1 +1 @@
--64 62d261b2b4f8
+-knc -64 62d261b2b4f8
diff --git a/tests/cases/mvex_020.in b/tests/cases/mvex_020.in
@@ -1 +1 @@
--64 6262c1a1b880716ff709
+-knc -64 6262c1a1b880716ff709
diff --git a/tests/cases/mvex_021.in b/tests/cases/mvex_021.in
@@ -1 +1 @@
--64 62c2690f3d81bbade34d
+-knc -64 62c2690f3d81bbade34d
diff --git a/tests/cases/mvex_022.in b/tests/cases/mvex_022.in
@@ -1 +1 @@
--64 62e23915cdf2
+-knc -64 62e23915cdf2
diff --git a/tests/cases/mvex_023.in b/tests/cases/mvex_023.in
@@ -1 +1 @@
--64 628279f065a7701808b4
+-knc -64 628279f065a7701808b4
diff --git a/tests/cases/mvex_024.in b/tests/cases/mvex_024.in
@@ -1 +1 @@
--64 62e1612bdbd3
+-knc -64 62e1612bdbd3
diff --git a/tests/cases/mvex_025.in b/tests/cases/mvex_025.in
@@ -1 +1 @@
--64 62F279585000
+-knc -64 62F279585000
diff --git a/tests/cases/mvex_026.in b/tests/cases/mvex_026.in
@@ -1 +1 @@
--64 62F271E950C2
+-knc -64 62F271E950C2
diff --git a/tests/cases/vexc4_025.in b/tests/cases/vexc4_025.in
@@ -1 +1 @@
--64 C4E25A5EDE
+-64 C4E25A5EDE
diff --git a/tests/cases/vexc4_026.in b/tests/cases/vexc4_026.in
@@ -1 +1 @@
--64 C4E24A5EDE
+-64 C4E24A5EDE
diff --git a/tests/cases/vexc4_027.in b/tests/cases/vexc4_027.in
@@ -1 +1 @@
--64 C4E25A5EF6
+-64 C4E25A5EF6
diff --git a/tests/crash_tool.py b/tests/crash_tool.py
@@ -128,7 +128,8 @@ def convert_enc_crash_to_json(crash, return_dict=False):
     evex_rounding = get_sanitized_enum(reader, ZydisRoundingMode)
     evex_sae = bool(reader.read_uint8())
     evex_zeroing_mask = bool(reader.read_uint8())
-    reader.read_bytes(2)
+    evex_no_flags = bool(reader.read_uint8())
+    evex_zero_upper = bool(reader.read_uint8())
     mvex_broadcast = get_sanitized_enum(reader, ZydisBroadcastMode)
     mvex_conversion = get_sanitized_enum(reader, ZydisConversionMode)
     mvex_rounding = get_sanitized_enum(reader, ZydisRoundingMode)
@@ -151,6 +152,8 @@ def convert_enc_crash_to_json(crash, return_dict=False):
             'rounding': evex_rounding.name,
             'sae': evex_sae,
             'zeroing_mask': evex_zeroing_mask,
+            'no_flags': evex_no_flags,
+            'zero_upper': evex_zero_upper,
         },
         'mvex': {
             'broadcast': mvex_broadcast.name,
@@ -170,13 +173,16 @@ def convert_re_enc_crash_to_json(crash, zydis_info, return_dict=False):
     reader = BinaryReader(crash)
     machine_mode = ZydisMachineMode(reader.read_uint32())
     stack_width = ZydisStackWidth(reader.read_uint32())
+    decoder_mode = reader.read_uint32()
     payload = reader.read_bytes().hex().upper()
     test_case = {
         'machine_mode': machine_mode.name,
         'stack_width': stack_width.name,
         'payload': payload,
         'description': get_disasm(zydis_info, machine_mode, stack_width, payload),
     }
+    if decoder_mode & ZYDIS_DECODER_MODE_KNC:
+        test_case['knc'] = True
     if return_dict:
         return test_case
     return to_json(test_case)
@@ -238,7 +244,8 @@ def convert_enc_json_to_crash(test_case_json, from_dict=False):
     writer.write_uint32(ZydisRoundingMode[test_case['evex']['rounding']])
     writer.write_uint8(int(test_case['evex']['sae']))
     writer.write_uint8(int(test_case['evex']['zeroing_mask']))
-    writer.write_padding(2)
+    writer.write_uint8(int(test_case['evex']['no_flags']))
+    writer.write_uint8(int(test_case['evex']['zero_upper']))
     writer.write_uint32(ZydisBroadcastMode[test_case['mvex']['broadcast']])
     writer.write_uint32(ZydisConversionMode[test_case['mvex']['conversion']])
     writer.write_uint32(ZydisRoundingMode[test_case['mvex']['rounding']])
@@ -257,6 +264,7 @@ def convert_re_enc_json_to_crash(test_case_json, from_dict=False):
     writer = BinaryWriter()
     writer.write_uint32(ZydisMachineMode[test_case['machine_mode']])
     writer.write_uint32(ZydisStackWidth[test_case['stack_width']])
+    writer.write_uint32(ZYDIS_DECODER_MODE_KNC if test_case.get('knc', False) else 0)
     writer.write_bytes(bytes.fromhex(test_case['payload']))
     return writer.get_data()
 
diff --git a/tests/enc_test_cases.json b/tests/enc_test_cases.json
diff --git a/tests/re_enc_test_cases.json b/tests/re_enc_test_cases.json
diff --git a/tests/zydis_encoder_types.py b/tests/zydis_encoder_types.py
diff --git a/tools/ZydisFuzzEncoder.c b/tools/ZydisFuzzEncoder.c
diff --git a/tools/ZydisFuzzReEncoding.c b/tools/ZydisFuzzReEncoding.c
diff --git a/tools/ZydisInfo.c b/tools/ZydisInfo.c

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--32 9AADEADDE44E6D`
	`1`	`+-32 9AADEADDE44E6D`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`--64 627271ac45cf`
	`1`	`+-knc -64 627271ac45cf`