[commit: ghc] master: Use stdint types to define SIZEOF and ALIGNMENT of INTx/WORDx (87114ae)
git at git.haskell.org
git at git.haskell.org
Mon Apr 18 22:01:04 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/87114ae13fd1f10dc00a6b4e64898da3e92d0266/ghc
>---------------------------------------------------------------
commit 87114ae13fd1f10dc00a6b4e64898da3e92d0266
Author: Tomas Carnecky <tomas.carnecky at gmail.com>
Date: Mon Apr 18 22:11:53 2016 +0200
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
>---------------------------------------------------------------
87114ae13fd1f10dc00a6b4e64898da3e92d0266
aclocal.m4 | 10 ++++++++++
configure.ac | 56 ++++++++++++++++++++++-------------------------------
includes/MachDeps.h | 55 ++++++++++++++++------------------------------------
3 files changed, 50 insertions(+), 71 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 477da3f..1c9c49f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -831,6 +831,16 @@ m4_popdef([fp_Cache])[]dnl
])# FP_CHECK_ALIGNMENT
+
+# FP_CHECK_SIZEOF_AND_ALIGNMENT(TYPE)
+# ------------------------------------------------------------------
+# Combines AC_CHECK_SIZEOF and FP_CHECK_ALIGNMENT.
+AC_DEFUN([FP_CHECK_SIZEOF_AND_ALIGNMENT],
+[AC_CHECK_SIZEOF([$1])
+FP_CHECK_ALIGNMENT([$1])
+])# FP_CHECK_SIZEOF_AND_ALIGNMENT
+
+
# FP_LEADING_UNDERSCORE
# ---------------------
# Test for determining whether symbol names have a leading underscore. We assume
diff --git a/configure.ac b/configure.ac
index c5260ce..a5ee3bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -796,47 +796,37 @@ dnl ** do we have long longs?
AC_CHECK_TYPES([long long])
dnl ** what are the sizes of various types
-AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(float, 4)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(char)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(double)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(float)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(int)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(long)
if test "$ac_cv_type_long_long" = yes; then
-AC_CHECK_SIZEOF(long long, 8)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(long long)
fi
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(unsigned char, 1)
-AC_CHECK_SIZEOF(unsigned int, 4)
-AC_CHECK_SIZEOF(unsigned long, 4)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(short)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(unsigned char)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(unsigned int)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(unsigned long)
if test "$ac_cv_type_long_long" = yes; then
-AC_CHECK_SIZEOF(unsigned long long, 8)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(unsigned long long)
fi
-AC_CHECK_SIZEOF(unsigned short, 2)
-AC_CHECK_SIZEOF(void *, 4)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(unsigned short)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(void *)
+
+FP_CHECK_SIZEOF_AND_ALIGNMENT(int8_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(uint8_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(int16_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(uint16_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(int32_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(uint32_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(int64_t)
+FP_CHECK_SIZEOF_AND_ALIGNMENT(uint64_t)
+
dnl for use in settings.in
WordSize=$ac_cv_sizeof_void_p
AC_SUBST(WordSize)
-
-dnl ** what are alignment constraints on various types
-FP_CHECK_ALIGNMENT(char)
-FP_CHECK_ALIGNMENT(double)
-FP_CHECK_ALIGNMENT(float)
-FP_CHECK_ALIGNMENT(int)
-FP_CHECK_ALIGNMENT(long)
-if test "$ac_cv_type_long_long" = yes; then
-FP_CHECK_ALIGNMENT(long long)
-fi
-FP_CHECK_ALIGNMENT(short)
-FP_CHECK_ALIGNMENT(unsigned char)
-FP_CHECK_ALIGNMENT(unsigned int)
-FP_CHECK_ALIGNMENT(unsigned long)
-if test "$ac_cv_type_long_long" = yes; then
-FP_CHECK_ALIGNMENT(unsigned long long)
-fi
-FP_CHECK_ALIGNMENT(unsigned short)
-FP_CHECK_ALIGNMENT(void *)
-
FP_CHECK_FUNC([WinExec],
[@%:@include <windows.h>], [WinExec("",0)])
diff --git a/includes/MachDeps.h b/includes/MachDeps.h
index f176ef8..3a8371b 100644
--- a/includes/MachDeps.h
+++ b/includes/MachDeps.h
@@ -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,37 +52,29 @@
#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
More information about the ghc-commits
mailing list