configure improvements

[m6w6/ext-psi] / m4 / psi_type.m4

diff --git a/m4/psi_type.m4 b/m4/psi_type.m4
index d1e0fbf2e7650d21e820322efaf9f323d1944e95..6324c75e5da342e6d0f47b16795875701aefa6fa 100644 (file)
--- a/m4/psi_type.m4
+++ b/m4/psi_type.m4
@@ -7,7 +7,7 @@ psi_type_pair() {
                local psi_type_upper=`tr a-z A-Z <<<$psi_type_name`
                local psi_type_bits=`expr $2 \* 8`
                echo "PSI_T_${psi_type_upper}${psi_type_bits}, \"${psi_type_lower}${psi_type_bits}_t\""
-               eval AS_TR_SH([psi_standard_type_]$1)="${psi_type_lower}${psi_type_bits}_t"
+               #eval AS_TR_SH([psi_standard_type_]$1)="${psi_type_lower}${psi_type_bits}_t"
                ;;
        struct*)
                echo "PSI_T_STRUCT, \"$2\""
@@ -21,16 +21,16 @@ psi_type_pair() {
        esac
 }
 
-dnl PSI_TYPE(type name, basic type, includes)
+dnl PSI_TYPE(type name, basic type)
 AC_DEFUN(PSI_TYPE, [
        ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
-       AC_CHECK_SIZEOF($1, [], PSI_INCLUDES)
-       psi_basic_type=$2
+       PSI_CHECK_SIZEOF($1, PSI_INCLUDES)
+       psi_basic_type=AS_TR_SH($2)
        case $psi_basic_type in
        int)
                AX_CHECK_SIGN($1, :, [
                        psi_basic_type=uint
-               ], $psi_header)
+               ], PSI_INCLUDES)
                ;;
        sint)
                psi_basic_type=int
@@ -38,7 +38,45 @@ AC_DEFUN(PSI_TYPE, [
        esac
        if test "$2" && test "$AS_TR_SH([ac_cv_sizeof_]$1)" -gt 0; then
                AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
-               PSI_TYPES="{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, $PSI_TYPES"
+               cat >>$PSI_TYPES <<<"   {`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, "
+       fi
+])
+
+AC_DEFUN(PSI_OPAQUE_TYPE, [
+       ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
+       PSI_CHECK_SIZEOF($1, PSI_INCLUDES)
+       if test "$AS_TR_SH([ac_cv_sizeof_]$1)" -gt 0; then
+               psi_type_class=
+               AC_CACHE_CHECK(type class of $1, AS_TR_SH([psi_cv_type_class_]$1), [
+                       AC_TRY_COMPILE(PSI_INCLUDES, [char test@<:@($1)1@:>@;], [
+                               psi_type_class=scalar
+                       ], [
+                               AC_TRY_COMPILE(PSI_INCLUDES, [$1 test = 0;], [
+                                       AC_TRY_COMPILE(PSI_INCLUDES, [$1 test = (($1)0)+1;], [
+                                               psi_type_class="pointer of known type"
+                                       ], [
+                                               psi_type_class="pointer of opaque type"
+                                       ])
+                               ], [
+                                       psi_type_class=struct
+                               ])
+                       ])
+                       AS_TR_SH([psi_cv_type_class_]$1)="$psi_type_class"
+               ])
+               case "$AS_TR_SH([psi_cv_type_class_]$1)" in
+               scalar)
+                       PSI_TYPE($1, int)
+                       ;;
+               struct)
+                       PSI_STRUCT($1)
+                       ;;
+               pointer*)
+                       cat >>$PSI_TYPES <<<"   {PSI_T_POINTER, \"void\", \"$1\"}, "
+                       ;;
+               *)
+                       AC_MSG_WARN(could not detect type class of $1)
+                       ;;
+               esac
        fi
 ])
 
@@ -58,32 +96,32 @@ AC_DEFUN(PSI_TYPE_BITS, [`expr 8 \* $AS_TR_SH([ac_cv_sizeof_]$1)`])
 
 dnl PSI_TYPE_INDIRECTION(type, size, pointer_level_var, array_size_var)
 AC_DEFUN(PSI_TYPE_INDIRECTION, [
-       AC_MSG_CHECKING(indirection of $1)
-       m4_define([pointer_level], m4_len(m4_bpatsubst([PSI_VAR_TYPE($1)], [[^*]])))
-       m4_define([array_size], [m4_bregexp([PSI_VAR_TYPE($1)], [@<:@\([0-9]+\)@:>@], [\1])])
-       
-       ifelse(array_size.$2,0., [
+       dnl AC_MSG_CHECKING(indirection of $1)
+       m4_define([psi_pointer_level], m4_len(m4_bpatsubst([PSI_VAR_TYPE($1)], [[^*]])))
+       m4_define([psi_array_size], [m4_bregexp([PSI_VAR_TYPE($1)], [@<:@\([0-9]+\)@:>@], [\1])])
+
+       ifelse(psi_array_size.$2,0., [
                AC_MSG_ERROR([cannot compute dynamic array size of a non-struct member])
        ], [
-               ifelse(pointer_level,0,[
-                       m4_define([type_size],[$]AS_TR_SH([ac_cv_sizeof_]m4_bregexp(PSI_VAR_TYPE([$1]), [^\( \|\w\)+], [\&])))
+               ifelse(psi_pointer_level,0,[
+                       m4_define([psi_type_size],[$]AS_TR_SH([ac_cv_sizeof_]m4_bregexp(PSI_VAR_TYPE([$1]), [^\( \|\w\)+], [\&])))
                ],[
-                       m4_define([type_size],$ac_cv_sizeof_void_p)
+                       m4_define([psi_type_size],$ac_cv_sizeof_void_p)
                ])
        ])
-       
-       m4_case(array_size,,[
-               $3=pointer_level
+
+       m4_case(psi_array_size,,[
+               $3=psi_pointer_level
                $4=0]
        ,0,[
-               $3=m4_incr(pointer_level)
-               $4="`expr $2 / type_size`"
+               $3=m4_incr(psi_pointer_level)
+               $4="`expr $2 / psi_type_size`"
        ], [
-               $3=m4_incr(pointer_level)
-               $4=array_size
+               $3=m4_incr(psi_pointer_level)
+               $4=psi_array_size
        ])
-       
-       AC_MSG_RESULT([[$]$3, [$]$4])
+
+       dnl AC_MSG_RESULT([[$]$3, [$]$4])
 ])
 
 AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]),
@@ -95,28 +133,28 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
        AC_CHECK_HEADERS(stdint.h)
 
        AC_TYPE_INT8_T
-       AC_CHECK_SIZEOF(int8_t)
+       PSI_CHECK_SIZEOF(int8_t)
        AC_CHECK_ALIGNOF(int8_t)
        AC_TYPE_UINT8_T
-       AC_CHECK_SIZEOF(uint8_t)
+       PSI_CHECK_SIZEOF(uint8_t)
        AC_CHECK_ALIGNOF(uint8_t)
        AC_TYPE_INT16_T
-       AC_CHECK_SIZEOF(int16_t)
+       PSI_CHECK_SIZEOF(int16_t)
        AC_CHECK_ALIGNOF(int16_t)
        AC_TYPE_UINT16_T
-       AC_CHECK_SIZEOF(uint16_t)
+       PSI_CHECK_SIZEOF(uint16_t)
        AC_CHECK_ALIGNOF(uint16_t)
        AC_TYPE_INT32_T
-       AC_CHECK_SIZEOF(int32_t)
+       PSI_CHECK_SIZEOF(int32_t)
        AC_CHECK_ALIGNOF(int32_t)
        AC_TYPE_UINT32_T
-       AC_CHECK_SIZEOF(uint32_t)
+       PSI_CHECK_SIZEOF(uint32_t)
        AC_CHECK_ALIGNOF(uint32_t)
        AC_TYPE_INT64_T
-       AC_CHECK_SIZEOF(int64_t)
+       PSI_CHECK_SIZEOF(int64_t)
        AC_CHECK_ALIGNOF(int64_t)
        AC_TYPE_UINT64_T
-       AC_CHECK_SIZEOF(uint64_t)
+       PSI_CHECK_SIZEOF(uint64_t)
        AC_CHECK_ALIGNOF(uint64_t)
 
        PSI_TYPE(float)