diff options
| -rw-r--r-- | compiler-rt/lib/interception/interception_win.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 42d53a6184f..ca3a3f5fd6a 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -121,6 +121,9 @@ static size_t RoundUpToInstrBoundary(size_t size, char *code) { case '\x57': // 57 : push rdi cursor++; continue; + case '\x90': // 90 : nop + cursor++; + continue; case '\xb8': // b8 XX XX XX XX : mov eax, XX XX XX XX cursor += 5; continue; @@ -168,6 +171,12 @@ static size_t RoundUpToInstrBoundary(size_t size, char *code) { continue; } + switch (*(unsigned int*)(code + cursor)) { + case 0x24448b48: // 48 8b 44 24 XX : mov rax, qword ptr [rsp + 0xXX] + cursor += 5; + continue; + } + // Check first 5 bytes. switch (0xFFFFFFFFFFull & *(unsigned long long*)(code + cursor)) { case 0x08245c8948: // 48 89 5c 24 08 : mov QWORD PTR [rsp+0x8], rbx @@ -176,6 +185,13 @@ static size_t RoundUpToInstrBoundary(size_t size, char *code) { continue; } + // Check 8 bytes. + switch (*(unsigned long long*)(code + cursor)) { + case 0x90909090909006EBull: // JMP +6, 6x NOP + cursor += 8; + continue; + } + // Unknown instructions! __debugbreak(); } |
