Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ulrich Drepper committed Oct 6, 2004
1 parent 67060ef commit 6bdd38b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
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.

2004-10-05 Ulrich Drepper <drepper@redhat.com>

* elf/rtld.c (dl_main): Use _dl_debug_printf instead of _dl_printf
Expand Down
13 changes: 9 additions & 4 deletions nptl/sysdeps/s390/jmpbuf-unwind.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 6bdd38b

Please sign in to comment.