qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix exc2signal.c template 

As a follow-up to 0e3426bbcf

	* hurd/exc2signal.c: #include <hurd/signal.h>
	(_hurd_exception2signal): Replace 'exception', 'code', 'subcode',
	'sigcode', 'error' parameters with 'detail' parameter.  Fix code
	accordingly.
This commit is contained in:
Samuel Thibault 2016-09-20 21:58:36 +02:00
parent 2c46d11486
commit aea5c83461
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2016-09-20 Samuel Thibault <samuel.thibault@ens-lyon.org>
* hurd/exc2signal.c: #include <hurd/signal.h>
(_hurd_exception2signal): Replace 'exception', 'code', 'subcode',
'sigcode', 'error' parameters with 'detail' parameter. Fix code
accordingly.
2016-09-20 Paul E. Murphy <murphyp@linux.vnet.ibm.com> 2016-09-20 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
* math/Makefile (libm-calls): Remove s_nanF. * math/Makefile (libm-calls): Remove s_nanF.

24
hurd/exc2signal.c
View File

@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <hurd.h> #include <hurd.h>
#include <hurd/signal.h>
/* This file must be modified with machine-dependent details. */ /* This file must be modified with machine-dependent details. */
#error "need to write sysdeps/mach/hurd/MACHINE/exc2signal.c" #error "need to write sysdeps/mach/hurd/MACHINE/exc2signal.c"
@ -25,46 +26,45 @@
into a signal number and signal subcode. */ into a signal number and signal subcode. */
void void
_hurd_exception2signal (int exception, int code, int subcode, _hurd_exception2signal (struct hurd_signal_detail *detail, int *signo)
int *signo, int *sigcode, int *error)
{ {
*error = 0; detail->error = 0;
switch (exception) switch (detail->exc)
{ {
default: default:
*signo = SIGIOT; *signo = SIGIOT;
*sigcode = exception; detail->code = detail->exc;
break; break;
case EXC_BAD_ACCESS: case EXC_BAD_ACCESS:
if (code == KERN_PROTECTION_FAILURE) if (detail->exc_code == KERN_PROTECTION_FAILURE)
*signo = SIGSEGV; *signo = SIGSEGV;
else else
*signo = SIGBUS; *signo = SIGBUS;
*sigcode = subcode; detail->code = detail->exc_subcode;
*error = code; detail->error = detail->exc_code;
break; break;
case EXC_BAD_INSTRUCTION: case EXC_BAD_INSTRUCTION:
*signo = SIGILL; *signo = SIGILL;
*sigcode = 0; detail->code = 0;
break; break;
case EXC_ARITHMETIC: case EXC_ARITHMETIC:
*signo = SIGFPE; *signo = SIGFPE;
*sigcode = 0; detail->code = 0;
break; break;
case EXC_EMULATION: case EXC_EMULATION:
case EXC_SOFTWARE: case EXC_SOFTWARE:
*signo = SIGEMT; *signo = SIGEMT;
*sigcode = 0; detail->code = 0;
break; break;
case EXC_BREAKPOINT: case EXC_BREAKPOINT:
*signo = SIGTRAP; *signo = SIGTRAP;
*sigcode = 0; detail->code = 0;
break; break;
} }
} }