diff options
| author | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-11 11:49:25 +0000 |
|---|---|---|
| committer | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-11 11:49:25 +0000 |
| commit | 83f4f70aadb79fd28e57d23950d39ec549c2cdb7 (patch) | |
| tree | 50692d12dfe4f9dda2dfd3313cdbd8a3d64c267d /gcc/config | |
| parent | e395522d28f6d2d66aa6de6aa8e77912c8f99b4e (diff) | |
| download | ppe42-gcc-83f4f70aadb79fd28e57d23950d39ec549c2cdb7.tar.gz ppe42-gcc-83f4f70aadb79fd28e57d23950d39ec549c2cdb7.zip | |
ChangeLog:
* config/s390/linux.h (MD_FALLBACK_FRAME_STATE_FOR): For SIGSEGV and
SIGBUS signal frames, the PSW address points *to* the faulting
instruction, not after it.
libjava/ChangeLog:
* include/s390-signal.c (SIGNAL_HANDLER): Use SIGINFO-style prototype.
(struct old_s390_kernel_sigaction): Likewise for k_sa_handler.
(MAKE_THROW_FRAME): Do not modify PSW address.
(INIT_SEGV): Install SIGINFO-style signal handler.
(INIT_FPE): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84506 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config')
| -rw-r--r-- | gcc/config/s390/linux.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h index 9a6db9d76c1..0f51ef7d84b 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h @@ -113,6 +113,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA } __attribute__ ((__aligned__ (8))) sigregs_; \ \ sigregs_ *regs_; \ + int *signo_ = NULL; \ \ /* svc $__NR_sigreturn or svc $__NR_rt_sigreturn */ \ if (pc_[0] != 0x0a || (pc_[1] != 119 && pc_[1] != 173)) \ @@ -133,6 +134,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA } *uc_ = (CONTEXT)->cfa + 8 + 128; \ \ regs_ = &uc_->uc_mcontext; \ + signo_ = (CONTEXT)->cfa + sizeof(long); \ } \ \ /* Old-style RT frame and all non-RT frames: \ @@ -141,6 +143,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA else \ { \ regs_ = *(sigregs_ **)((CONTEXT)->cfa + 8); \ + \ + /* Recent kernels store the signal number immediately after \ + the sigregs; old kernels have the return trampoline at \ + this location. */ \ + if ((void *)(regs_ + 1) != (CONTEXT)->ra) \ + signo_ = (int *)(regs_ + 1); \ } \ \ new_cfa_ = regs_->gprs[15] + 16*sizeof(long) + 32; \ @@ -163,10 +171,31 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA } \ \ /* Load return addr from PSW into dummy register 32. */ \ + \ (FS)->regs.reg[32].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[32].loc.offset = (long)®s_->psw_addr - new_cfa_; \ (FS)->retaddr_column = 32; \ \ + /* If we got a SIGSEGV or a SIGBUS, the PSW address points *to* \ + the faulting instruction, not after it. This causes the logic \ + in unwind-dw2.c that decrements the RA to determine the correct \ + CFI region to get confused. To fix that, we *increment* the RA \ + here in that case. Note that we cannot modify the RA in place, \ + and the frame state wants a *pointer*, not a value; thus we put \ + the modified RA value into the unused register 33 slot of FS and \ + have the register 32 save address point to that slot. \ + \ + Unfortunately, for regular signals on old kernels, we don't know \ + the signal number. We default to not fiddling with the RA; \ + that can fail in rare cases. Upgrade your kernel. */ \ + \ + if (signo_ && (*signo_ == 11 || *signo_ == 7)) \ + { \ + (FS)->regs.reg[33].loc.exp = regs_->psw_addr + 1; \ + (FS)->regs.reg[32].loc.offset = \ + (long)&(FS)->regs.reg[33].loc.exp - new_cfa_; \ + } \ + \ goto SUCCESS; \ } while (0) |
