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

i386-signal.h: Rewrite to use rt_sigaction.

Browse source 
2007-01-12  Andrew Haley  <aph@redhat.com>

        * include/i386-signal.h: Rewrite to use rt_sigaction.

From-SVN: r120721
This commit is contained in:
Andrew Haley 2007-01-12 12:30:56 +00:00 • committed by Andrew Haley
parent 8e76821485
commit f005dd79c5
3 changed files with 71 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libjava/ChangeLog
View file

@ -1,3 +1,7 @@
2007-01-12 Andrew Haley <aph@redhat.com>
* include/i386-signal.h: Rewrite to use rt_sigaction.
2007-01-11 Andrew Haley <aph@redhat.com> 2007-01-11 Andrew Haley <aph@redhat.com>
* prims.cc (jdwpOptions) Fix deprecated cast from char[] constant * prims.cc (jdwpOptions) Fix deprecated cast from char[] constant

96
libjava/include/i386-signal.h
View file

@ -1,7 +1,7 @@
// i386-signal.h - Catch runtime signals and turn them into exceptions // i386-signal.h - Catch runtime signals and turn them into exceptions
// on an i386 based Linux system. // on an i386 based Linux system.
/* Copyright (C) 1998, 1999, 2001, 2002, 2006 Free Software Foundation /* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
@ -20,40 +20,45 @@ details. */
#define HANDLE_FPE 1 #define HANDLE_FPE 1
#define SIGNAL_HANDLER(_name) \ #define SIGNAL_HANDLER(_name) \
static void _name (int _dummy __attribute__ ((__unused__))) static void _Jv_##_name (int, siginfo_t *, \
void *_p __attribute__ ((__unused__)))
#define MAKE_THROW_FRAME(_exception)
#define HANDLE_DIVIDE_OVERFLOW \ #define HANDLE_DIVIDE_OVERFLOW \
do \ do \
{ \ { \
void **_p = (void **)&_dummy; \ struct ucontext *_uc = (struct ucontext *)_p; \
volatile struct sigcontext_struct *_regs = (struct sigcontext_struct *)++_p;\ gregset_t &_gregs = _uc->uc_mcontext.gregs; \
\ unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \
register unsigned char *_eip = (unsigned char *)_regs->eip; \
\ \
/* According to the JVM spec, "if the dividend is the negative \ /* According to the JVM spec, "if the dividend is the negative \
* integer of the smallest magnitude and the divisor is -1, then \ * integer of largest possible magnitude for the type and the \
* overflow occurs and the result is equal to the dividend. Despite \ * divisor is -1, then overflow occurs and the result is equal to \
* the overflow, no exception occurs". \ * the dividend. Despite the overflow, no exception occurs". \
\ \
* We handle this by inspecting the instruction which generated the \ * We handle this by inspecting the instruction which generated the \
* signal and advancing eip to point to the following instruction. \ * signal and advancing ip to point to the following instruction. \
* As the instructions are variable length it is necessary to do a \ * As the instructions are variable length it is necessary to do a \
* little calculation to figure out where the following instruction \ * little calculation to figure out where the following instruction \
* actually is. \ * actually is. \
\ \
*/ \ */ \
\ \
/* Detect a signed division of Integer.MIN_VALUE. */ \
if (_eip[0] == 0xf7) \ if (_eip[0] == 0xf7) \
{ \ { \
bool _min_value_dividend = false; \
unsigned char _modrm = _eip[1]; \ unsigned char _modrm = _eip[1]; \
\ \
if (_regs->eax == 0x80000000 \ if (((_modrm >> 3) & 7) == 7) /* Signed divide */ \
&& ((_modrm >> 3) & 7) == 7) /* Signed divide */ \ { \
_min_value_dividend = \
_gregs[REG_EAX] == (greg_t)0x80000000UL; \
} \
\
if (_min_value_dividend) \
{ \ { \
unsigned char _rm = _modrm & 7; \ unsigned char _rm = _modrm & 7; \
_regs->edx = 0; /* the remainder is zero */ \ _gregs[REG_EDX] = 0; /* the remainder is zero */ \
switch (_modrm >> 6) \ switch (_modrm >> 6) \
{ \ { \
case 0: /* register indirect */ \ case 0: /* register indirect */ \
@ -76,62 +81,69 @@ do \
break; \ break; \
} \ } \
_eip += 2; \ _eip += 2; \
_regs->eip = (unsigned long)_eip; \ _gregs[REG_EIP] = (greg_t)_eip; \
return; \ return; \
} \ } \
} \ } \
} \ } \
while (0) while (0)
/* We use old_kernel_sigaction here because we're calling the kernel /* We use kernel_sigaction here because we're calling the kernel
directly rather than via glibc. The sigaction structure that the directly rather than via glibc. The sigaction structure that the
syscall uses is a different shape from the one in userland and not syscall uses is a different shape from the one in userland and not
visible to us in a header file so we define it here. */ visible to us in a header file so we define it here. */
struct old_i386_kernel_sigaction { extern "C"
void (*k_sa_handler) (int); {
unsigned long k_sa_mask; struct kernel_sigaction
{
void (*k_sa_sigaction)(int,siginfo_t *,void *);
unsigned long k_sa_flags; unsigned long k_sa_flags;
void (*sa_restorer) (void); void (*k_sa_restorer) (void);
}; sigset_t k_sa_mask;
};
}
#define MAKE_THROW_FRAME(_exception)
#define RESTORE(name, syscall) RESTORE2 (name, syscall) #define RESTORE(name, syscall) RESTORE2 (name, syscall)
# define RESTORE2(name, syscall) \ #define RESTORE2(name, syscall) \
asm \ asm \
( \ ( \
".text\n" \ ".text\n" \
".byte 0 # Yes, this really is necessary\n" \ ".byte 0 # Yes, this really is necessary\n" \
" .align 8\n" \ " .align 16\n" \
"__" #name ":\n" \ "__" #name ":\n" \
" popl %eax\n" \
" movl $" #syscall ", %eax\n" \ " movl $" #syscall ", %eax\n" \
" int $0x80" \ " int $0x80" \
); );
RESTORE (restore, __NR_sigreturn) /* The return code for realtime-signals. */
static void restore (void) asm ("__restore"); RESTORE (restore_rt, __NR_rt_sigreturn)
void restore_rt (void) asm ("__restore_rt")
__attribute__ ((visibility ("hidden")));
#define INIT_SEGV \ #define INIT_SEGV \
do \ do \
{ \ { \
struct old_i386_kernel_sigaction kact; \ struct kernel_sigaction act; \
kact.k_sa_handler = catch_segv; \ act.k_sa_sigaction = _Jv_catch_segv; \
kact.k_sa_mask = 0; \ sigemptyset (&act.k_sa_mask); \
kact.k_sa_flags = 0x4000000; \ act.k_sa_flags = SA_SIGINFO|0x4000000; \
kact.sa_restorer = restore; \ act.k_sa_restorer = restore_rt; \
syscall (SYS_sigaction, SIGSEGV, &kact, NULL); \ syscall (SYS_rt_sigaction, SIGSEGV, &act, NULL, _NSIG / 8); \
} \ } \
while (0) while (0)
#define INIT_FPE \ #define INIT_FPE \
do \ do \
{ \ { \
struct old_i386_kernel_sigaction kact; \ struct kernel_sigaction act; \
kact.k_sa_handler = catch_fpe; \ act.k_sa_sigaction = _Jv_catch_fpe; \
kact.k_sa_mask = 0; \ sigemptyset (&act.k_sa_mask); \
kact.k_sa_flags = 0x4000000; \ act.k_sa_flags = SA_SIGINFO|0x4000000; \
kact.sa_restorer = restore; \ act.k_sa_restorer = restore_rt; \
syscall (SYS_sigaction, SIGFPE, &kact, NULL); \ syscall (SYS_rt_sigaction, SIGFPE, &act, NULL, _NSIG / 8); \
} \ } \
while (0) while (0)
@ -147,9 +159,9 @@ while (0)
* syscall(SYS_sigaction) causes our handler to be called directly * syscall(SYS_sigaction) causes our handler to be called directly
* by the kernel, bypassing any wrappers. * by the kernel, bypassing any wrappers.
* Also, there is at the present time no unwind info in the * Also, there may not be any unwind info in the linuxthreads
* linuxthreads library's signal handlers and so we can't unwind * library's signal handlers and so we can't unwind through them
* through them anyway. */ * anyway. */
#endif /* JAVA_SIGNAL_H */ #endif /* JAVA_SIGNAL_H */

2
libjava/include/x86_64-signal.h
View file

@ -1,7 +1,7 @@
// x86_64-signal.h - Catch runtime signals and turn them into exceptions // x86_64-signal.h - Catch runtime signals and turn them into exceptions
// on an x86_64 based GNU/Linux system. // on an x86_64 based GNU/Linux system.
/* Copyright (C) 2003, 2006 Free Software Foundation /* Copyright (C) 2003, 2006, 2007 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.