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

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index 28aa580..2a107fd 100644
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -52,7 +52,7 @@ AC_DEFUN(PSI_TYPE, [
 	psi_basic_type=AS_TR_SH($2)
 	case $psi_basic_type in
 	int)
-		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], [PSI_INCLUDES])
+		AX_CHECK_SIGN($1, :, [psi_basic_type=uint], PSI_INCLUDES)
 		;;
 	sint)
 		psi_basic_type=int
@@ -68,13 +68,13 @@ 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}"],
 		[long double],[psi_add_stdtype "{PSI_T_LONG_DOUBLE, \"long double\", NULL}"],
 		[
-			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, PSI_INCLUDES)
 			AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
 			psi_add_stdtype "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 		])
@@ -113,7 +113,7 @@ AC_DEFUN(PSI_OPAQUE_TYPE, [
 		])
 		case "$AS_TR_SH([psi_cv_type_class_]$1)" in
 		scalar)
-			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], [PSI_INCLUDES])
+			AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], PSI_INCLUDES)
 			psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 			;;
 		struct)
@@ -193,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 *)
@@ -232,7 +207,7 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_CHECK_ALIGNOF(long double)
 
 	PSI_STDTYPE(bool)
-	AC_CHECK_ALIGNOF(bool, [PSI_INCLUDES])
+	AC_CHECK_ALIGNOF(bool, PSI_INCLUDES)
 
 	PSI_STDTYPE(char, int)
 	AC_CHECK_ALIGNOF(char)
@@ -243,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)
@@ -255,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)
 ])