OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sparc-signal.h: new file. 

1999-04-20  Andrew Haley  <aph@cygnus.com>
        * 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
This commit is contained in:
Andrew Haley 1999-04-20 06:27:11 +00:00 committed by Andrew Haley
parent 3d6b966178
commit 01f78a025e
7 changed files with 278 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
1999-04-20 Andrew Haley <aph@cygnus.com>
* 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.
1999-04-19 Tom Tromey <tromey@cygnus.com>
* java/lang/natSystem.cc (init_properties): Only declare pwd_entry

307
libjava/configure vendored
View File

File diff suppressed because it is too large Load Diff

3
libjava/configure.in
View File

@ -366,6 +366,9 @@ case "${host}" in
i?86-*-linux*)
SIGNAL_HANDLER=include/i386-signal.h
;;
sparc-sun-solaris*)
SIGNAL_HANDLER=include/sparc-signal.h
;;
*)
SIGNAL_HANDLER=include/default-signal.h
;;

3
libjava/include/default-signal.h
View File

@ -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 */

32
libjava/include/i386-signal.h
View File

@ -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 */

63
libjava/include/sparc-signal.h Normal file
View File

@ -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 <signal.h>
#include <ucontext.h>
#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 */

69
libjava/prims.cc
View File

@ -52,6 +52,26 @@ static java::lang::OutOfMemoryError *no_memory;
#ifdef HANDLE_SEGV
static java::lang::NullPointerException *nullp;
SIGNAL_HANDLER (catch_segv)
{
MAKE_THROW_FRAME;
_Jv_Throw (nullp);
}
#endif
#ifdef HANDLE_FPE
static java::lang::ArithmeticException *arithexception;
SIGNAL_HANDLER (catch_fpe)
{
MAKE_THROW_FRAME;
_Jv_Throw (arithexception);
}
#endif
jboolean
_Jv_equalUtf8Consts (Utf8Const* a, Utf8Const *b)
{
@ -426,32 +446,6 @@ _Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
#ifdef HANDLE_SEGV
static java::lang::NullPointerException *nullp;
static void
catch_segv (int dummy)
{
MAKE_THROW_FRAME(dummy);
// Don't run `new' in a signal handler, so we always throw the same
// exception.
_Jv_Throw (nullp);
}
#endif
#ifdef HANDLE_FPE
static java::lang::ArithmeticException *arithexception;
static void
catch_fpe (int dummy)
{
MAKE_THROW_FRAME(dummy);
// Don't run `new' in a signal handler, so we always throw the same
// exception.
_Jv_Throw (arithexception);
}
#endif
class _Jv_PrimClass : public java::lang::Class
{
public:
@ -572,27 +566,8 @@ static java::lang::Thread *main_thread;
void
JvRunMain (jclass klass, int argc, const char **argv)
{
#ifdef HANDLE_SEGV
{
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);
}
#endif
#ifdef HANDLE_FPE
{
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);
}
#endif
INIT_SEGV;
INIT_FPE;
no_memory = new java::lang::OutOfMemoryError;