about summary refs log tree commit diff
path: root/sysdeps/arm/include
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-01-27 09:01:03 +0000
committerWill Newton <will.newton@linaro.org>2014-02-25 10:07:04 +0000
commit80a56cc3ee45d4a2a1c3ec5e67ff359a7b380fb6 (patch)
tree7929367afdfbb5ccd9b062812aa9180e46cf8dcb /sysdeps/arm/include
parent3ea0f74e1d5a376eaa2905d4fe60fc0cca95e42f (diff)
downloadglibc-80a56cc3ee45d4a2a1c3ec5e67ff359a7b380fb6.tar.gz
glibc-80a56cc3ee45d4a2a1c3ec5e67ff359a7b380fb6.tar.xz
glibc-80a56cc3ee45d4a2a1c3ec5e67ff359a7b380fb6.zip
ARM: Add SystemTap probes to longjmp and setjmp.
Now the ARM port implements pointer encryption for jmpbufs, gdb needs
a SystemTap probe point in longjmp to determine the target PC of
a call to longjmp. This patch implements the probe point in longjmp
and a similar probe point in setjmp.

In order to have all the appropriate registers available to pass to the
probe this reorders the layout of jmpbuf, putting the sp and lr registers
at the start rather than the end, allowing them to be read and
written sequentially.

Tested on armv7, no new failures in the glibc testsuite and confirmed
that this fixes the gdb.base/longjmp.exp failures in the gdb testsuite.

ChangeLog:

2014-02-25  Will Newton  <will.newton@linaro.org>

	* sysdeps/arm/__longjmp.S: Include stap-probe.h.
	(__longjmp): Restore sp and lr before restoring callee
	saved registers.  Add longjmp and longjmp_target
	SystemTap probe point.
	* sysdeps/arm/bits/setjmp.h (__jmp_buf): Update comment.
	* sysdeps/arm/include/bits/setjmp.h (__JMP_BUF_SP):
	Define to zero to match jmpbuf layout.
	* sysdeps/arm/setjmp.S: Include stap-probe.h.
	(__sigsetjmp): Save sp and lr before saving callee
	saved registers.  Add setjmp SystemTap probe point.
Diffstat (limited to 'sysdeps/arm/include')
-rw-r--r--sysdeps/arm/include/bits/setjmp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/arm/include/bits/setjmp.h b/sysdeps/arm/include/bits/setjmp.h
index 220dfe8d96..5877c1f659 100644
--- a/sysdeps/arm/include/bits/setjmp.h
+++ b/sysdeps/arm/include/bits/setjmp.h
@@ -30,7 +30,7 @@
 # define JMP_BUF_REGLIST	{v1-v6, sl, fp}
 
 /* Index of __jmp_buf where the sp register resides.  */
-# define __JMP_BUF_SP		8
+# define __JMP_BUF_SP		0
 #endif
 
 #endif  /* include/bits/setjmp.h */