From 01f78a025e7e000b836ab9ff76ffc3b9958ba43e Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 20 Apr 1999 06:27:11 +0000 Subject: sparc-signal.h: new file. 1999-04-20 Andrew Haley * include/sparc-signal.h: new file. * configure.in: include/sparc-signal.h added. * configure: regenerated. * prims.cc (JvRunMain): signal handling code rewritten to be more portable. (catch_segv): ditto. (catch_fpe): ditto. * include/i386-signal.h: reorganized. * include/default-signal.h: reorganized. From-SVN: r26560 --- libjava/include/default-signal.h | 3 ++ libjava/include/i386-signal.h | 32 ++++++++++++++++++-- libjava/include/sparc-signal.h | 63 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 libjava/include/sparc-signal.h (limited to 'libjava/include') diff --git a/libjava/include/default-signal.h b/libjava/include/default-signal.h index 63ba129..71545c0 100644 --- a/libjava/include/default-signal.h +++ b/libjava/include/default-signal.h @@ -14,5 +14,8 @@ details. */ #undef HANDLE_SEGV #undef HANDLE_FPE +#define INIT_SEGV do {} while (0) +#define INIT_FPE do {} while (0) + #endif /* JAVA_SIGNAL_H */ diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h index de893af..73d8bbb 100644 --- a/libjava/include/i386-signal.h +++ b/libjava/include/i386-signal.h @@ -9,8 +9,8 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ /* This technique should work for all i386 based Unices which conform - to iBCS2. This includes all versions of Linux more recent than - version 1.3 */ + * to iBCS2. This includes all versions of Linux more recent than 1.3 + */ #ifndef JAVA_SIGNAL_H @@ -21,8 +21,10 @@ details. */ #define HANDLE_SEGV 1 #define HANDLE_FPE 1 +#define SIGNAL_HANDLER(_name) \ +static void _name (int _dummy) -#define MAKE_THROW_FRAME(_dummy) \ +#define MAKE_THROW_FRAME \ { \ void **_p = (void **)&_dummy; \ struct sigcontext_struct *_regs = (struct sigcontext_struct *)++_p; \ @@ -34,5 +36,29 @@ details. */ : : "r"(_ebp), "r"(_eip)); \ } +#define INIT_SEGV \ +do \ + { \ + nullp = new java::lang::NullPointerException (); \ + struct sigaction act; \ + act.sa_handler = catch_segv; \ + sigemptyset (&act.sa_mask); \ + act.sa_flags = 0; \ + sigaction (SIGSEGV, &act, NULL); \ + } \ +while (0) + +#define INIT_FPE \ +do \ + { \ + arithexception = new java::lang::ArithmeticException (); \ + struct sigaction act; \ + act.sa_handler = catch_fpe; \ + sigemptyset (&act.sa_mask); \ + act.sa_flags = 0; \ + sigaction (SIGFPE, &act, NULL); \ + } \ +while (0) + #endif /* JAVA_SIGNAL_H */ diff --git a/libjava/include/sparc-signal.h b/libjava/include/sparc-signal.h new file mode 100644 index 0000000..dfe8635 --- /dev/null +++ b/libjava/include/sparc-signal.h @@ -0,0 +1,63 @@ +// sparc-signal.h - Catch runtime signals and turn them into exceptions. + +/* Copyright (C) 1998, 1999 Cygnus Solutions + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +#ifndef JAVA_SIGNAL_H +#define JAVA_SIGNAL_H 1 + +#include +#include + +#define HANDLE_SEGV 1 +#define HANDLE_FPE 1 + +#define SIGNAL_HANDLER(_name) \ +static void _name (int _dummy, siginfo_t *_info, ucontext_t *_context) + +#define FLUSH_REGISTER_WINDOWS \ + asm volatile ("ta 3"); + +#define MAKE_THROW_FRAME \ +do \ +{ \ + (void)_dummy; \ + (void)_info; \ + register int sp = _context->uc_mcontext.gregs[REG_SP]; \ + register int retaddr = _context->uc_mcontext.gregs[REG_O7]; \ + FLUSH_REGISTER_WINDOWS; \ + asm volatile ("mov %0, %%i6; mov %1, %%i7" \ + : : "r"(sp), "r"(retaddr)); \ +} \ +while (0) + +#define INIT_SEGV \ +do \ + { \ + nullp = new java::lang::NullPointerException (); \ + struct sigaction act; \ + act.sa_sigaction = catch_segv; \ + act.sa_flags = SA_SIGINFO; \ + sigemptyset (&act.sa_mask); \ + sigaction (SIGSEGV, &act, NULL); \ + } \ +while (0) + +#define INIT_FPE \ +do \ + { \ + arithexception = new java::lang::ArithmeticException (); \ + struct sigaction act; \ + act.sa_flags = SA_SIGINFO; \ + act.sa_sigaction = catch_fpe; \ + sigemptyset (&act.sa_mask); \ + sigaction (SIGFPE, &act, NULL); \ + } \ +while (0) + +#endif /* JAVA_SIGNAL_H */ -- cgit v1.1