From 83aad43285c19b1ecd1db18385a38721ab5e6f5f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 8 Apr 2002 02:16:12 +0000 Subject: [PATCH] 2002-04-06 Roland McGrath * sysdeps/mach/hurd/alpha/exc2signal.c (_hurd_exception2signal): Rewritten. * sysdeps/mach/hurd/alpha/longjmp-ts.c (_hurd_longjmp_thread_state): Rewritten. --- sysdeps/mach/hurd/alpha/exc2signal.c | 27 +++++++++++++-------------- sysdeps/mach/hurd/alpha/longjmp-ts.c | 29 ++++++++++++++++++----------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/sysdeps/mach/hurd/alpha/exc2signal.c b/sysdeps/mach/hurd/alpha/exc2signal.c index 3bceb64..5f3fbbb 100644 --- a/sysdeps/mach/hurd/alpha/exc2signal.c +++ b/sysdeps/mach/hurd/alpha/exc2signal.c @@ -1,5 +1,5 @@ /* Translate Mach exception codes into signal numbers. Alpha version. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1994,97,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,52 +25,51 @@ into a signal number and signal subcode. */ void -_hurd_exception2signal (int exception, int code, int subcode, - int *signo, long int *sigcode, int *error) +_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo) { - *error = 0; + detail->error = 0; - switch (exception) + switch (detail->exc) { default: *signo = SIGIOT; - *sigcode = exception; + detail->code = detail->exc; break; case EXC_BAD_ACCESS: - if (code == KERN_PROTECTION_FAILURE) + if (detail->exc_code == KERN_PROTECTION_FAILURE) *signo = SIGSEGV; else *signo = SIGBUS; - *sigcode = subcode; - *error = code; + detail->code = detail->exc_subcode; + detail->error = detail->exc_code; break; case EXC_BAD_INSTRUCTION: *signo = SIGILL; - *sigcode = code; + detail->code = detail->exc_code; break; case EXC_ARITHMETIC: *signo = SIGFPE; - *sigcode = code; + detail->code = detail->exc_code; break; break; case EXC_EMULATION: /* 3.0 doesn't give this one, why, I don't know. */ *signo = SIGEMT; - *sigcode = code; + detail->code = detail->exc_code; break; case EXC_SOFTWARE: *signo = SIGEMT; - *sigcode = code; + detail->code = detail->exc_code; break; case EXC_BREAKPOINT: *signo = SIGTRAP; - *sigcode = code; + detail->code = detail->exc_code; break; } } diff --git a/sysdeps/mach/hurd/alpha/longjmp-ts.c b/sysdeps/mach/hurd/alpha/longjmp-ts.c index eb27649..b271d6d 100644 --- a/sysdeps/mach/hurd/alpha/longjmp-ts.c +++ b/sysdeps/mach/hurd/alpha/longjmp-ts.c @@ -1,5 +1,5 @@ /* Perform a `longjmp' on a Mach thread_state. Alpha version. - Copyright (C) 1991, 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,15 +27,22 @@ void _hurd_longjmp_thread_state (void *state, jmp_buf env, int val) { - struct alpha_thread_state *ts = state; - - ts->r9 = env[0].__jmpbuf[0].__9; - ts->r11 = env[0].__jmpbuf[0].__11; - ts->r12 = env[0].__jmpbuf[0].__12; - ts->r13 = env[0].__jmpbuf[0].__13; - ts->r14 = env[0].__jmpbuf[0].__14; - ts->r15 = (long int) env[0].__jmpbuf[0].__fp; - ts->r30 = (long int) env[0].__jmpbuf[0].__sp; - ts->pc = (long int) env[0].__jmpbuf[0].__pc; + struct alpha_thread_state *const ts = state; + + ts->r9 = env[0].__jmpbuf[JB_S0]; + ts->r10 = env[0].__jmpbuf[JB_S1]; + ts->r11 = env[0].__jmpbuf[JB_S2]; + ts->r12 = env[0].__jmpbuf[JB_S3]; + ts->r13 = env[0].__jmpbuf[JB_S4]; + ts->r13 = env[0].__jmpbuf[JB_S5]; + ts->pc = env[0].__jmpbuf[JB_PC]; + ts->r15 = env[0].__jmpbuf[JB_FP]; + ts->r30 = env[0].__jmpbuf[JB_SP]; ts->r0 = val ?: 1; + + /* XXX + To mimic longjmp we ought to restore some fp registers too. + But those registers are in struct alpha_float_state. + The only use of this is in fork, and it probably won't matter. + */ } -- 2.7.4