lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Tweak sparc32 longjmp to not store a dummy frame pointer onto the stack.

Browse Source 
* sysdeps/sparc/sparc32/__longjmp.S: Unwind in the 'thread' path
	using a normal save/restore sequence, rather than allocating a
	dummy stack frame just to store a frame pointer and restore.
	* sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S: Likewise.
This commit is contained in:
David S. Miller
2012-02-20 20:50:14 -08:00
parent fb06851d67
commit c0e70b2543
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-20 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/__longjmp.S: Unwind in the 'thread' path
using a normal save/restore sequence, rather than allocating a
dummy stack frame just to store a frame pointer and restore.
* sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S: Likewise.
2012-02-21 Joseph Myers <joseph@codesourcery.com> 2012-02-21 Joseph Myers <joseph@codesourcery.com>
* manual/install.texi: Fix stray word in line-wrapped comment. * manual/install.texi: Fix stray word in line-wrapped comment.

10
sysdeps/sparc/sparc32/__longjmp.S
View File

@ -21,7 +21,6 @@
#include <jmpbuf-offsets.h> #include <jmpbuf-offsets.h>
#define ENV(base,reg) [%base + (reg * 4)] #define ENV(base,reg) [%base + (reg * 4)]
#define ST_FLUSH_WINDOWS 3 #define ST_FLUSH_WINDOWS 3
#define RW_FP [%fp + 0x48]
ENTRY(__longjmp) ENTRY(__longjmp)
/* Store our arguments in global registers so we can still /* Store our arguments in global registers so we can still
@ -54,6 +53,7 @@ LOC(loop):
ld ENV(g1,JB_SP), %o0 /* Delay slot: extract target SP. */ ld ENV(g1,JB_SP), %o0 /* Delay slot: extract target SP. */
LOC(thread): LOC(thread):
save %sp, -96, %sp
/* /*
* Do a "flush register windows trap". The trap handler in the * Do a "flush register windows trap". The trap handler in the
* kernel writes all the register windows to their stack slots, and * kernel writes all the register windows to their stack slots, and
@ -66,15 +66,13 @@ LOC(thread):
#ifdef PTR_DEMANGLE #ifdef PTR_DEMANGLE
ld ENV(g1,JB_PC), %g5 /* Set return PC. */ ld ENV(g1,JB_PC), %g5 /* Set return PC. */
ld ENV(g1,JB_SP), %g1 /* Set saved SP on restore below. */ ld ENV(g1,JB_SP), %g1 /* Set saved SP on restore below. */
PTR_DEMANGLE2 (%o7, %g5, %g4) PTR_DEMANGLE2 (%i7, %g5, %g4)
PTR_DEMANGLE2 (%fp, %g1, %g4) PTR_DEMANGLE2 (%fp, %g1, %g4)
#else #else
ld ENV(g1,JB_PC), %o7 /* Set return PC. */ ld ENV(g1,JB_PC), %i7 /* Set return PC. */
ld ENV(g1,JB_SP), %fp /* Set saved SP on restore below. */ ld ENV(g1,JB_SP), %fp /* Set saved SP on restore below. */
#endif #endif
sub %fp, 64, %sp /* Allocate a register frame. */ jmp %i7 + 8
st %g3, RW_FP /* Set saved FP on restore below. */
retl
restore %g2, 0, %o0 /* Restore values from above register frame. */ restore %g2, 0, %o0 /* Restore values from above register frame. */
LOC(found): LOC(found):

10
sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
View File

@ -20,7 +20,6 @@
#define ENV(base,reg) [%base + (reg * 4)] #define ENV(base,reg) [%base + (reg * 4)]
#define ST_FLUSH_WINDOWS 3 #define ST_FLUSH_WINDOWS 3
#define RW_FP [%fp + 0x48]
.section .rodata.str1.1,"aMS",@progbits,1 .section .rodata.str1.1,"aMS",@progbits,1
.type longjmp_msg,@object .type longjmp_msg,@object
@ -97,6 +96,7 @@ ENTRY (____longjmp_chk)
mov 1, %g2 /* Delay slot only hit if zero: VAL = 1. */ mov 1, %g2 /* Delay slot only hit if zero: VAL = 1. */
0: 0:
save %sp, -96, %sp
/* /*
* Do a "flush register windows trap". The trap handler in the * Do a "flush register windows trap". The trap handler in the
* kernel writes all the register windows to their stack slots, and * kernel writes all the register windows to their stack slots, and
@ -108,14 +108,12 @@ ENTRY (____longjmp_chk)
ta ST_FLUSH_WINDOWS ta ST_FLUSH_WINDOWS
#ifdef PTR_DEMANGLE #ifdef PTR_DEMANGLE
ld ENV(g1,JB_PC), %g1 /* Set return PC. */ ld ENV(g1,JB_PC), %g1 /* Set return PC. */
PTR_DEMANGLE2 (%o7, %g1, %g4) PTR_DEMANGLE2 (%i7, %g1, %g4)
#else #else
ld ENV(g1,JB_PC), %o7 /* Set return PC. */ ld ENV(g1,JB_PC), %i7 /* Set return PC. */
#endif #endif
mov %g5, %fp mov %g5, %fp
sub %fp, 64, %sp /* Allocate a register frame. */ jmp %i7 + 8
st %g3, RW_FP /* Set saved FP on restore below. */
retl
restore %g2, 0, %o0 /* Restore values from above register frame. */ restore %g2, 0, %o0 /* Restore values from above register frame. */
END(____longjmp_chk) END(____longjmp_chk)