X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi_type.m4;h=2a107fd4ed5798b41e156f8fc3b267450dee2211;hp=a55e6affcb2741b5dd5955d6ea37c218cb7eb146;hb=f24325648c601d4b0835074f271072f4832e4478;hpb=3ef8c66ab1300801bcdb15b43f9f28e77b6487b6

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index a55e6af..2a107fd 100644
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -1,15 +1,13 @@
 # psi_add_type(type triplet)
-# Add a pre-defined type to $PSI_TYPES.
+# Add a pre-defined type to $PSI_TYPES_H.
 psi_add_type() {
-	cat >>$PSI_TYPES <<EOF
-	$1,
-EOF
+	PSI_TYPES="$PSI_TYPES
+	$1,"
 }
 
 psi_add_stdtype() {
-	cat >>$PSI_STDTYPES <<EOF
-	$1,
-EOF
+	PSI_STDTYPES="$PSI_STDTYPES
+	$1,"
 }
 
 # psi_type_pair(type, size)
@@ -47,7 +45,7 @@ dnl Check for a specific type, optionally referring to a basic type.
 dnl Calls AC_TYPE_<TYPE> (if defined) and PSI_CHECK_SIZEOF.
 dnl If the basic type is just specified as "int" (in contrast to "sint" or
 dnl "uint"), AX_CHECK_SIGN is used to discover signedness of the type.
-dnl Defines a pre-defined type in $PSI_TYPES.
+dnl Defines a pre-defined type in $PSI_TYPES_H.
 AC_DEFUN(PSI_TYPE, [
 	ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
 	PSI_CHECK_SIZEOF($1)
@@ -70,7 +68,7 @@ AC_DEFUN(PSI_STDTYPE, [
 	ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
 	PSI_CHECK_SIZEOF($1)
 	if PSI_SH_TEST_SIZEOF($1); then
-		m4_case([$1],
+		m4_case(ifelse(,[$2],[$1],[$2]),
 		[bool],[psi_add_stdtype "{PSI_T_BOOL, \"bool\", NULL}"],
 		[float],[psi_add_stdtype "{PSI_T_FLOAT, \"float\", NULL}"],
 		[double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
@@ -90,7 +88,7 @@ AC_DEFUN(PSI_SH_BASIC_TYPE, [$AS_TR_SH([psi_basic_type_]$1)])
 dnl PSI_OPAQUE_TYPE(type name)
 dnl Checks a type for being a scalar, a struct or a pointer type.
 dnl Calls AC_TYPE_<TYPE> (if defined) and PSI_CHECK_SIZEOF.
-dnl Defines a pre-defined type in $PSI_TYPES and a pre-defined struct in
+dnl Defines a pre-defined type in $PSI_TYPES_H and a pre-defined struct in
 dnl $PSI_STRUCTS if the type is a struct.
 AC_DEFUN(PSI_OPAQUE_TYPE, [
 	ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
@@ -137,12 +135,10 @@ AC_DEFUN(PSI_FUNCTOR_TYPE, [
 	dnl psi_add_type "{PSI_T_POINTER, \"void\", \"PSI_VAR_NAME($1)\"}"
 	AS_TR_SH([ac_cv_sizeof_]PSI_VAR_NAME($1))=PSI_SH_SIZEOF(void *)
 	PSI_DECL_TYPE([$1], [$2])
-	if test "$PHP_DEBUG" = "1"; then
-		AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
-			psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
-			psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
-		])
-	fi
+	AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
+		psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
+		psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
+	])
 ])
 
 dnl PSI_VAR_TYPE(decl arg)
@@ -197,33 +193,8 @@ AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]),
 dnl PSI_CHECK_STD_TYPES()
 dnl Checks for standard ANSI-C, stdint and stdbool types.
 AC_DEFUN(PSI_CHECK_STD_TYPES, [
-	AC_CHECK_HEADERS(stdint.h)
-	AC_HEADER_STDBOOL
 
-	AC_TYPE_INT8_T
-	PSI_CHECK_SIZEOF(int8_t)
-	AC_CHECK_ALIGNOF(int8_t)
-	AC_TYPE_UINT8_T
-	PSI_CHECK_SIZEOF(uint8_t)
-	AC_CHECK_ALIGNOF(uint8_t)
-	AC_TYPE_INT16_T
-	PSI_CHECK_SIZEOF(int16_t)
-	AC_CHECK_ALIGNOF(int16_t)
-	AC_TYPE_UINT16_T
-	PSI_CHECK_SIZEOF(uint16_t)
-	AC_CHECK_ALIGNOF(uint16_t)
-	AC_TYPE_INT32_T
-	PSI_CHECK_SIZEOF(int32_t)
-	AC_CHECK_ALIGNOF(int32_t)
-	AC_TYPE_UINT32_T
-	PSI_CHECK_SIZEOF(uint32_t)
-	AC_CHECK_ALIGNOF(uint32_t)
-	AC_TYPE_INT64_T
-	PSI_CHECK_SIZEOF(int64_t)
-	AC_CHECK_ALIGNOF(int64_t)
-	AC_TYPE_UINT64_T
-	PSI_CHECK_SIZEOF(uint64_t)
-	AC_CHECK_ALIGNOF(uint64_t)
+	AC_HEADER_STDBOOL
 
 	PSI_CHECK_SIZEOF(void *)
 	AC_CHECK_ALIGNOF(void *)
@@ -247,8 +218,12 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	PSI_STDTYPE(short int, int)
 	PSI_STDTYPE(signed short, int)
 	PSI_STDTYPE(signed short int, int)
+	PSI_STDTYPE(short signed, int)
+	PSI_STDTYPE(short signed int, int)
 	PSI_STDTYPE(unsigned short, uint)
 	PSI_STDTYPE(unsigned short int, uint)
+	PSI_STDTYPE(short unsigned, uint)
+	PSI_STDTYPE(short unsigned int, uint)
 	PSI_STDTYPE(int, int)
 	AC_CHECK_ALIGNOF(int)
 	PSI_STDTYPE(signed int, int)
@@ -259,14 +234,39 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_CHECK_ALIGNOF(long)
 	PSI_STDTYPE(long int, int)
 	PSI_STDTYPE(signed long int, int)
+	PSI_STDTYPE(long signed int, int)
 	PSI_STDTYPE(unsigned long, uint)
 	PSI_STDTYPE(unsigned long int, uint)
+	PSI_STDTYPE(long unsigned, uint)
+	PSI_STDTYPE(long unsigned int, uint)
 	PSI_STDTYPE(long long, int)
 	AC_CHECK_ALIGNOF(long long)
 	PSI_STDTYPE(signed long long, int)
 	PSI_STDTYPE(signed long long int, int)
+	PSI_STDTYPE(long signed long, int)
+	PSI_STDTYPE(long signed long int, int)
+	PSI_STDTYPE(long long signed, int)
+	PSI_STDTYPE(long long signed int, int)
 	PSI_STDTYPE(unsigned long long, uint)
 	PSI_STDTYPE(unsigned long long int, uint)
+	PSI_STDTYPE(long unsigned long, uint)
+	PSI_STDTYPE(long unsigned long int, uint)
+	PSI_STDTYPE(long long unsigned, uint)
+	PSI_STDTYPE(long long unsigned int, uint)
 	dnl this must come after the check for "unsigned long long int"; autoconf, wth?
 	PSI_STDTYPE(long long int, int)
+
+	AC_CHECK_TYPE(__int128, [
+		AC_DEFINE([HAVE_INT128], [1], [ ])
+		AC_CHECK_ALIGNOF(__int128)
+		PSI_STDTYPE(__int128, int)
+		PSI_STDTYPE(signed __int128, int)
+		PSI_STDTYPE(unsigned __int128, uint)
+	])
+
+	PSI_STDTYPE(_Float32)
+	PSI_STDTYPE(_Float32x)
+	PSI_STDTYPE(_Float64)
+	PSI_STDTYPE(_Float64x)
+	PSI_STDTYPE(_Float128)
 ])