diff options
| author | Julian Lettner <jlettner@apple.com> | 2019-07-05 18:00:12 +0000 |
|---|---|---|
| committer | Julian Lettner <jlettner@apple.com> | 2019-07-05 18:00:12 +0000 |
| commit | 6bb13da7c16f2a677cc285bb6ffeb79dfb0cfe64 (patch) | |
| tree | bd7da1b7876f6ded564778adbfd68116c236ac37 | |
| parent | bb65a38b564c20b8059b13be9ae338afe1b48ac6 (diff) | |
| download | bcm5719-llvm-6bb13da7c16f2a677cc285bb6ffeb79dfb0cfe64.tar.gz bcm5719-llvm-6bb13da7c16f2a677cc285bb6ffeb79dfb0cfe64.zip | |
[TSan] Improve handling of stack pointer mangling in {set,long}jmp, pt.4
For x86_64, since we don't clobber %rsi (2nd argument) anymore, we don't
have to save/restore it.
Reviewed By: dvyukov
Differential Revision: https://reviews.llvm.org/D63946
llvm-svn: 365229
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S index 5913aa360c5..3f9fa345583 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S @@ -271,30 +271,16 @@ ASM_SYMBOL_INTERCEPTOR(sigsetjmp): push %rdi CFI_ADJUST_CFA_OFFSET(8) CFI_REL_OFFSET(%rdi, 0) - // save savesigs parameter - push %rsi - CFI_ADJUST_CFA_OFFSET(8) - CFI_REL_OFFSET(%rsi, 0) - // align stack frame - sub $8, %rsp - CFI_ADJUST_CFA_OFFSET(8) // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)` #if defined(__FreeBSD__) || defined(__NetBSD__) - lea 24(%rsp), %rdi + lea 8(%rsp), %rdi #elif defined(__linux__) || defined(__APPLE__) - lea 32(%rsp), %rdi + lea 16(%rsp), %rdi #else # error "Unknown platform" #endif // call tsan interceptor call ASM_SYMBOL(__tsan_setjmp) - // unalign stack frame - add $8, %rsp - CFI_ADJUST_CFA_OFFSET(-8) - // restore savesigs parameter - pop %rsi - CFI_ADJUST_CFA_OFFSET(-8) - CFI_RESTORE(%rsi) // restore env parameter pop %rdi CFI_ADJUST_CFA_OFFSET(-8) @@ -327,28 +313,14 @@ ASM_SYMBOL_INTERCEPTOR(__sigsetjmp): push %rdi CFI_ADJUST_CFA_OFFSET(8) CFI_REL_OFFSET(%rdi, 0) - // save savesigs parameter - push %rsi - CFI_ADJUST_CFA_OFFSET(8) - CFI_REL_OFFSET(%rsi, 0) - // align stack frame - sub $8, %rsp - CFI_ADJUST_CFA_OFFSET(8) // obtain SP, store in %rdi, first argument to `void __tsan_setjmp(uptr sp)` #if defined(__FreeBSD__) - lea 24(%rsp), %rdi + lea 8(%rsp), %rdi #else - lea 32(%rsp), %rdi + lea 16(%rsp), %rdi #endif // call tsan interceptor call ASM_SYMBOL(__tsan_setjmp) - // unalign stack frame - add $8, %rsp - CFI_ADJUST_CFA_OFFSET(-8) - // restore savesigs parameter - pop %rsi - CFI_ADJUST_CFA_OFFSET(-8) - CFI_RESTORE(%rsi) // restore env parameter pop %rdi CFI_ADJUST_CFA_OFFSET(-8) |
