X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..b226f5e54a60dc81db17b1260381d7dbfea3cdf1:/bsd/i386/types.h diff --git a/bsd/i386/types.h b/bsd/i386/types.h index daa667b0d..30f0bc591 100644 --- a/bsd/i386/types.h +++ b/bsd/i386/types.h @@ -1,14 +1,19 @@ /* - * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2008 Apple Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER @@ -18,12 +23,12 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * Copyright 1995 NeXT Computer, Inc. All rights reserved. */ -/*- +/* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * @@ -68,53 +73,77 @@ * Basic integral types. Omit the typedef if * not possible for a machine/compiler combination. */ -#ifndef _INT8_T -#define _INT8_T -typedef __signed char int8_t; -#endif -typedef unsigned char u_int8_t; -#ifndef _INT16_T -#define _INT16_T -typedef short int16_t; -#endif -typedef unsigned short u_int16_t; -#ifndef _INT32_T -#define _INT32_T -typedef int int32_t; -#endif -typedef unsigned int u_int32_t; -#ifndef _INT64_T -#define _INT64_T -typedef long long int64_t; -#endif -typedef unsigned long long u_int64_t; +#include +#include +#include +#include -typedef int32_t register_t; +#include +#include +#include +#include -#ifndef _INTPTR_T -#define _INTPTR_T -typedef __darwin_intptr_t intptr_t; -#endif -#ifndef _UINTPTR_T -#define _UINTPTR_T -typedef unsigned long int uintptr_t; +#if __LP64__ +typedef int64_t register_t; +#else +typedef int32_t register_t; #endif -/* These types are used for reserving the largest possible size. */ -// LP64todo - typedef mach_vm_address_t user_addr_t; /* varying length pointers from user space */ -// LP64todo - typedef mach_vm_size_t user_size_t; /* varying length values from user space (unsigned) */ -typedef u_int32_t user_addr_t; -typedef u_int32_t user_size_t; -typedef int32_t user_ssize_t; -typedef int32_t user_long_t; -typedef u_int32_t user_ulong_t; -typedef int32_t user_time_t; +#include +#include + +#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +/* These types are used for reserving the largest possible size. */ +typedef u_int64_t user_addr_t; +typedef u_int64_t user_size_t; +typedef int64_t user_ssize_t; +typedef int64_t user_long_t; +typedef u_int64_t user_ulong_t; +typedef int64_t user_time_t; +typedef int64_t user_off_t; #define USER_ADDR_NULL ((user_addr_t) 0) -#define CAST_USER_ADDR_T(a_ptr) ((user_addr_t)(a_ptr)) +#define CAST_USER_ADDR_T(a_ptr) ((user_addr_t)((uintptr_t)(a_ptr))) -#ifndef __offsetof -#define __offsetof(type, field) ((size_t)(&((type *)0)->field)) -#endif +#ifdef KERNEL + +/* + * These types are used when you know the word size of the target + * user process. They can be used to create struct layouts independent + * of the types and alignment requirements of the current running + * kernel. + */ + +/* + * The default ABI for the 32-bit Intel userspace aligns fundamental + * integral data types to their natural boundaries, with a maximum alignment + * of 4, even for 8-byte quantites. The default ABI for 64-bit Intel + * userspace aligns fundamental integral data types for their natural + * boundaries, including those in composite data types. PowerPC applications + * running under translation must conform to the 32-bit Intel ABI. + */ + +typedef __uint64_t user64_addr_t __attribute__((aligned(8))); +typedef __uint64_t user64_size_t __attribute__((aligned(8))); +typedef __int64_t user64_ssize_t __attribute__((aligned(8))); +typedef __int64_t user64_long_t __attribute__((aligned(8))); +typedef __uint64_t user64_ulong_t __attribute__((aligned(8))); +typedef __int64_t user64_time_t __attribute__((aligned(8))); +typedef __int64_t user64_off_t __attribute__((aligned(8))); + +typedef __uint32_t user32_addr_t; +typedef __uint32_t user32_size_t; +typedef __int32_t user32_ssize_t; +typedef __int32_t user32_long_t; +typedef __uint32_t user32_ulong_t; +typedef __int32_t user32_time_t; +typedef __int64_t user32_off_t __attribute__((aligned(4))); + +#endif /* KERNEL */ + +#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ + +/* This defines the size of syscall arguments after copying into the kernel: */ +typedef u_int64_t syscall_arg_t; #endif /* __ASSEMBLER__ */ #endif /* _MACHTYPES_H_ */