diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/mips/linux-unwind.h | 11 | ||||
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/include/mips-signal.h | 46 |
4 files changed, 28 insertions, 43 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3599191..b9c8558 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-11-20 David Daney <ddaney@avtrex.com> + + * config/mips/linux-unwind.h (mips_fallback_frame_state): Adjust + PC to point to following instruction. + 2006-11-20 Anatoly Sokolov <aesok@post.ru> PR target/18553 diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h index bbb2445..e10fc76 100644 --- a/gcc/config/mips/linux-unwind.h +++ b/gcc/config/mips/linux-unwind.h @@ -1,5 +1,5 @@ /* DWARF2 EH unwinding support for MIPS Linux. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GCC. @@ -51,6 +51,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context, _Unwind_FrameState *fs) { u_int32_t *pc = (u_int32_t *) context->ra; + u_int32_t t; struct sigcontext *sc; _Unwind_Ptr new_cfa; int i; @@ -102,9 +103,13 @@ mips_fallback_frame_state (struct _Unwind_Context *context, fs->regs.reg[i].loc.offset = (_Unwind_Ptr)&(sc->sc_regs[i]) - new_cfa; } - fs->regs.reg[SIGNAL_UNWIND_RETURN_COLUMN].how = REG_SAVED_OFFSET; + /* The PC points to the faulting instruction, but the unwind tables + expect it point to the following instruction. We compensate by + reporting a return address at the next instruction. */ + fs->regs.reg[SIGNAL_UNWIND_RETURN_COLUMN].how = REG_SAVED_VAL_OFFSET; + t = (*(u_int32_t *)(void *)&sc->sc_pc) + 4; fs->regs.reg[SIGNAL_UNWIND_RETURN_COLUMN].loc.offset - = (_Unwind_Ptr)&(sc->sc_pc) - new_cfa; + = (_Unwind_Ptr)t - new_cfa; fs->retaddr_column = SIGNAL_UNWIND_RETURN_COLUMN; return _URC_NO_REASON; diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ee11b27..b768bf9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,14 @@ 2006-11-20 David Daney <ddaney@avtrex.com> + * include/mips-signal.h (sys/syscall.h): Do not include. + (sig_ucontext_t): Removed. + (MAKE_THROW_FRAME): Changed to be a nop. + (_INIT_SIG_HANDLER): New macro. + (INIT_SEGV): Rewrote to use _INIT_SIG_HANDLER. + (INIT_FPE): Same. + +2006-11-20 David Daney <ddaney@avtrex.com> + * testsuite/libjava.lang/Throw_3.java: New Test. * testsuite/libjava.lang/Throw_3.out: Its expected output. diff --git a/libjava/include/mips-signal.h b/libjava/include/mips-signal.h index 63218ea..478e3a4 100644 --- a/libjava/include/mips-signal.h +++ b/libjava/include/mips-signal.h @@ -18,65 +18,31 @@ details. */ #include <signal.h> #include <unistd.h> -#include <sys/syscall.h> -/* #include <asm/ucontext.h> structures we use are here but clash with - sys/ucontext.h included by java-signal.h from prims.cc */ #define HANDLE_SEGV 1 #define HANDLE_FPE 1 -/* The third parameter to the signal handler points to something with - * this structure defined in asm/ucontext.h, but the name clashes with - * struct ucontext from sys/ucontext.h so this private copy is used. */ -typedef struct _sig_ucontext { - unsigned long uc_flags; - struct _sig_ucontext *uc_link; - stack_t uc_stack; - struct sigcontext uc_mcontext; - sigset_t uc_sigmask; -} sig_ucontext_t; - #define SIGNAL_HANDLER(_name) \ static void _name (int _dummy __attribute__ ((__unused__)), \ siginfo_t *_info __attribute__ ((__unused__)), \ void *_arg __attribute__ ((__unused__))) -/* - * MIPS leaves pc pointing at the faulting instruction, but the - * unwinder expects it to point to the following instruction - */ - -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - ((sig_ucontext_t *)_arg)->uc_mcontext.sc_pc += 4; \ - (void)_dummy; \ - (void)_info; \ -} \ -while (0) +#define MAKE_THROW_FRAME(_exception) -#define INIT_SEGV \ +#define _INIT_SIG_HANDLER(_SIG, _ACTION) \ do \ { \ struct sigaction act; \ - act.sa_sigaction = catch_segv; \ + act.sa_sigaction = _ACTION; \ act.sa_flags = SA_SIGINFO | SA_NODEFER; \ sigemptyset (&act.sa_mask); \ - sigaction(SIGSEGV, &act, NULL); \ + sigaction(_SIG, &act, NULL); \ } \ while (0) -#define INIT_FPE \ -do \ - { \ - struct sigaction act; \ - act.sa_sigaction = catch_fpe; \ - act.sa_flags = SA_SIGINFO | SA_NODEFER; \ - sigemptyset (&act.sa_mask); \ - sigaction(SIGFPE, &act, NULL); \ - } \ -while (0) +#define INIT_SEGV _INIT_SIG_HANDLER (SIGSEGV, catch_segv) +#define INIT_FPE _INIT_SIG_HANDLER (SIGFPE, catch_fpe) #undef HANDLE_DIVIDE_OVERFLOW #endif /* JAVA_SIGNAL_H */ |