X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fpsi_type.m4;h=21484adb60c1622edaf92a32bf0638e16bed2644;hb=7e4b0ccdd2123647b6fff8065c0abc61be3fb44d;hp=dad3b676d540ae2692895270f442580feed486d9;hpb=772c1e688a51b32331fae7993429b3a03d766d8d;p=m6w6%2Fext-psi

diff --git a/m4/psi_type.m4 b/m4/psi_type.m4
index dad3b67..21484ad 100644
--- a/m4/psi_type.m4
+++ b/m4/psi_type.m4
@@ -4,6 +4,10 @@ psi_add_type() {
 	cat >>$PSI_TYPES <<<"	$1, "
 }
 
+psi_add_stdtype() {
+	cat >>$PSI_STDTYPES <<<"	$1, "
+}
+
 # psi_type_pair(type, size)
 # Output a PSI_T_<TYPE>, \"<TYPENAME>\" tuple.
 # Uses stdint types when possible.
@@ -36,7 +40,7 @@ dnl "uint"), AX_CHECK_SIGN is used to discover signedness of the type.
 dnl Defines a pre-defined type in $PSI_TYPES.
 AC_DEFUN(PSI_TYPE, [
 	ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
-	PSI_CHECK_SIZEOF($1, PSI_INCLUDES)
+	PSI_CHECK_SIZEOF($1)
 	psi_basic_type=AS_TR_SH($2)
 	case $psi_basic_type in
 	int)
@@ -48,11 +52,30 @@ AC_DEFUN(PSI_TYPE, [
 	esac
 	if test "$2" && PSI_SH_TEST_SIZEOF($1); then
 		AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
-		psi_add_type "{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}"
-		#cat >>$PSI_TYPES <<<"{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, "
+		psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 	fi
 ])
 
+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],
+		[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)
+			AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
+			psi_add_stdtype "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
+		])
+	fi
+])
+
+dnl PSI_SH_BASIC_TYPE(type)
+dnl Expand to the basic type (int/uint) of a distinct type
+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.
@@ -60,7 +83,7 @@ dnl Defines a pre-defined type in $PSI_TYPES 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))
-	PSI_CHECK_SIZEOF($1, PSI_INCLUDES)
+	PSI_CHECK_SIZEOF($1)
 	if PSI_SH_TEST_SIZEOF($1); then
 		psi_type_class=
 		AC_CACHE_CHECK(type class of $1, AS_TR_SH([psi_cv_type_class_]$1), [
@@ -82,15 +105,13 @@ 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)
-			psi_add_type "{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}"
-			#cat >>$PSI_TYPES <<<"	{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, "
+			psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
 			;;
 		struct)
 			PSI_STRUCT($1)
 			;;
 		pointer*)
 			psi_add_type "{PSI_T_POINTER, \"void\", \"$1\"}"
-			#cat >>$PSI_TYPES <<<"	{PSI_T_POINTER, \"void\", \"$1\"}, "
 			;;
 		*)
 			AC_MSG_WARN(could not detect type class of $1)
@@ -172,40 +193,41 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
 	AC_TYPE_UINT64_T
 	PSI_CHECK_SIZEOF(uint64_t)
 	AC_CHECK_ALIGNOF(uint64_t)
+	
+	PSI_CHECK_SIZEOF(void *)
+	AC_CHECK_ALIGNOF(void *)
 
-	PSI_TYPE(float)
+	PSI_STDTYPE(float)
 	AC_CHECK_ALIGNOF(float)
-	PSI_TYPE(double)
+	PSI_STDTYPE(double)
 	AC_CHECK_ALIGNOF(double)
-	PSI_TYPE(long double)
+	PSI_STDTYPE(long double)
 	AC_CHECK_ALIGNOF(long double)
-	PSI_TYPE(void *)
-	AC_CHECK_ALIGNOF(void *)
 
-	PSI_TYPE(char, int)
-	PSI_TYPE(signed char, int)
-	PSI_TYPE(unsigned char, uint)
-	PSI_TYPE(short, int)
-	PSI_TYPE(short int, int)
-	PSI_TYPE(signed short, int)
-	PSI_TYPE(signed short int, int)
-	PSI_TYPE(unsigned short, uint)
-	PSI_TYPE(unsigned short int, uint)
-	PSI_TYPE(int, int)
-	PSI_TYPE(signed int, int)
-	PSI_TYPE(signed, int)
-	PSI_TYPE(unsigned int, uint)
-	PSI_TYPE(unsigned, uint)
-	PSI_TYPE(long, int)
-	PSI_TYPE(long int, int)
-	PSI_TYPE(signed long int, int)
-	PSI_TYPE(unsigned long, uint)
-	PSI_TYPE(unsigned long int, uint)
-	PSI_TYPE(long long, int)
-	PSI_TYPE(signed long long, int)
-	PSI_TYPE(signed long long int, int)
-	PSI_TYPE(unsigned long long, uint)
-	PSI_TYPE(unsigned long long int, uint)
+	PSI_STDTYPE(char, int)
+	PSI_STDTYPE(signed char, int)
+	PSI_STDTYPE(unsigned char, uint)
+	PSI_STDTYPE(short, int)
+	PSI_STDTYPE(short int, int)
+	PSI_STDTYPE(signed short, int)
+	PSI_STDTYPE(signed short int, int)
+	PSI_STDTYPE(unsigned short, uint)
+	PSI_STDTYPE(unsigned short int, uint)
+	PSI_STDTYPE(int, int)
+	PSI_STDTYPE(signed int, int)
+	PSI_STDTYPE(signed, int)
+	PSI_STDTYPE(unsigned int, uint)
+	PSI_STDTYPE(unsigned, uint)
+	PSI_STDTYPE(long, int)
+	PSI_STDTYPE(long int, int)
+	PSI_STDTYPE(signed long int, int)
+	PSI_STDTYPE(unsigned long, uint)
+	PSI_STDTYPE(unsigned long int, uint)
+	PSI_STDTYPE(long long, int)
+	PSI_STDTYPE(signed long long, int)
+	PSI_STDTYPE(signed long long int, int)
+	PSI_STDTYPE(unsigned long long, uint)
+	PSI_STDTYPE(unsigned long long int, uint)
 	dnl this must come after the check fo "unsigned long long int"; autoconf, wth?
-	PSI_TYPE(long long int, int)
+	PSI_STDTYPE(long long int, int)
 ])