diff options
| author | Tomas Carnecky <tomas.carnecky@gmail.com> | 2016-04-18 22:11:53 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-04-18 22:12:00 +0200 |
| commit | 87114ae13fd1f10dc00a6b4e64898da3e92d0266 (patch) | |
| tree | c6468453376c5eb6fab8b62675f0a2830d8dc1fd /includes/MachDeps.h | |
| parent | 10d808c59307c5c0b1cb40a9ce0eb6e3efc068c9 (diff) | |
| download | haskell-87114ae13fd1f10dc00a6b4e64898da3e92d0266.tar.gz | |
Use stdint types to define SIZEOF and ALIGNMENT of INTx/WORDx
Saves us a CPP #if in MachDeps.h since we now can always rely on a
64-bit type being available.
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: thomie, erikd
Differential Revision: https://phabricator.haskell.org/D2099
Diffstat (limited to 'includes/MachDeps.h')
| -rw-r--r-- | includes/MachDeps.h | 61 |
1 files changed, 20 insertions, 41 deletions
diff --git a/includes/MachDeps.h b/includes/MachDeps.h index f176ef8def..3a8371b111 100644 --- a/includes/MachDeps.h +++ b/includes/MachDeps.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- * * (c) The University of Glasgow 2002 - * + * * Definitions that characterise machine specific properties of basic * types (C & Haskell). * @@ -28,19 +28,6 @@ * but it takes up SIZEOF_HSWORD (4 or 8) bytes in the heap. */ -/* First, check some assumptions.. */ -#if SIZEOF_CHAR != 1 -#error GHC untested on this architecture: sizeof(char) != 1 -#endif - -#if SIZEOF_SHORT != 2 -#error GHC untested on this architecture: sizeof(short) != 2 -#endif - -#if SIZEOF_UNSIGNED_INT != 4 -#error GHC untested on this architecture: sizeof(unsigned int) != 4 -#endif - #define SIZEOF_HSCHAR SIZEOF_WORD32 #define ALIGNMENT_HSCHAR ALIGNMENT_WORD32 @@ -65,43 +52,35 @@ #define SIZEOF_HSSTABLEPTR SIZEOF_VOID_P #define ALIGNMENT_HSSTABLEPTR ALIGNMENT_VOID_P -#define SIZEOF_INT8 SIZEOF_CHAR -#define ALIGNMENT_INT8 ALIGNMENT_CHAR +#define SIZEOF_INT8 SIZEOF_INT8_T +#define ALIGNMENT_INT8 ALIGNMENT_INT8_T -#define SIZEOF_WORD8 SIZEOF_UNSIGNED_CHAR -#define ALIGNMENT_WORD8 ALIGNMENT_UNSIGNED_CHAR +#define SIZEOF_WORD8 SIZEOF_UINT8_T +#define ALIGNMENT_WORD8 ALIGNMENT_UINT8_T -#define SIZEOF_INT16 SIZEOF_SHORT -#define ALIGNMENT_INT16 ALIGNMENT_SHORT +#define SIZEOF_INT16 SIZEOF_INT16_T +#define ALIGNMENT_INT16 ALIGNMENT_INT16_T -#define SIZEOF_WORD16 SIZEOF_UNSIGNED_SHORT -#define ALIGNMENT_WORD16 ALIGNMENT_UNSIGNED_SHORT +#define SIZEOF_WORD16 SIZEOF_UINT16_T +#define ALIGNMENT_WORD16 ALIGNMENT_UINT16_T -#define SIZEOF_INT32 SIZEOF_INT -#define ALIGNMENT_INT32 ALIGNMENT_INT +#define SIZEOF_INT32 SIZEOF_INT32_T +#define ALIGNMENT_INT32 ALIGNMENT_INT32_T -#define SIZEOF_WORD32 SIZEOF_UNSIGNED_INT -#define ALIGNMENT_WORD32 ALIGNMENT_UNSIGNED_INT +#define SIZEOF_WORD32 SIZEOF_UINT32_T +#define ALIGNMENT_WORD32 ALIGNMENT_UINT32_T -#if SIZEOF_LONG == 8 -#define SIZEOF_INT64 SIZEOF_LONG -#define ALIGNMENT_INT64 ALIGNMENT_LONG -#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG -#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG -#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 -#define SIZEOF_INT64 SIZEOF_LONG_LONG -#define ALIGNMENT_INT64 ALIGNMENT_LONG_LONG -#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG_LONG -#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG_LONG -#else -#error Cannot find a 64bit type. -#endif +#define SIZEOF_INT64 SIZEOF_INT64_T +#define ALIGNMENT_INT64 ALIGNMENT_INT64_T + +#define SIZEOF_WORD64 SIZEOF_UINT64_T +#define ALIGNMENT_WORD64 ALIGNMENT_UINT64_T #ifndef WORD_SIZE_IN_BITS #if SIZEOF_HSWORD == 4 #define WORD_SIZE_IN_BITS 32 #define WORD_SIZE_IN_BITS_FLOAT 32.0 -#else +#else #define WORD_SIZE_IN_BITS 64 #define WORD_SIZE_IN_BITS_FLOAT 64.0 #endif @@ -110,7 +89,7 @@ #ifndef TAG_BITS #if SIZEOF_HSWORD == 4 #define TAG_BITS 2 -#else +#else #define TAG_BITS 3 #endif #endif |