Skip to content

Commit 56e5ed9

Browse files
committed
[win/asan] GetInstructionSize: Support some more 2 byte instructions.
This patch adds several instructions seen when trying to run a executable built with ASan with llvm-mingw. (x86 and x86_64, using the git tip in llvm-project). Also includes instructions collected by Roman Pišl and Eric Pouech in the Wine bug reports below. Related: #96270 Co-authored-by: Roman Pišl <[email protected]> https://bugs.winehq.org/show_bug.cgi?id=50993 https://bugs.winehq.org/attachment.cgi?id=70233 Co-authored-by: Eric Pouech <[email protected]> https://bugs.winehq.org/show_bug.cgi?id=52386 https://bugs.winehq.org/attachment.cgi?id=71626
1 parent 61e6a7f commit 56e5ed9

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

compiler-rt/lib/interception/interception_win.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,12 +624,17 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
624624
case 0xFF8B: // 8B FF : mov edi, edi
625625
case 0xEC8B: // 8B EC : mov ebp, esp
626626
case 0xc889: // 89 C8 : mov eax, ecx
627+
case 0xD189: // 89 D1 : mov ecx, edx
627628
case 0xE589: // 89 E5 : mov ebp, esp
628629
case 0xC18B: // 8B C1 : mov eax, ecx
630+
case 0xC031: // 31 C0 : xor eax, eax
631+
case 0xC931: // 31 C9 : xor ecx, ecx
632+
case 0xD231: // 31 D2 : xor edx, edx
629633
case 0xC033: // 33 C0 : xor eax, eax
630634
case 0xC933: // 33 C9 : xor ecx, ecx
631635
case 0xD233: // 33 D2 : xor edx, edx
632636
case 0xDB84: // 84 DB : test bl,bl
637+
case 0xC084: // 84 C0 : test al,al
633638
case 0xC984: // 84 C9 : test cl,cl
634639
case 0xD284: // 84 D2 : test dl,dl
635640
return 2;

compiler-rt/lib/interception/tests/interception_win_test.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,14 +864,19 @@ const struct InstructionSizeData {
864864
{ 1, {0x90}, 0, "90 : nop"},
865865
{ 1, {0xC3}, 0, "C3 : ret (for small/empty function interception"},
866866
{ 1, {0xCC}, 0, "CC : int 3 i.e. registering weak functions)"},
867+
{ 2, {0x31, 0xC0}, 0, "31 C0 : xor eax, eax"},
868+
{ 2, {0x31, 0xC9}, 0, "31 C9 : xor ecx, ecx"},
869+
{ 2, {0x31, 0xD2}, 0, "31 D2 : xor edx, edx"},
867870
{ 2, {0x33, 0xC0}, 0, "33 C0 : xor eax, eax"},
868871
{ 2, {0x33, 0xC9}, 0, "33 C9 : xor ecx, ecx"},
869872
{ 2, {0x33, 0xD2}, 0, "33 D2 : xor edx, edx"},
870873
{ 2, {0x6A, 0x71}, 0, "6A XX : push XX"},
874+
{ 2, {0x84, 0xC0}, 0, "84 C0 : test al,al"},
871875
{ 2, {0x84, 0xC9}, 0, "84 C9 : test cl,cl"},
872876
{ 2, {0x84, 0xD2}, 0, "84 D2 : test dl,dl"},
873877
{ 2, {0x84, 0xDB}, 0, "84 DB : test bl,bl"},
874878
{ 2, {0x89, 0xc8}, 0, "89 C8 : mov eax, ecx"},
879+
{ 2, {0x89, 0xD1}, 0, "89 D1 : mov ecx, edx"},
875880
{ 2, {0x89, 0xE5}, 0, "89 E5 : mov ebp, esp"},
876881
{ 2, {0x8A, 0x01}, 0, "8A 01 : mov al, byte ptr [ecx]"},
877882
{ 2, {0x8B, 0xC1}, 0, "8B C1 : mov eax, ecx"},

0 commit comments

Comments
 (0)