[patch/hppa-linux] MD_FALLBACK_FRAME_STATE_FOR definition
Randolph Chung
tausq@debian.org
Thu Apr 1 06:23:00 GMT 2004
This fixes the Throw_2.exe test failure from:
http://gcc.gnu.org/ml/gcc-testresults/2004-03/msg01175.html
Bootstraps on hppa-linux. Comments appreciated...
thanks,
randolph
--
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/
gcc/config/pa:
2004-03-28 Randolph Chung <tausq@debian.org>
* pa32-linux.h (MD_FALLBACK_FRAME_STATE_FOR): Define.
libjava:
2004-03-28 Randolph Chung <tausq@debian.org>
* dwarf2-signal.h (INIT_SEGV): Define for hppa.
(INIT_FPE): Likewise.
* configure.in (SIGNAL_HANDLER): Use dwarf2-signal.h for hppa.
* configure: Regenerate.
Index: gcc/config/pa/pa32-linux.h
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/config/pa/pa32-linux.h,v
retrieving revision 1.12
diff -u -p -r1.12 pa32-linux.h
--- gcc/config/pa/pa32-linux.h 23 Aug 2003 01:32:59 -0000 1.12
+++ gcc/config/pa/pa32-linux.h 31 Mar 2004 04:54:25 -0000
@@ -35,3 +35,91 @@ Boston, MA 02111-1307, USA. */
__attribute__ ((__unused__, section(".ctors"), \
aligned(sizeof(func_ptr)))) \
= { (func_ptr) (-1) }
+
+/* Do code reading to identify a signal frame, and set the frame
+ state data appropriately. See unwind-dw2.c for the structs. */
+
+#ifdef IN_LIBGCC2
+#include <signal.h>
+#include <sys/ucontext.h>
+
+/* Unfortunately, because of various bugs and changes to the kernel,
+ we have several cases to deal with.
+
+ In 2.4, the signal trampoline is 4 bytes, and (CONTEXT)->ra should
+ point directly at the beginning of the trampoline and struct rt_sigframe.
+
+ In <= 2.6.5-rc2-pa3, the signal trampoline is 9 bytes, and
+ (CONTEXT)->ra points at the 4th word in the trampoline structure. This
+ is wrong, it should point at the 5th word. This is fixed in 2.6.5-rc2-pa4.
+
+ To detect these cases, we first take (CONTEXT)->ra, align it to 64-bytes
+ to get the beginning of the signal frame, and then check offsets 0, 4
+ and 5 to see if we found the beginning of the trampoline. This will
+ tell us how to locate the sigcontext structure.
+
+ Note that with a 2.4 64-bit kernel, the signal context is not properly
+ passed back to userspace so the unwind will not work correctly. */
+#define MD_FALLBACK_FRAME_STATE_FOR(CONTEXT, FS, SUCCESS) \
+ do { \
+ unsigned long sp = (unsigned long)(CONTEXT)->ra & ~63; \
+ unsigned int *pc = (unsigned int *)sp; \
+ unsigned long off; \
+ _Unwind_Ptr new_cfa; \
+ int i; \
+ struct sigcontext *sc; \
+ struct rt_sigframe { \
+ struct siginfo info; \
+ struct ucontext uc; \
+ } *frame; \
+ \
+ /* rt_sigreturn trampoline: */ \
+ /* 3419000x ldi 0, %r25 or ldi 1, %r25 (x = 0 or 2) */ \
+ /* 3414015a ldi __NR_rt_sigreturn, %r20 */ \
+ /* e4008200 be,l 0x100(%sr2, %r0), %sr0, %r31 */ \
+ /* 08000240 nop */ \
+ \
+ if (pc[0] == 0x34190000 || pc[0] == 0x34190002) \
+ off = 4*4; \
+ else if (pc[4] == 0x34190000 || pc[4] == 0x34190002) \
+ { \
+ pc += 4; \
+ off = 10*4; \
+ } \
+ else if (pc[5] == 0x34190000 || pc[5] == 0x34190002) \
+ { \
+ pc += 5; \
+ off = 10*4; \
+ } \
+ else \
+ break; \
+ if (*(pc + 1) != 0x3414015a \
+ || *(pc + 2) != 0xe4008200 \
+ || *(pc + 3) != 0x08000240) \
+ break; \
+ \
+ frame = (struct rt_sigframe *)(sp + off); \
+ sc = &frame->uc.uc_mcontext; \
+ \
+ new_cfa = sc->sc_gr[30]; \
+ (FS)->cfa_how = CFA_REG_OFFSET; \
+ (FS)->cfa_reg = 30; \
+ (FS)->cfa_offset = new_cfa - (long) (CONTEXT)->cfa; \
+ for (i = 3; i <= 18; i++) \
+ { \
+ (FS)->regs.reg[i].how = REG_SAVED_OFFSET; \
+ (FS)->regs.reg[i].loc.offset = (long)&sc->sc_gr[i] - new_cfa; \
+ } \
+ for (i = 12; i < 21; i++) \
+ { \
+ (FS)->regs.reg[36+i].how = REG_SAVED_OFFSET; \
+ (FS)->regs.reg[36+i].loc.offset \
+ = (long)&sc->sc_fr[i] - new_cfa; \
+ } \
+ (FS)->regs.reg[2].how = REG_SAVED_OFFSET; \
+ (FS)->regs.reg[2].loc.offset = (long) &sc->sc_iaoq[0] - new_cfa; \
+ (FS)->retaddr_column = 2; \
+ goto SUCCESS; \
+ } while (0)
+
+#endif /* IN_LIBGCC2 */
Index: libjava/include/dwarf2-signal.h
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/include/dwarf2-signal.h,v
retrieving revision 1.14
diff -u -p -r1.14 dwarf2-signal.h
--- libjava/include/dwarf2-signal.h 13 Jun 2003 12:20:45 -0000 1.14
+++ libjava/include/dwarf2-signal.h 31 Mar 2004 04:54:25 -0000
@@ -202,6 +202,29 @@ do \
} \
while (0)
#endif
+#elif defined(__hppa__)
+#define INIT_SEGV \
+do \
+ { \
+ struct sigaction act; \
+ act.sa_sigaction = _Jv_catch_segv; \
+ sigemptyset (&act.sa_mask); \
+ act.sa_flags = SA_SIGINFO; \
+ syscall (SYS_rt_sigaction, SIGSEGV, &act, NULL, _NSIG / 8); \
+ } \
+while (0)
+
+#define INIT_FPE \
+do \
+ { \
+ struct sigaction act; \
+ act.sa_sigaction = _Jv_catch_fpe; \
+ sigemptyset (&act.sa_mask); \
+ act.sa_flags = SA_SIGINFO; \
+ syscall (SYS_rt_sigaction, SIGFPE, &act, NULL, _NSIG / 8); \
+ } \
+while (0)
+
#elif !defined(__ia64__)
#define INIT_SEGV \
do \
Index: libjava/configure.in
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/configure.in,v
retrieving revision 1.184
diff -u -p -r1.184 configure.in
--- libjava/configure.in 20 Mar 2004 06:06:09 -0000 1.184
+++ libjava/configure.in 31 Mar 2004 04:54:26 -0000
@@ -1148,6 +1148,9 @@ case "${host}" in
# SYSDEP_SOURCES=sysdep/ia64.c
# test -d sysdep || mkdir sysdep
# ;;
+ hppa*-*-linux*)
+ SIGNAL_HANDLER=include/dwarf2-signal.h
+ ;;
ia64-*-linux*)
SIGNAL_HANDLER=include/dwarf2-signal.h
;;
Index: libjava/configure
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/configure,v
retrieving revision 1.206
diff -u -p -r1.206 configure
--- libjava/configure 20 Mar 2004 06:06:09 -0000 1.206
+++ libjava/configure 31 Mar 2004 04:54:27 -0000
@@ -1630,7 +1630,7 @@ else
if { (eval echo configure:1631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
- *.c | *.o | *.obj) ;;
+ *.$ac_ext | *.c | *.o | *.obj) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
@@ -8490,6 +8490,9 @@ case "${host}" in
# SYSDEP_SOURCES=sysdep/ia64.c
# test -d sysdep || mkdir sysdep
# ;;
+ hppa*-*-linux*)
+ SIGNAL_HANDLER=include/dwarf2-signal.h
+ ;;
ia64-*-linux*)
SIGNAL_HANDLER=include/dwarf2-signal.h
;;
@@ -9233,7 +9236,7 @@ if test "$no_recursion" != yes; then
fi
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
More information about the Gcc-patches
mailing list