procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i386-signal.h, [...]: New files.

Browse source 
1999-04-13  Andrew Haley  <aph@cygnus.com>
        * include/i386-signal.h, include/default-signal.h: New files.
        * prims.cc (catch_segv): Call MAKE_THROW_FRAME in exception
        handler.
        (catch_fpe): New function.
        * configure.in: Make link to appropriate include/java-signal.h.
        * configure: Rebuilt.
        * Makefile.am: include/java-signal.h added to dependency list.
        * Makefile.in: Rebuilt.

From-SVN: r26400
This commit is contained in:
Andrew Haley 1999-04-13 09:18:09 +00:00 • committed by Andrew Haley
parent 0e8285f120
commit a4e44caa6d
8 changed files with 133 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

56
libjava/prims.cc
View file

@ -14,14 +14,12 @@ details. */
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HANDLE_SEGV
#include <signal.h>
#endif
#pragma implementation "java-array.h"
#include <cni.h>
#include <jvm.h>
#include <java-signal.h>
#include <java/lang/Class.h>
#include <java/lang/Runtime.h>
@ -30,6 +28,7 @@ details. */
#include <java/lang/ThreadGroup.h>
#include <java/lang/FirstThread.h>
#include <java/lang/ArrayIndexOutOfBoundsException.h>
#include <java/lang/ArithmeticException.h>
#include <java/lang/ClassFormatError.h>
#include <java/lang/ClassCastException.h>
#include <java/lang/NegativeArraySizeException.h>
@ -40,6 +39,7 @@ details. */
#include <java/lang/reflect/Modifier.h>
#include <java/io/PrintStream.h>
#define ObjectClass _CL_Q34java4lang6Object
extern java::lang::Class ObjectClass;
@ -426,19 +426,31 @@ _Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
#ifdef HANDLE_SEGV
#ifdef HANDLE_SEGV
static java::lang::NullPointerException *nullp;
static void
catch_segv (int)
catch_segv (int dummy)
{
MAKE_THROW_FRAME(dummy);
// Don't run `new' in a signal handler, so we always throw the same
// null pointer exception.
// exception.
_Jv_Throw (nullp);
}
#endif
#endif /* HANDLE_SEGV */
#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
{
@ -560,14 +572,26 @@ 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);
#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
no_memory = new java::lang::OutOfMemoryError;