tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a no dwarf version of assembler macros.

Browse source 
For the __release and __release_rt functions, the previous macros
would add a dwarf cfi entry for the function with no values. This works
with libunwind since it always tries the arm unwind information first.

This change removes those entries by creating a no dwarf version of the
assembler macro.

Change-Id: Ib93e42fff5a79b8d770eab0071fdee7d2afa988d
This commit is contained in:
Christopher Ferris 2015-09-30 15:32:15 -07:00
parent 8b279eadd3
commit 8f8308c974
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libc/arch-arm/bionic/__restore.S
View file

@ -34,7 +34,9 @@
// __restore_rt (but covered by the .fnstart/.fnend) so that although they're // __restore_rt (but covered by the .fnstart/.fnend) so that although they're
// not inside the functions from objdump's point of view, an unwinder that // not inside the functions from objdump's point of view, an unwinder that
// blindly looks at the previous instruction (but is then smart enough to check // blindly looks at the previous instruction (but is then smart enough to check
// the DWARF information to find out where it landed) gets the right answer. // the unwind information to find out where it landed) gets the right answer.
// Make sure not to have both DWARF and ARM unwind information, so only
// use the ARM unwind information.
// We need to place .fnstart ourselves (but we may as well keep the free .fnend). // We need to place .fnstart ourselves (but we may as well keep the free .fnend).
#undef __bionic_asm_custom_entry #undef __bionic_asm_custom_entry
@ -44,18 +46,18 @@
.save {r0-r15} .save {r0-r15}
.pad #32 .pad #32
nop nop
ENTRY_PRIVATE(__restore) ENTRY_PRIVATE_NO_DWARF(__restore)
// This function must have exactly this instruction sequence. // This function must have exactly this instruction sequence.
mov r7, #__NR_sigreturn mov r7, #__NR_sigreturn
swi #0 swi #0
END(__restore) END_NO_DWARF(__restore)
.fnstart .fnstart
.save {r0-r15} .save {r0-r15}
.pad #160 .pad #160
nop nop
ENTRY_PRIVATE(__restore_rt) ENTRY_PRIVATE_NO_DWARF(__restore_rt)
// This function must have exactly this instruction sequence. // This function must have exactly this instruction sequence.
mov r7, #__NR_rt_sigreturn mov r7, #__NR_rt_sigreturn
swi #0 swi #0
END(__restore_rt) END_NO_DWARF(__restore_rt)

17
libc/private/bionic_asm.h
View file

@ -38,25 +38,36 @@
#include <machine/asm.h> #include <machine/asm.h>
#define ENTRY(f) \ #define ENTRY_NO_DWARF(f) \
.text; \ .text; \
.globl f; \ .globl f; \
.align __bionic_asm_align; \ .align __bionic_asm_align; \
.type f, __bionic_asm_function_type; \ .type f, __bionic_asm_function_type; \
f: \ f: \
__bionic_asm_custom_entry(f); \ __bionic_asm_custom_entry(f); \
#define ENTRY(f) \
ENTRY_NO_DWARF(f) \
.cfi_startproc \ .cfi_startproc \
#define END_NO_DWARF(f) \
.size f, .-f; \
__bionic_asm_custom_end(f) \
#define END(f) \ #define END(f) \
.cfi_endproc; \ .cfi_endproc; \
.size f, .-f; \ END_NO_DWARF(f) \
__bionic_asm_custom_end(f) \
/* Like ENTRY, but with hidden visibility. */ /* Like ENTRY, but with hidden visibility. */
#define ENTRY_PRIVATE(f) \ #define ENTRY_PRIVATE(f) \
ENTRY(f); \ ENTRY(f); \
.hidden f \ .hidden f \
/* Like ENTRY_NO_DWARF, but with hidden visibility. */
#define ENTRY_PRIVATE_NO_DWARF(f) \
ENTRY_NO_DWARF(f); \
.hidden f \
#define ALIAS_SYMBOL(alias, original) \ #define ALIAS_SYMBOL(alias, original) \
.globl alias; \ .globl alias; \
.equ alias, original .equ alias, original