diff options
| author | Andrew Haley <aph@redhat.com> | 2001-05-29 17:50:50 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2001-05-29 17:50:50 +0000 |
| commit | c9bffcd53e66fefb4e168c8d57d759fa6475f275 (patch) | |
| tree | e8a819f21050f165845bdc2be079418c748fcfae /libjava/include/i386-signal.h | |
| parent | 022dae817d1d2f731e3fcaa7b650319983aeea8b (diff) | |
| download | gcc-c9bffcd53e66fefb4e168c8d57d759fa6475f275.zip gcc-c9bffcd53e66fefb4e168c8d57d759fa6475f275.tar.gz gcc-c9bffcd53e66fefb4e168c8d57d759fa6475f275.tar.bz2 | |
i386-signal.h (MAKE_THROW_FRAME): Don't fix up frame pointer...
2001-05-29 Andrew Haley <aph@redhat.com>
* include/i386-signal.h (MAKE_THROW_FRAME): Don't fix up frame
pointer: the dwarf unwinder in libgcc will do everything that's
needed.
(HANDLE_DIVIDE_OVERFLOW): Tidy. Don't mess with stack frames any
more than we absolutely need to.
* configure.host (EXCEPTIONSPEC): Remove libgcj_sjlj on Alpha.
* configure.in (SIGNAL_HANDLER): Use include/dwarf2-signal.h on
Alpha.
(SIGNAL_HANDLER): Test "$enable_sjlj_exceptions", not
"$libgcj_sjlj".
* configure: Rebuilt.
* include/dwarf2-signal.h (MAKE_THROW_FRAME): Adjust PC
for Alpha.
(SIGNAL_HANDLER): Use siginfo style handler.
(INIT_SEGV): Likewise.
(INIT_FPE): Likewise.
* include/ppc-signal.h: Delete whole file.
From-SVN: r42691
Diffstat (limited to 'libjava/include/i386-signal.h')
| -rw-r--r-- | libjava/include/i386-signal.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h index dc3c112..f89a0b1 100644 --- a/libjava/include/i386-signal.h +++ b/libjava/include/i386-signal.h @@ -31,16 +31,11 @@ do \ void **_p = (void **)&_dummy; \ struct sigcontext_struct *_regs = (struct sigcontext_struct *)++_p; \ \ - register unsigned long _ebp = _regs->ebp; \ - register unsigned char *_eip = (unsigned char *)_regs->eip; \ - \ /* Advance the program counter so that it is after the start of the \ instruction: the x86 exception handler expects \ the PC to point to the instruction after a call. */ \ - _eip += 2; \ + _regs->eip += 2; \ \ - asm volatile ("mov %0, (%%ebp); mov %1, 4(%%ebp)" \ - : : "r"(_ebp), "r"(_eip)); \ } \ while (0) @@ -63,7 +58,7 @@ do \ * As the instructions are variable length it is necessary to do a \ * little calculation to figure out where the following instruction \ * actually is. \ - \ + \ */ \ \ if (_eip[0] == 0xf7) \ @@ -104,6 +99,9 @@ do \ \ _eip = (unsigned char *)_ebp[1]; \ _ebp = (unsigned long *)_ebp[0]; \ + \ + asm volatile ("mov %0, (%%ebp); mov %1, 4(%%ebp)" \ + : : "r"(_ebp), "r"(_eip)); \ } \ else \ { \ @@ -111,12 +109,9 @@ do \ of the instruction: this is because the x86 exception \ handler expects the PC to point to the instruction after a \ call. */ \ - _eip += 2; \ + _regs->eip += 2; \ } \ } \ - \ - asm volatile ("mov %0, (%%ebp); mov %1, 4(%%ebp)" \ - : : "r"(_ebp), "r"(_eip)); \ } \ while (0) |