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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
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.
1999-04-12 Urban Widmark <urban@svenskatest.se>
* java/io/DataInputStream.java (readLine): Corrected handling of

2
libjava/Makefile.am
View File

@ -135,7 +135,7 @@ $(nat_files): %.o: %.cc
$(CXXCOMPILE) -c -o $@ $<
$(nat_files) $(GCOBJS) $(THREADOBJS) $(libgcj_a_OBJECTS): \
include/config.h $(nat_headers)
include/config.h include/java-signal.h $(nat_headers)
## FIXME: GNU make.
$(c_files): %.o: %.c

2
libjava/Makefile.in
View File

@ -1191,7 +1191,7 @@ $(nat_files): %.o: %.cc
$(CXXCOMPILE) -c -o $@ $<
$(nat_files) $(GCOBJS) $(THREADOBJS) $(libgcj_a_OBJECTS): \
include/config.h $(nat_headers)
include/config.h include/java-signal.h $(nat_headers)
$(c_files): %.o: %.c
$(COMPILE) -c -o $@ $<

15
libjava/configure vendored
View File

@ -3298,6 +3298,17 @@ done
test -n "$PERL" || PERL="false"
case "${host}" in
i?86-*-linux*)
SIGNAL_HANDLER=include/i386-signal.h
;;
*)
SIGNAL_HANDLER=include/default-signal.h
;;
esac
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else
@ -3714,8 +3725,8 @@ fi; done
EOF
cat >> $CONFIG_STATUS <<EOF
ac_sources="java/io/$FILE_DESCRIPTOR include/$GCHDR include/$THREADH"
ac_dests="java/io/natFileDescriptor.cc include/java-gc.h include/java-threads.h"
ac_sources="java/io/$FILE_DESCRIPTOR include/$GCHDR include/$THREADH $SIGNAL_HANDLER"
ac_dests="java/io/natFileDescriptor.cc include/java-gc.h include/java-threads.h include/java-signal.h"
EOF
cat >> $CONFIG_STATUS <<\EOF

11
libjava/configure.in
View File

@ -362,6 +362,17 @@ AC_FUNC_ALLOCA
AC_CHECK_PROGS(PERL, perl, false)
case "${host}" in
i?86-*-linux*)
SIGNAL_HANDLER=include/i386-signal.h
;;
*)
SIGNAL_HANDLER=include/default-signal.h
;;
esac
AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h)
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else

18
libjava/include/default-signal.h Normal file
View File

@ -0,0 +1,18 @@
// default-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
#undef HANDLE_SEGV
#undef HANDLE_FPE
#endif /* JAVA_SIGNAL_H */

38
libjava/include/i386-signal.h Normal file
View File

@ -0,0 +1,38 @@
// i386-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. */
/* 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 */
#ifndef JAVA_SIGNAL_H
#define JAVA_SIGNAL_H 1
#include <signal.h>
#define HANDLE_SEGV 1
#define HANDLE_FPE 1
#define MAKE_THROW_FRAME(_dummy) \
{ \
void **_p = (void **)&_dummy; \
struct sigcontext_struct *_regs = (struct sigcontext_struct *)++_p; \
\
register unsigned long _ebp = _regs->ebp; \
register unsigned long _eip = _regs->eip; \
\
asm volatile ("mov %0, (%%ebp); mov %1, 4(%%ebp)" \
: : "r"(_ebp), "r"(_eip)); \
}
#endif /* JAVA_SIGNAL_H */

40
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;
@ -427,18 +427,30 @@ _Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
#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
{
@ -561,13 +573,25 @@ 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
no_memory = new java::lang::OutOfMemoryError;