qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CFI info in x86-64 trampolines for non-AVX code

This commit is contained in:
Ulrich Drepper 2011-08-20 08:56:30 -04:00
parent 94d7165ffa
commit c88f17668b
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-20 Ulrich Drepper <drepper@gmail.com>
* sysdeps/x86_64/dl-trampoline.h: If MORE_CODE is defined, restore
the CFI state in the end.
* sysdeps/x86_64/dl-trampoline.S: Define MORE_CODE before first
inclusion of dl-trampoline.h.
Based on a patch by Jiri Olsa <jolsa@redhat.com>.
2011-08-19 Andreas Schwab <schwab@redhat.com> 2011-08-19 Andreas Schwab <schwab@redhat.com>
* sysdeps/powerpc/fpu/libm-test-ulps: Relax ctan (0.75 + 1.25 i) * sysdeps/powerpc/fpu/libm-test-ulps: Relax ctan (0.75 + 1.25 i)

5
sysdeps/x86_64/dl-trampoline.S
View File

@ -158,14 +158,15 @@ L(have_avx):
1: js L(no_avx) 1: js L(no_avx)
# define RESTORE_AVX # define RESTORE_AVX
# define MORE_CODE
# include "dl-trampoline.h" # include "dl-trampoline.h"
.align 16 .align 16
L(no_avx): L(no_avx):
# endif # endif
# undef RESTORE_AVX # undef RESTORE_AVX
# include "dl-trampoline.h" # include "dl-trampoline.h"
cfi_endproc cfi_endproc
.size _dl_runtime_profile, .-_dl_runtime_profile .size _dl_runtime_profile, .-_dl_runtime_profile

25
sysdeps/x86_64/dl-trampoline.h
View File

@ -1,6 +1,6 @@
/* Partial PLT profile trampoline to save and restore x86-64 vector /* Partial PLT profile trampoline to save and restore x86-64 vector
registers. registers.
Copyright (C) 2009 Free Software Foundation, Inc. Copyright (C) 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -195,14 +195,14 @@
_dl_call_pltexit. The La_x86_64_regs is being pointed by rsp now, _dl_call_pltexit. The La_x86_64_regs is being pointed by rsp now,
so we just need to allocate the sizeof(La_x86_64_retval) space on so we just need to allocate the sizeof(La_x86_64_retval) space on
the stack, since the alignment has already been taken care of. */ the stack, since the alignment has already been taken care of. */
# ifdef RESTORE_AVX #ifdef RESTORE_AVX
/* sizeof(La_x86_64_retval). Need extra space for 2 SSE /* sizeof(La_x86_64_retval). Need extra space for 2 SSE
registers to detect if xmm0/xmm1 registers are changed registers to detect if xmm0/xmm1 registers are changed
by audit module. */ by audit module. */
subq $(LRV_SIZE + XMM_SIZE*2), %rsp subq $(LRV_SIZE + XMM_SIZE*2), %rsp
# else #else
subq $LRV_SIZE, %rsp # sizeof(La_x86_64_retval) subq $LRV_SIZE, %rsp # sizeof(La_x86_64_retval)
# endif #endif
movq %rsp, %rcx # La_x86_64_retval argument to %rcx. movq %rsp, %rcx # La_x86_64_retval argument to %rcx.
/* Fill in the La_x86_64_retval structure. */ /* Fill in the La_x86_64_retval structure. */
@ -212,7 +212,7 @@
movaps %xmm0, LRV_XMM0_OFFSET(%rcx) movaps %xmm0, LRV_XMM0_OFFSET(%rcx)
movaps %xmm1, LRV_XMM1_OFFSET(%rcx) movaps %xmm1, LRV_XMM1_OFFSET(%rcx)
# ifdef RESTORE_AVX #ifdef RESTORE_AVX
/* This is to support AVX audit modules. */ /* This is to support AVX audit modules. */
vmovdqu %ymm0, LRV_VECTOR0_OFFSET(%rcx) vmovdqu %ymm0, LRV_VECTOR0_OFFSET(%rcx)
vmovdqu %ymm1, LRV_VECTOR1_OFFSET(%rcx) vmovdqu %ymm1, LRV_VECTOR1_OFFSET(%rcx)
@ -221,14 +221,14 @@
by audit module. */ by audit module. */
vmovdqa %xmm0, (LRV_SIZE)(%rcx) vmovdqa %xmm0, (LRV_SIZE)(%rcx)
vmovdqa %xmm1, (LRV_SIZE + XMM_SIZE)(%rcx) vmovdqa %xmm1, (LRV_SIZE + XMM_SIZE)(%rcx)
# endif #endif
fstpt LRV_ST0_OFFSET(%rcx) fstpt LRV_ST0_OFFSET(%rcx)
fstpt LRV_ST1_OFFSET(%rcx) fstpt LRV_ST1_OFFSET(%rcx)
movq 24(%rbx), %rdx # La_x86_64_regs argument to %rdx. movq 24(%rbx), %rdx # La_x86_64_regs argument to %rdx.
movq 40(%rbx), %rsi # Copy args pushed by PLT in register. movq 40(%rbx), %rsi # Copy args pushed by PLT in register.
movq 32(%rbx), %rdi # %rdi: link_map, %rsi: reloc_index movq 32(%rbx), %rdi # %rdi: link_map, %rsi: reloc_index
call _dl_call_pltexit call _dl_call_pltexit
/* Restore return registers. */ /* Restore return registers. */
@ -238,7 +238,7 @@
movaps LRV_XMM0_OFFSET(%rsp), %xmm0 movaps LRV_XMM0_OFFSET(%rsp), %xmm0
movaps LRV_XMM1_OFFSET(%rsp), %xmm1 movaps LRV_XMM1_OFFSET(%rsp), %xmm1
# ifdef RESTORE_AVX #ifdef RESTORE_AVX
/* Check if xmm0/xmm1 registers are changed by audit module. */ /* Check if xmm0/xmm1 registers are changed by audit module. */
vpcmpeqq (LRV_SIZE)(%rsp), %xmm0, %xmm2 vpcmpeqq (LRV_SIZE)(%rsp), %xmm0, %xmm2
vpmovmskb %xmm2, %esi vpmovmskb %xmm2, %esi
@ -253,7 +253,7 @@
vmovdqu LRV_VECTOR1_OFFSET(%rsp), %ymm1 vmovdqu LRV_VECTOR1_OFFSET(%rsp), %ymm1
1: 1:
# endif #endif
fldt LRV_ST1_OFFSET(%rsp) fldt LRV_ST1_OFFSET(%rsp)
fldt LRV_ST0_OFFSET(%rsp) fldt LRV_ST0_OFFSET(%rsp)
@ -267,3 +267,10 @@
# (eats the reloc index and link_map) # (eats the reloc index and link_map)
cfi_adjust_cfa_offset(-48) cfi_adjust_cfa_offset(-48)
retq retq
#ifdef MORE_CODE
cfi_adjust_cfa_offset(48)
cfi_rel_offset(%rbx, 0)
cfi_def_cfa_register(%rbx)
# undef MORE_CODE
#endif