X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi_type.m4;h=ad2d0001cbc6275d722f0c836d13f318bc65f0a0;hp=dad3b676d540ae2692895270f442580feed486d9;hb=09735ea6055f959a9cac481268754f07d6f6eb9f;hpb=772c1e688a51b32331fae7993429b3a03d766d8d diff --git a/m4/psi_type.m4 b/m4/psi_type.m4 index dad3b67..ad2d000 100644 --- a/m4/psi_type.m4 +++ b/m4/psi_type.m4 @@ -1,24 +1,35 @@ # psi_add_type(type triplet) # Add a pre-defined type to $PSI_TYPES. psi_add_type() { - cat >>$PSI_TYPES <<<" $1, " + cat >>$PSI_TYPES <>$PSI_STDTYPES <, \"\" tuple. # Uses stdint types when possible. psi_type_pair() { - local psi_type_name=`tr -cd A-Za-z0-9_ <<<$1` - local psi_type_lower=`tr A-Z a-z <<<$psi_type_name` + local psi_type_name=`printf "%s" "$1" | tr -cd A-Za-z0-9_` + local psi_type_lower=`printf "%s" "$1" | tr A-Z a-z` case $psi_type_lower in int*|uint*) - local psi_type_upper=`tr a-z A-Z <<<$psi_type_name` + local psi_type_upper=`printf "%s" "$psi_type_name" | tr a-z A-Z` local psi_type_bits=`expr $2 \* 8` echo "PSI_T_${psi_type_upper}${psi_type_bits}, \"${psi_type_lower}${psi_type_bits}_t\"" ;; struct*) echo "PSI_T_STRUCT, \"$2\"" ;; + union*) + echo "PSI_T_UNION, \"$2\"" + ;; void) echo "PSI_T_VOID, \"void\"" ;; @@ -36,7 +47,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 +59,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_ (if defined) and PSI_CHECK_SIZEOF. @@ -60,10 +90,10 @@ 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), [ + AC_CACHE_CHECK(kind of $1, AS_TR_SH([psi_cv_type_class_]$1), [ AC_TRY_COMPILE(PSI_INCLUDES, [char test@<:@($1)1@:>@;], [ psi_type_class=scalar ], [ @@ -82,23 +112,29 @@ 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) + AC_MSG_WARN(could not detect kind of $1) ;; esac fi ]) +dnl PSI_FUNCTOR_TYPE(type functor_name, args) +dnl Forwards to PSI_DECL_TYPE. +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]) +]) + dnl PSI_VAR_TYPE(decl arg) dnl Extracts the type of a decl arg, e.g. dnl unsigned char* buf[16] -> unsigned char*. AC_DEFUN(PSI_VAR_TYPE, [m4_bregexp([$1], [^\(const \)?\(.*\) \([*]*\)[^ ]+$], [\2\3])]) @@ -141,6 +177,7 @@ dnl FIXME: There is also psi_type_pair()? AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]), [void], [PSI_T_VOID, \"void\"], [struct], [PSI_T_STRUCT, \"m4_bregexp([$1], [^struct \(\w+\)], [\1])\"], + [union], [PSI_T_UNION, \"m4_bregexp([$1], [^union \(\w+\)], [\1])\"], [PSI_T_NAME, \"m4_bregexp([$1], [^\(\w+ \)*\w+], [\&])\"])]) dnl PSI_CHECK_STD_TYPES() @@ -172,40 +209,46 @@ 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) + AC_CHECK_ALIGNOF(char) + PSI_STDTYPE(signed char, int) + PSI_STDTYPE(unsigned char, uint) + PSI_STDTYPE(short, int) + AC_CHECK_ALIGNOF(short) + 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) + AC_CHECK_ALIGNOF(int) + PSI_STDTYPE(signed int, int) + PSI_STDTYPE(signed, int) + PSI_STDTYPE(unsigned int, uint) + PSI_STDTYPE(unsigned, uint) + PSI_STDTYPE(long, int) + AC_CHECK_ALIGNOF(long) + 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) + AC_CHECK_ALIGNOF(long long) + 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) ])