diff options
| author | Etienne Bergeron <etienneb@google.com> | 2016-07-14 22:14:33 +0000 |
|---|---|---|
| committer | Etienne Bergeron <etienneb@google.com> | 2016-07-14 22:14:33 +0000 |
| commit | 8fc1dca8f700e83657241d1d5206912fed0961df (patch) | |
| tree | 7d881e9b32b2bd67d4ddb0b1a5527c17f0c691a3 /compiler-rt/lib/interception | |
| parent | 7903382468802ecd7de6f255bfbde317b9dae711 (diff) | |
| download | bcm5719-llvm-8fc1dca8f700e83657241d1d5206912fed0961df.tar.gz bcm5719-llvm-8fc1dca8f700e83657241d1d5206912fed0961df.zip | |
[compiler-rt] Add more assembly patterns for interception
Summary:
These patterns are encounter when using instrumented DLL.
Without this patch, asan lit test are crashing when trying to hook
on RaiseException function.
Reviewers: rnk
Subscribers: llvm-commits, wang0109, chrisha
Differential Revision: https://reviews.llvm.org/D22340
llvm-svn: 275489
Diffstat (limited to 'compiler-rt/lib/interception')
| -rw-r--r-- | compiler-rt/lib/interception/interception_win.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 1db8ac481dd..8977d59ac4f 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -385,6 +385,11 @@ static uptr AllocateMemoryForTrampoline(uptr image_address, size_t size) { // Returns 0 on error. static size_t GetInstructionSize(uptr address) { + switch (*(u64*)address) { + case 0x90909090909006EB: // stub: jmp over 6 x nop. + return 8; + } + switch (*(u8*)address) { case 0x90: // 90 : nop return 1; @@ -499,7 +504,8 @@ static size_t GetInstructionSize(uptr address) { } switch (*(u32*)(address)) { - case 0x24448b48: // 48 8b 44 24 XX : mov rax, qword ptr [rsp + XX] + case 0x24448b48: // 48 8b 44 24 XX : mov rax, QWORD ptr [rsp + XX] + case 0x246c8948: // 48 89 6C 24 XX : mov QWORD ptr [rsp + XX], rbp case 0x245c8948: // 48 89 5c 24 XX : mov QWORD PTR [rsp + XX], rbx case 0x24748948: // 48 89 74 24 XX : mov QWORD PTR [rsp + XX], rsi return 5; |
