generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9156e864: am 289f44a4: Merge "Clean up arm setjmp family."

Browse Source 
* commit '9156e86466d8c9430608f26f1b28aab66e7ee7a1':
  Clean up arm setjmp family.
This commit is contained in:
Elliott Hughes
2014-12-06 00:04:05 +00:00
committed by Android Git Automerger
parent 8c838ec5f3 9156e86466
commit 03f865f037
5 changed files with 136 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-arm/arm.mk
View File

@@ -60,9 +60,7 @@ libc_bionic_src_files_arm += \
arch-arm/bionic/libgcc_compat.c \ arch-arm/bionic/libgcc_compat.c \
arch-arm/bionic/memcmp.S \ arch-arm/bionic/memcmp.S \
arch-arm/bionic/__restore.S \ arch-arm/bionic/__restore.S \
arch-arm/bionic/_setjmp.S \
arch-arm/bionic/setjmp.S \ arch-arm/bionic/setjmp.S \
arch-arm/bionic/sigsetjmp.S \
arch-arm/bionic/syscall.S \ arch-arm/bionic/syscall.S \
libc_arch_static_src_files_arm := arch-arm/bionic/exidx_static.c libc_arch_static_src_files_arm := arch-arm/bionic/exidx_static.c

103
libc/arch-arm/bionic/_setjmp.S
View File

@@ -1,103 +0,0 @@
/* $OpenBSD: _setjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */
/* $NetBSD: _setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
* Copyright (c) 2010 Android Open Source Project.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Mark Brinicombe
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <private/bionic_asm.h>
#include <machine/setjmp.h>
#include <machine/cpu-features.h>
/*
* C library -- _setjmp, _longjmp
*
* _longjmp(a,v)
* will generate a "return(v)" from the last call to
* _setjmp(a)
* by restoring registers from the stack.
* The previous signal state is NOT restored.
*
* Note: r0 is the return value
* r1-r3 are scratch registers in functions
*/
ENTRY(_setjmp)
ldr r1, .L_setjmp_magic
str r1, [r0, #(_JB_MAGIC * 4)]
/* Store core registers */
add r1, r0, #(_JB_CORE_BASE * 4)
stmia r1, {r4-r14}
/* Store floating-point registers */
add r1, r0, #(_JB_FLOAT_BASE * 4)
vstmia r1, {d8-d15}
/* Store floating-point state */
fmrx r1, fpscr
str r1, [r0, #(_JB_FLOAT_STATE * 4)]
mov r0, #0x00000000
bx lr
END(_setjmp)
.L_setjmp_magic:
.word _JB_MAGIC__SETJMP
ENTRY(_longjmp)
ldr r2, .L_setjmp_magic
ldr r3, [r0, #(_JB_MAGIC * 4)]
teq r2, r3
blne longjmperror
/* Restore floating-point registers */
add r2, r0, #(_JB_FLOAT_BASE * 4)
vldmia r2, {d8-d15}
/* Restore floating-point state */
ldr r2, [r0, #(_JB_FLOAT_STATE * 4)]
fmxr fpscr, r2
/* Restore core registers */
add r2, r0, #(_JB_CORE_BASE * 4)
ldmia r2, {r4-r14}
/* Validate sp and r14 */
teq sp, #0
teqne r14, #0
bleq longjmperror
/* Set return value */
mov r0, r1
teq r0, #0x00000000
moveq r0, #0x00000001
bx lr
END(_longjmp)

142
libc/arch-arm/bionic/setjmp.S
View File

@@ -1,6 +1,3 @@
/* $OpenBSD: setjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */
/* $NetBSD: setjmp.S,v 1.5 2003/04/05 23:08:51 bjh21 Exp $ */
/* /*
* Copyright (c) 1997 Mark Brinicombe * Copyright (c) 1997 Mark Brinicombe
* Copyright (c) 2010 Android Open Source Project. * Copyright (c) 2010 Android Open Source Project.
@@ -36,103 +33,154 @@
#include <private/bionic_asm.h> #include <private/bionic_asm.h>
#include <machine/setjmp.h> #include <machine/setjmp.h>
#include <machine/cpu-features.h>
/* // According to the ARM AAPCS document, we only need to save
* C library -- setjmp, longjmp // the following registers:
* //
* longjmp(a,v) // Core r4-r14
* will generate a "return(v)" from the last call to //
* setjmp(a) // VFP d8-d15 (see section 5.1.2.1)
* by restoring registers from the stack. //
* The previous signal state is restored. // Registers s16-s31 (d8-d15, q4-q7) must be preserved across subroutine
*/ // calls; registers s0-s15 (d0-d7, q0-q3) do not need to be preserved
// (and can be used for passing arguments or returning results in standard
// procedure-call variants). Registers d16-d31 (q8-q15), if present, do
// not need to be preserved.
//
// FPSCR saved because glibc does.
// The internal structure of a jmp_buf is totally private.
// Current layout (may change in the future):
//
// word name description
// 0 magic magic number
// 1 sigmask signal mask (not used with _setjmp / _longjmp)
// 2 float_base base of float registers (d8 to d15)
// 18 float_state floating-point status and control register
// 19 core_base base of core registers (r4 to r14)
// 30 reserved reserved entries (room to grow)
// 64
//
// NOTE: float_base must be at an even word index, since the
// FP registers will be loaded/stored with instructions
// that expect 8-byte alignment.
#define _JB_MAGIC 0
#define _JB_SIGMASK (_JB_MAGIC+1)
#define _JB_FLOAT_BASE (_JB_SIGMASK+1)
#define _JB_FLOAT_STATE (_JB_FLOAT_BASE + (15-8+1)*2)
#define _JB_CORE_BASE (_JB_FLOAT_STATE+1)
.L_setjmp_magic_signal_mask_n: .word 0x4278f500
.L_setjmp_magic_signal_mask_y: .word 0x4278f501
ENTRY(setjmp) ENTRY(setjmp)
/* Block all signals and retrieve the old signal mask */ mov r1, #1
b sigsetjmp
END(setjmp)
ENTRY(_setjmp)
mov r1, #0
b sigsetjmp
END(_setjmp)
// int sigsetjmp(sigjmp_buf env, int save_signal_mask);
ENTRY(sigsetjmp)
// Do we need to save the signal mask?
teq r1, #0
ldreq r1, .L_setjmp_magic_signal_mask_n
beq 1f
// Get current signal mask.
stmfd sp!, {r0, r14} stmfd sp!, {r0, r14}
.cfi_def_cfa_offset 8 .cfi_def_cfa_offset 8
.cfi_rel_offset r0, 0 .cfi_rel_offset r0, 0
.cfi_rel_offset r14, 4 .cfi_rel_offset r14, 4
mov r0, #0x00000000 mov r0, #0
bl sigblock bl sigblock
mov r1, r0 mov r1, r0
ldmfd sp!, {r0, r14} ldmfd sp!, {r0, r14}
.cfi_def_cfa_offset 0 .cfi_def_cfa_offset 0
/* Store signal mask */ // Save signal mask.
str r1, [r0, #(_JB_SIGMASK * 4)] str r1, [r0, #(_JB_SIGMASK * 4)]
ldr r1, .Lsetjmp_magic ldr r1, .L_setjmp_magic_signal_mask_y
1:
// Save magic number.
str r1, [r0, #(_JB_MAGIC * 4)] str r1, [r0, #(_JB_MAGIC * 4)]
/* Store core registers */ // Save core registers.
add r1, r0, #(_JB_CORE_BASE * 4) add r1, r0, #(_JB_CORE_BASE * 4)
stmia r1, {r4-r14} stmia r1, {r4-r14}
/* Store floating-point registers */ // Save floating-point registers.
add r1, r0, #(_JB_FLOAT_BASE * 4) add r1, r0, #(_JB_FLOAT_BASE * 4)
vstmia r1, {d8-d15} vstmia r1, {d8-d15}
/* Store floating-point state */
// Save floating-point state.
fmrx r1, fpscr fmrx r1, fpscr
str r1, [r0, #(_JB_FLOAT_STATE * 4)] str r1, [r0, #(_JB_FLOAT_STATE * 4)]
mov r0, #0x00000000 mov r0, #0
bx lr bx lr
END(setjmp) END(sigsetjmp)
.Lsetjmp_magic: // void siglongjmp(sigjmp_buf env, int value);
.word _JB_MAGIC_SETJMP ENTRY(siglongjmp)
// Check magic.
ENTRY(longjmp)
ldr r2, .Lsetjmp_magic
ldr r3, [r0, #(_JB_MAGIC * 4)] ldr r3, [r0, #(_JB_MAGIC * 4)]
ldr r2, .L_setjmp_magic_signal_mask_n
teq r2, r3 teq r2, r3
blne longjmperror beq 1f
ldr r2, .L_setjmp_magic_signal_mask_y
teq r2, r3
bne longjmperror
/* Fetch signal mask */ // Restore signal mask.
ldr r2, [r0, #(_JB_SIGMASK * 4)]
/* Set signal mask */
stmfd sp!, {r0, r1, r14} stmfd sp!, {r0, r1, r14}
.cfi_def_cfa_offset 12 .cfi_def_cfa_offset 12
.cfi_rel_offset r0, 0 .cfi_rel_offset r0, 0
.cfi_rel_offset r1, 4 .cfi_rel_offset r1, 4
.cfi_rel_offset r14, 8 .cfi_rel_offset r14, 8
sub sp, sp, #4 /* align the stack */ sub sp, sp, #4 // Align the stack.
.cfi_adjust_cfa_offset 4 .cfi_adjust_cfa_offset 4
mov r0, r2 ldr r0, [r0, #(_JB_SIGMASK * 4)]
bl sigsetmask bl sigsetmask
add sp, sp, #4 /* unalign the stack */ add sp, sp, #4 // Unalign the stack.
.cfi_adjust_cfa_offset -4 .cfi_adjust_cfa_offset -4
ldmfd sp!, {r0, r1, r14} ldmfd sp!, {r0, r1, r14}
.cfi_def_cfa_offset 0 .cfi_def_cfa_offset 0
/* Restore floating-point registers */ 1:
// Restore floating-point registers.
add r2, r0, #(_JB_FLOAT_BASE * 4) add r2, r0, #(_JB_FLOAT_BASE * 4)
vldmia r2, {d8-d15} vldmia r2, {d8-d15}
/* Restore floating-point state */
// Restore floating-point state.
ldr r2, [r0, #(_JB_FLOAT_STATE * 4)] ldr r2, [r0, #(_JB_FLOAT_STATE * 4)]
fmxr fpscr, r2 fmxr fpscr, r2
/* Restore core registers */ // Restore core registers.
add r2, r0, #(_JB_CORE_BASE * 4) add r2, r0, #(_JB_CORE_BASE * 4)
ldmia r2, {r4-r14} ldmia r2, {r4-r14}
/* Validate sp and r14 */ // Validate sp and r14.
teq sp, #0 teq sp, #0
teqne r14, #0 teqne r14, #0
bleq longjmperror bleq longjmperror
/* Set return value */ // Set return value.
mov r0, r1 mov r0, r1
teq r0, #0x00000000 teq r0, #0
moveq r0, #0x00000001 moveq r0, #1
bx lr bx lr
mov r15, r14 END(siglongjmp)
END(longjmp)
.globl longjmp
.equ longjmp, siglongjmp
.globl _longjmp
.equ _longjmp, siglongjmp

64
libc/arch-arm/bionic/sigsetjmp.S
View File

@@ -1,64 +0,0 @@
/* $OpenBSD: sigsetjmp.S,v 1.2 2004/02/01 05:40:52 drahn Exp $ */
/* $NetBSD: sigsetjmp.S,v 1.3 2002/08/17 19:54:30 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Mark Brinicombe
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <private/bionic_asm.h>
#include <machine/setjmp.h>
/*
* C library -- sigsetjmp, siglongjmp
*
* longjmp(a,v)
* will generate a "return(v)" from the last call to
* setjmp(a, m)
* by restoring registers from the stack.
* The previous signal state is restored.
*/
ENTRY(sigsetjmp)
teq r1, #0
beq _setjmp
b setjmp
END(sigsetjmp)
.L_setjmp_magic:
.word _JB_MAGIC__SETJMP
ENTRY(siglongjmp)
ldr r2, .L_setjmp_magic
ldr r3, [r0]
teq r2, r3
beq _longjmp
b longjmp
END(siglongjmp)

47
libc/arch-arm/include/machine/setjmp.h
View File

@@ -26,10 +26,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/*
* machine/setjmp.h: machine dependent setjmp-related information.
*/
/* _JBLEN is the size of a jmp_buf in longs. /* _JBLEN is the size of a jmp_buf in longs.
* Do not modify this value or you will break the ABI ! * Do not modify this value or you will break the ABI !
* *
@@ -37,46 +33,3 @@
* that was replaced by this one. * that was replaced by this one.
*/ */
#define _JBLEN 64 #define _JBLEN 64
/* According to the ARM AAPCS document, we only need to save
* the following registers:
*
* Core r4-r14
*
* VFP d8-d15 (see section 5.1.2.1)
*
* Registers s16-s31 (d8-d15, q4-q7) must be preserved across subroutine
* calls; registers s0-s15 (d0-d7, q0-q3) do not need to be preserved
* (and can be used for passing arguments or returning results in standard
* procedure-call variants). Registers d16-d31 (q8-q15), if present, do
* not need to be preserved.
*
* FPSCR saved because GLibc does saves it too.
*
*/
/* The internal structure of a jmp_buf is totally private.
* Current layout (may change in the future):
*
* word name description
* 0 magic magic number
* 1 sigmask signal mask (not used with _setjmp / _longjmp)
* 2 float_base base of float registers (d8 to d15)
* 18 float_state floating-point status and control register
* 19 core_base base of core registers (r4 to r14)
* 30 reserved reserved entries (room to grow)
* 64
*
* NOTE: float_base must be at an even word index, since the
* FP registers will be loaded/stored with instructions
* that expect 8-byte alignment.
*/
#define _JB_MAGIC 0
#define _JB_SIGMASK (_JB_MAGIC+1)
#define _JB_FLOAT_BASE (_JB_SIGMASK+1)
#define _JB_FLOAT_STATE (_JB_FLOAT_BASE + (15-8+1)*2)
#define _JB_CORE_BASE (_JB_FLOAT_STATE+1)
#define _JB_MAGIC__SETJMP 0x4278f500
#define _JB_MAGIC_SETJMP 0x4278f501