Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed MVEX tests #529

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fixed MVEX tests #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/SharedData.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/cases/default_038.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 3eff10
-64 3eff10
2 changes: 1 addition & 1 deletion tests/cases/default_039.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 3e2eff10
-64 3e2eff10
2 changes: 1 addition & 1 deletion tests/cases/default_040.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 2e3eff10
-64 2e3eff10
2 changes: 1 addition & 1 deletion tests/cases/default_041.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-32 3eff10
-32 3eff10
2 changes: 1 addition & 1 deletion tests/cases/default_042.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-32 3e2eff10
-32 3e2eff10
2 changes: 1 addition & 1 deletion tests/cases/default_043.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-32 2e3eff10
-32 2e3eff10
2 changes: 1 addition & 1 deletion tests/cases/jmp_far_16.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-32 669AADE44E6D
-32 669AADE44E6D
2 changes: 1 addition & 1 deletion tests/cases/jmp_far_32.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-32 9AADEADDE44E6D
-32 9AADEADDE44E6D
2 changes: 1 addition & 1 deletion tests/cases/mvex_000.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 627271ac45cf
-knc -64 627271ac45cf
2 changes: 1 addition & 1 deletion tests/cases/mvex_001.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62c2e9159a19
-knc -64 62c2e9159a19
2 changes: 1 addition & 1 deletion tests/cases/mvex_002.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6262191eb530
-knc -64 6262191eb530
2 changes: 1 addition & 1 deletion tests/cases/mvex_003.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6251680c59f4
-knc -64 6251680c59f4
2 changes: 1 addition & 1 deletion tests/cases/mvex_004.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6202719d9a528f
-knc -64 6202719d9a528f
2 changes: 1 addition & 1 deletion tests/cases/mvex_005.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62a149fadb8ce932280891
-knc -64 62a149fadb8ce932280891
2 changes: 1 addition & 1 deletion tests/cases/mvex_006.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6272891fbcf5
-knc -64 6272891fbcf5
2 changes: 1 addition & 1 deletion tests/cases/mvex_007.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 620241c46530
-knc -64 620241c46530
2 changes: 1 addition & 1 deletion tests/cases/mvex_008.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6222794b3f56a7
-knc -64 6222794b3f56a7
2 changes: 1 addition & 1 deletion tests/cases/mvex_009.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6272593eae37
-knc -64 6272593eae37
2 changes: 1 addition & 1 deletion tests/cases/mvex_010.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62e16126fa457b
-knc -64 62e16126fa457b
2 changes: 1 addition & 1 deletion tests/cases/mvex_011.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6202b120526c83be
-knc -64 6202b120526c83be
2 changes: 1 addition & 1 deletion tests/cases/mvex_012.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6202013ecc7ec5
-knc -64 6202013ecc7ec5
2 changes: 1 addition & 1 deletion tests/cases/mvex_013.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62c2392d3b83c176fcab
-knc -64 62c2392d3b83c176fcab
2 changes: 1 addition & 1 deletion tests/cases/mvex_014.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62d261b2b5fe
-knc -64 62d261b2b5fe
2 changes: 1 addition & 1 deletion tests/cases/mvex_015.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 625201719ae0
-knc -64 625201719ae0
2 changes: 1 addition & 1 deletion tests/cases/mvex_016.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 629168cfc2a34446843069
-knc -64 629168cfc2a34446843069
2 changes: 1 addition & 1 deletion tests/cases/mvex_017.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62f2f12dbe6f9e
-knc -64 62f2f12dbe6f9e
2 changes: 1 addition & 1 deletion tests/cases/mvex_018.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 43656212414dcc14e0
-knc -64 43656212414dcc14e0
2 changes: 1 addition & 1 deletion tests/cases/mvex_019.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62d261b2b4f8
-knc -64 62d261b2b4f8
2 changes: 1 addition & 1 deletion tests/cases/mvex_020.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 6262c1a1b880716ff709
-knc -64 6262c1a1b880716ff709
2 changes: 1 addition & 1 deletion tests/cases/mvex_021.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62c2690f3d81bbade34d
-knc -64 62c2690f3d81bbade34d
2 changes: 1 addition & 1 deletion tests/cases/mvex_022.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62e23915cdf2
-knc -64 62e23915cdf2
2 changes: 1 addition & 1 deletion tests/cases/mvex_023.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 628279f065a7701808b4
-knc -64 628279f065a7701808b4
2 changes: 1 addition & 1 deletion tests/cases/mvex_024.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62e1612bdbd3
-knc -64 62e1612bdbd3
2 changes: 1 addition & 1 deletion tests/cases/mvex_025.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62F279585000
-knc -64 62F279585000
2 changes: 1 addition & 1 deletion tests/cases/mvex_026.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 62F271E950C2
-knc -64 62F271E950C2
2 changes: 1 addition & 1 deletion tests/cases/vexc4_025.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 C4E25A5EDE
-64 C4E25A5EDE
2 changes: 1 addition & 1 deletion tests/cases/vexc4_026.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 C4E24A5EDE
-64 C4E24A5EDE
2 changes: 1 addition & 1 deletion tests/cases/vexc4_027.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-64 C4E25A5EF6
-64 C4E25A5EF6
12 changes: 10 additions & 2 deletions tests/crash_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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']])
Expand All @@ -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()

Expand Down
Loading
Loading