Suggested by: bde
Move sigjmp_buf and jmp_buf structure definitions to machine/setjmp.h so that i386 can continue to use int as the basic register type and alpha can use long. Bruce was concerned about possible differing alignment. I've left the definition of _JBLEN in machine/setjmp.h even though Bruce's example used the number directly. I don't know if any other code relies on _JBLEN, so I left it to avoid potential breakage.
This commit is contained in:
parent
ffe0efc2a9
commit
013239afdf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=32641
@ -44,17 +44,6 @@
|
|||||||
/* The size of the jmp_buf is machine dependent: */
|
/* The size of the jmp_buf is machine dependent: */
|
||||||
#include <machine/setjmp.h>
|
#include <machine/setjmp.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* jmp_buf and sigjmp_buf are encapsulated in different structs to force
|
|
||||||
* compile-time diagnostics for mismatches. The structs are the same
|
|
||||||
* internally to avoid some run-time errors for mismatches.
|
|
||||||
*/
|
|
||||||
#ifndef _ANSI_SOURCE
|
|
||||||
typedef struct { long _sjb[_JBLEN + 1]; } sigjmp_buf[1];
|
|
||||||
#endif /* not ANSI */
|
|
||||||
|
|
||||||
typedef struct { long _jb[_JBLEN + 1]; } jmp_buf[1];
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
|
|
||||||
__BEGIN_DECLS
|
__BEGIN_DECLS
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id$ */
|
/* $Id: setjmp.h,v 1.1 1998/01/10 23:00:06 jb Exp $ */
|
||||||
/* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */
|
/* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -33,3 +33,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#define _JBLEN 81 /* size, in longs, of a jmp_buf */
|
#define _JBLEN 81 /* size, in longs, of a jmp_buf */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* jmp_buf and sigjmp_buf are encapsulated in different structs to force
|
||||||
|
* compile-time diagnostics for mismatches. The structs are the same
|
||||||
|
* internally to avoid some run-time errors for mismatches.
|
||||||
|
*/
|
||||||
|
#ifndef _ANSI_SOURCE
|
||||||
|
typedef struct { long _sjb[_JBLEN + 1]; } sigjmp_buf[1];
|
||||||
|
#endif /* not ANSI */
|
||||||
|
|
||||||
|
typedef struct { long _jb[_JBLEN + 1]; } jmp_buf[1];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id$ */
|
/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
|
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
@ -33,3 +33,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#define _JBLEN 8 /* Size of the jmp_buf on x86. */
|
#define _JBLEN 8 /* Size of the jmp_buf on x86. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* jmp_buf and sigjmp_buf are encapsulated in different structs to force
|
||||||
|
* compile-time diagnostics for mismatches. The structs are the same
|
||||||
|
* internally to avoid some run-time errors for mismatches.
|
||||||
|
*/
|
||||||
|
#ifndef _ANSI_SOURCE
|
||||||
|
typedef struct { int _sjb[_JBLEN + 1]; } sigjmp_buf[1];
|
||||||
|
#endif /* not ANSI */
|
||||||
|
|
||||||
|
typedef struct { int _jb[_JBLEN + 1]; } jmp_buf[1];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id$ */
|
/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
|
* Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
@ -33,3 +33,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#define _JBLEN 8 /* Size of the jmp_buf on x86. */
|
#define _JBLEN 8 /* Size of the jmp_buf on x86. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* jmp_buf and sigjmp_buf are encapsulated in different structs to force
|
||||||
|
* compile-time diagnostics for mismatches. The structs are the same
|
||||||
|
* internally to avoid some run-time errors for mismatches.
|
||||||
|
*/
|
||||||
|
#ifndef _ANSI_SOURCE
|
||||||
|
typedef struct { int _sjb[_JBLEN + 1]; } sigjmp_buf[1];
|
||||||
|
#endif /* not ANSI */
|
||||||
|
|
||||||
|
typedef struct { int _jb[_JBLEN + 1]; } jmp_buf[1];
|
||||||
|
Loading…
Reference in New Issue
Block a user