diff options
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/include/_types.h | 143 | ||||
| -rw-r--r-- | sys/ia64/include/ansi.h | 110 | ||||
| -rw-r--r-- | sys/ia64/include/endian.h | 2 | ||||
| -rw-r--r-- | sys/ia64/include/stdarg.h | 4 | ||||
| -rw-r--r-- | sys/ia64/include/types.h | 62 | ||||
| -rw-r--r-- | sys/ia64/include/varargs.h | 4 |
6 files changed, 149 insertions, 176 deletions
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h new file mode 100644 index 000000000000..3ca3584f3749 --- /dev/null +++ b/sys/ia64/include/_types.h @@ -0,0 +1,143 @@ +/*- + * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org> + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 + * From: @(#)types.h 8.3 (Berkeley) 1/5/94 + * $FreeBSD$ + */ + +#ifndef _MACHINE__TYPES_H_ +#define _MACHINE__TYPES_H_ + +/* + * Basic types upon which most other types are built. + */ +typedef __signed char __int8_t; +typedef unsigned char __uint8_t; +typedef short __int16_t; +typedef unsigned short __uint16_t; +typedef int __int32_t; +typedef unsigned int __uint32_t; +typedef long __int64_t; +typedef unsigned long __uint64_t; + +/* + * Standard type definitions. + */ +typedef __int32_t __clock_t; /* clock()... */ +typedef __int32_t __clockid_t; /* clock_gettime()... */ +typedef __int64_t __critical_t; +typedef __uint32_t __fflags_t; /* file flags */ +typedef __int64_t __intfptr_t; +typedef __int64_t __intmax_t; +typedef __int64_t __intptr_t; +typedef __uint32_t __intrmask_t; +typedef __int32_t __int_fast8_t; +typedef __int32_t __int_fast16_t; +typedef __int32_t __int_fast32_t; +typedef __int64_t __int_fast64_t; +typedef __int8_t __int_least8_t; +typedef __int16_t __int_least16_t; +typedef __int32_t __int_least32_t; +typedef __int64_t __int_least64_t; +typedef __int64_t __off_t; /* file offset */ +typedef __int32_t __pid_t; /* process [group] */ +typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ +typedef __int64_t __register_t; +typedef __int64_t __segsz_t; /* segment size (in pages) */ +typedef __uint64_t __size_t; /* sizeof() */ +typedef __uint32_t __socklen_t; +typedef __int64_t __ssize_t; /* byte count or error */ +typedef __int32_t __time_t; /* time()... */ +typedef __int32_t __timer_t; /* timer_gettime()... */ +typedef __uint64_t __uintfptr_t; +typedef __uint64_t __uintmax_t; +typedef __uint64_t __uintptr_t; +typedef __uint32_t __uint_fast8_t; +typedef __uint32_t __uint_fast16_t; +typedef __uint32_t __uint_fast32_t; +typedef __uint64_t __uint_fast64_t; +typedef __uint8_t __uint_least8_t; +typedef __uint16_t __uint_least16_t; +typedef __uint32_t __uint_least32_t; +typedef __uint64_t __uint_least64_t; +typedef __uint64_t __u_register_t; +typedef __uint64_t __vm_offset_t; +typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_pindex_t; +typedef __uint64_t __vm_size_t; + +/* + * Unusual type definitions. + */ +/* + * The rune type above is declared to be an ``int'' instead of the more natural + * ``unsigned long'' or ``long''. Two things are happening here. It is not + * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, + * it looks like 10646 will be a 31 bit standard. This means that if your + * ints cannot hold 32 bits, you will be in trouble. The reason an int was + * chosen over a long is that the is*() and to*() routines take ints (says + * ANSI C), but they use __ct_rune_t instead of int. By changing it here, you + * lose a bit of ANSI conformance, but your programs will still work. + * + * NOTE: rune_t is not covered by ANSI nor other standards, and should not + * be instantiated outside of lib/libc/locale. Use wchar_t. wchar_t and + * rune_t must be the same type. Also wint_t must be no narrower than + * wchar_t, and should also be able to hold all members of the largest + * character set plus one extra value (WEOF). wint_t must be at least 16 bits. + */ +typedef __int32_t __ct_rune_t; +typedef __int32_t __rune_t; +typedef __int32_t __wchar_t; +typedef __int32_t __wint_t; + +/* + * mbstate_t is an opaque object to keep conversion state, during multibyte + * stream conversions. The content must not be referenced by user programs. + */ +typedef union { + char __mbstate8[128]; + __int64_t _mbstateL; /* for alignment */ +} __mbstate_t; + +#ifdef __GNUC__ +typedef __builtin_va_list __va_list; /* internally known to gcc */ +#if !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST +typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ +#endif +#else +#error Must add va_list support for this non-GCC compiler. +#endif /* __GNUC__ */ + +#endif /* !_MACHINE__TYPES_H_ */ diff --git a/sys/ia64/include/ansi.h b/sys/ia64/include/ansi.h index a7cde5b6cdf8..11dbf035602e 100644 --- a/sys/ia64/include/ansi.h +++ b/sys/ia64/include/ansi.h @@ -39,68 +39,6 @@ #define _MACHINE_ANSI_H_ /* - * Types which are fundamental to the implementation and may appear in - * more than one standard header are defined here. Standard headers - * then use: - * #ifdef _BSD_SIZE_T_ - * typedef _BSD_SIZE_T_ size_t; - * #undef _BSD_SIZE_T_ - * #endif - */ -#define _BSD_CLOCK_T_ int /* clock() */ -#define _BSD_CLOCKID_T_ int /* clockid_t */ -#define _BSD_FFLAGS_T_ __uint_least32_t /* file flags */ -#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ -#define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ -#define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ -#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ -#define _BSD_SIZE_T_ unsigned long /* sizeof() */ -#define _BSD_SOCKLEN_T_ __uint32_t -#define _BSD_SSIZE_T_ long /* byte count or error */ -#define _BSD_TIME_T_ int /* time() */ -#define _BSD_TIMER_T_ int /* timer_t */ -#define _BSD_WCHAR_T_ _BSD_CT_RUNE_T_ /* wchar_t (see below) */ -#define _BSD_WINT_T_ _BSD_CT_RUNE_T_ /* wint_t (see below) */ - -/* - * Types which are fundamental to the implementation and must be used - * in more than one standard header although they are only declared in - * one (perhaps nonstandard) header are defined here. Standard headers - * use _BSD_XXX_T_ without undef'ing it. - */ -#define _BSD_CT_RUNE_T_ int /* arg type for ctype funcs */ -#define _BSD_OFF_T_ long /* file offset */ -#define _BSD_PID_T_ int /* process [group] */ - -#ifdef __GNUC__ -#define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ -#if !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) -#define __GNUC_VA_LIST -typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ -#endif -#else -#error Must add va_list support for this non-GCC compiler. -#endif /*__GNUC__*/ - -/* - * The rune type above is declared to be an ``int'' instead of the more natural - * ``unsigned long'' or ``long''. Two things are happening here. It is not - * unsigned so that EOF (-1) can be naturally assigned to it and used. Also, - * it looks like 10646 will be a 31 bit standard. This means that if your - * ints cannot hold 32 bits, you will be in trouble. The reason an int was - * chosen over a long is that the is*() and to*() routines take ints (says - * ANSI C), but they use _BSD_CT_RUNE_T_ instead of int. By changing it - * here, you lose a bit of ANSI conformance, but your programs will still - * work. - * - * NOTE: rune_t is not covered by ANSI nor other standards, and should not - * be instantiated outside of lib/libc/locale. Use wchar_t. wchar_t and - * rune_t must be the same type. Also wint_t must be no narrower than - * wchar_t, and should also be able to hold all members of the largest - * character set plus one extra value (WEOF). wint_t must be at least 16 bits. - */ - -/* * Frequencies of the clock ticks reported by clock() and times(). They * are the same as stathz for bogus historical reasons. They should be * 1e6 because clock() and times() are implemented using getrusage() and @@ -113,50 +51,4 @@ typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ #define _BSD_CLK_TCK_ 100 #define _BSD_CLOCKS_PER_SEC_ 100 -/* - * Internal names for basic integral types. Omit the typedef if - * not possible for a machine/compiler combination. - */ -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -typedef long __int64_t; -typedef unsigned long __uint64_t; - -typedef long __intptr_t; -typedef unsigned long __uintptr_t; - -typedef __signed char __int_least8_t; -typedef unsigned char __uint_least8_t; -typedef short __int_least16_t; -typedef unsigned short __uint_least16_t; -typedef int __int_least32_t; -typedef unsigned int __uint_least32_t; -typedef long __int_least64_t; -typedef unsigned long __uint_least64_t; - -typedef int __int_fast8_t; -typedef unsigned int __uint_fast8_t; -typedef int __int_fast16_t; -typedef unsigned int __uint_fast16_t; -typedef int __int_fast32_t; -typedef unsigned int __uint_fast32_t; -typedef long __int_fast64_t; -typedef unsigned long __uint_fast64_t; - -typedef long __intmax_t; -typedef unsigned long __uintmax_t; - -/* - * mbstate_t is an opaque object to keep conversion state, during multibyte - * stream conversions. The content must not be referenced by user programs. - */ -typedef union { - char __mbstate8[128]; - __int64_t _mbstateL; /* for alignment */ -} __mbstate_t; - -#endif /* _MACHINE_ANSI_H_ */ +#endif /* !_MACHINE_ANSI_H_ */ diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h index 5ae1ac538c5a..7ba8bbfbb999 100644 --- a/sys/ia64/include/endian.h +++ b/sys/ia64/include/endian.h @@ -39,7 +39,7 @@ #define _MACHINE_ENDIAN_H_ #include <sys/cdefs.h> -#include <machine/ansi.h> +#include <sys/_types.h> /* * Define the order of 32-bit words in 64-bit words. diff --git a/sys/ia64/include/stdarg.h b/sys/ia64/include/stdarg.h index 4a0bcf859a2d..f48a20b11394 100644 --- a/sys/ia64/include/stdarg.h +++ b/sys/ia64/include/stdarg.h @@ -38,9 +38,9 @@ #ifndef _MACHINE_STDARG_H_ #define _MACHINE_STDARG_H_ -#include <machine/ansi.h> +#include <sys/_types.h> -typedef _BSD_VA_LIST_ va_list; +typedef __va_list va_list; #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) diff --git a/sys/ia64/include/types.h b/sys/ia64/include/types.h deleted file mode 100644 index e89815981a95..000000000000 --- a/sys/ia64/include/types.h +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp $ - * $FreeBSD$ - */ - -#ifndef _MACHTYPES_H_ -#define _MACHTYPES_H_ - -#include <sys/cdefs.h> - -typedef unsigned long vm_offset_t; -typedef long vm_ooffset_t; -typedef unsigned long vm_pindex_t; -typedef unsigned long vm_size_t; - -typedef __int64_t register_t; -typedef __uint64_t u_register_t; - -#ifdef _KERNEL -typedef long intfptr_t; -typedef unsigned long uintfptr_t; -#endif - -/* Critical section value */ -typedef register_t critical_t; - -/* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint64_t intrmask_t; - -#endif /* _MACHTYPES_H_ */ diff --git a/sys/ia64/include/varargs.h b/sys/ia64/include/varargs.h index f378b00b1955..fcc78c248e0c 100644 --- a/sys/ia64/include/varargs.h +++ b/sys/ia64/include/varargs.h @@ -43,9 +43,9 @@ #ifndef _MACHINE_VARARGS_H_ #define _MACHINE_VARARGS_H_ -#include <machine/ansi.h> +#include <sys/_types.h> -typedef _BSD_VA_LIST_ va_list; +typedef __va_list va_list; typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); #define va_alist __builtin_va_alist |