This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[PATCH] Fix s390{,x} _JMPBUF_CFA_UNWINDS_ADJ

From: Jakub Jelinek <jakub at redhat dot com>
To: Ulrich Drepper <drepper at redhat dot com>, Martin Schwidefsky <schwidefsky at de dot ibm dot com>
Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
Date: Wed, 6 Oct 2004 10:59:09 +0200
Subject: [PATCH] Fix s390{,x} _JMPBUF_CFA_UNWINDS_ADJ
Reply-to: Jakub Jelinek <jakub at redhat dot com>

Hi!

_Unwind_GetCFA () on s390{,x} returns address 96 (resp. 160) above
actual %r15 value, so with the recent stack space saving changes
on s390{,x} _JMPBUF_CFA_UNWINDS_ADJ misbehaves.
With this patch make check passes fully on s390 again.

2004-10-06  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from
	CFA.

--- libc/nptl/sysdeps/s390/jmpbuf-unwind.h	2004-09-02 18:46:00.000000000 -0400
+++ libc/nptl/sysdeps/s390/jmpbuf-unwind.h	2004-10-06 03:43:32.000000000 -0400
@@ -20,13 +20,18 @@
 #include <setjmp.h>
 #include <stdint.h>
 #include <unwind.h>
+#include <bits/wordsize.h>
 
+/* On s390{,x}, CFA is always 96 (resp. 160) bytes above actual
+   %r15.  */
 #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
-  _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
+  _JMPBUF_UNWINDS_ADJ (_jmpbuf,					\
+		       (void *) (_Unwind_GetCFA (_context)	\
+				 - 32 - 2 * __WORDSIZE), _adj)
 
-#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj)	 \
-  ((uintptr_t) (_address) - (_adj)			 \
+#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj)		\
+  ((uintptr_t) (_address) - (_adj)				\
    < (uintptr_t) (_jmpbuf)->__gregs[__JB_GPR15] - (_adj))
 
-/* We use the normal lobngjmp for unwinding.  */
+/* We use the normal longjmp for unwinding.  */
 #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)

	Jakub

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]