diff options
author | tijl <tijl@FreeBSD.org> | 2011-01-08 12:43:05 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2011-01-08 12:43:05 +0000 |
commit | 89281909e199aee2c6c9da6a30e4c5d4a131fced (patch) | |
tree | 982d82f606fd515f513b96a4ec7aea4727588d31 /sys/powerpc/include | |
parent | 61d89c0b21ee8ee88c291bd781b885c9ff0d6245 (diff) | |
download | FreeBSD-src-89281909e199aee2c6c9da6a30e4c5d4a131fced.zip FreeBSD-src-89281909e199aee2c6c9da6a30e4c5d4a131fced.tar.gz |
On mixed 32/64 bit architectures (mips, powerpc) use __LP64__ rather than
architecture macros (__mips_n64, __powerpc64__) when 64 bit types (and
corresponding macros) are different from 32 bit. [1]
Correct the type of INT64_MIN, INT64_MAX and UINT64_MAX.
Define (U)INTMAX_C as an alias for (U)INT64_C matching the type definition
for (u)intmax_t. Do this on all architectures for consistency.
Suggested by: bde [1]
Approved by: kib (mentor)
Diffstat (limited to 'sys/powerpc/include')
-rw-r--r-- | sys/powerpc/include/_inttypes.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/_limits.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/_stdint.h | 29 | ||||
-rw-r--r-- | sys/powerpc/include/_types.h | 8 |
4 files changed, 16 insertions, 25 deletions
diff --git a/sys/powerpc/include/_inttypes.h b/sys/powerpc/include/_inttypes.h index 06d4032..488871b 100644 --- a/sys/powerpc/include/_inttypes.h +++ b/sys/powerpc/include/_inttypes.h @@ -37,7 +37,7 @@ * Macros for format specifiers. */ -#ifdef __powerpc64__ +#ifdef __LP64__ #define PRI64 "l" #define PRIreg "l" #else diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h index 3da95ad..e231d33 100644 --- a/sys/powerpc/include/_limits.h +++ b/sys/powerpc/include/_limits.h @@ -73,7 +73,7 @@ #define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ #define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ -#ifdef __powerpc64__ +#ifdef __LP64__ #define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ #define __SIZE_T_MAX __ULONG_MAX /* max value for a size_t */ #else diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index ad0d87e..3e34966 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -50,18 +50,17 @@ #define UINT16_C(c) (c) #define UINT32_C(c) (c ## U) -#ifdef __powerpc64__ +#ifdef __LP64__ #define INT64_C(c) (c ## L) #define UINT64_C(c) (c ## UL) -#define INTMAX_C(c) (c ## L) -#define UINTMAX_C(c) (c ## UL) #else #define INT64_C(c) (c ## LL) #define UINT64_C(c) (c ## ULL) -#define INTMAX_C(c) (c ## LL) -#define UINTMAX_C(c) (c ## ULL) #endif +#define INTMAX_C(c) INT64_C(c) +#define UINTMAX_C(c) UINT64_C(c) + #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) @@ -74,27 +73,19 @@ #define INT8_MIN (-0x7f-1) #define INT16_MIN (-0x7fff-1) #define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffLL-1) +#define INT64_MIN (-INT64_C(0x7fffffffffffffff)-1) /* Maximum values of exact-width signed integer types. */ #define INT8_MAX 0x7f #define INT16_MAX 0x7fff #define INT32_MAX 0x7fffffff -#ifdef __powerpc64__ -#define INT64_MAX 0x7fffffffffffffffL -#else -#define INT64_MAX 0x7fffffffffffffffLL -#endif +#define INT64_MAX INT64_C(0x7fffffffffffffff) /* Maximum values of exact-width unsigned integer types. */ #define UINT8_MAX 0xff #define UINT16_MAX 0xffff -#define UINT32_MAX 0xffffffffU -#ifdef __powerpc64__ -#define UINT64_MAX 0xffffffffffffffffUL -#else -#define UINT64_MAX 0xffffffffffffffffULL -#endif +#define UINT32_MAX 0xffffffff +#define UINT64_MAX UINT64_C(0xffffffffffffffff) /* * ISO/IEC 9899:1999 @@ -144,7 +135,7 @@ * ISO/IEC 9899:1999 * 7.18.2.4 Limits of integer types capable of holding object pointers */ -#ifdef __powerpc64__ +#ifdef __LP64__ #define INTPTR_MIN INT64_MIN #define INTPTR_MAX INT64_MAX #define UINTPTR_MAX UINT64_MAX @@ -166,7 +157,7 @@ * ISO/IEC 9899:1999 * 7.18.3 Limits of other integer types */ -#ifdef __powerpc64__ +#ifdef __LP64__ /* Limits of ptrdiff_t. */ #define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index a6e393e..fae2416 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -52,7 +52,7 @@ typedef short __int16_t; typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; -#ifdef __powerpc64__ +#ifdef __LP64__ typedef long __int64_t; typedef unsigned long __uint64_t; #else @@ -75,7 +75,7 @@ typedef __uint32_t __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; typedef double __double_t; typedef double __float_t; -#ifdef __powerpc64__ +#ifdef __LP64__ typedef __int64_t __critical_t; typedef __int64_t __intfptr_t; typedef __int64_t __intptr_t; @@ -93,7 +93,7 @@ typedef __int8_t __int_least8_t; typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -#ifdef __powerpc64__ +#ifdef __LP64__ typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ @@ -121,7 +121,7 @@ typedef __uint8_t __uint_least8_t; typedef __uint16_t __uint_least16_t; typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; -#ifdef __powerpc64__ +#ifdef __LP64__ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __uint64_t __vm_paddr_t; |