X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpsi_struct.m4;h=800e03644354724cd07ef88f2eb4bbfb2c018de8;hb=7fa8158cfcdd526f247d063202dc57c7f76901d8;hp=fcee59c3d08e18bb0a61b91b36883ee2a8e88a8e;hpb=39831a9cf4a4aa9f126bc9a949f03ae232e3794b;p=m6w6%2Fext-psi

diff --git a/m4/psi_struct.m4 b/m4/psi_struct.m4
index fcee59c..800e036 100644
--- a/m4/psi_struct.m4
+++ b/m4/psi_struct.m4
@@ -1,7 +1,17 @@
 # psi_add_struct(struct members)
 # Add a pre-defined struct to $PSI_STRUCTS.
 psi_add_struct() {
-	cat >>$PSI_STRUCTS <<<"	$1, {0}, "
+	cat >>$PSI_STRUCTS <<EOF
+	$1, {0}, 
+EOF
+}
+
+# psi_add_union(union/struct members)
+# Add a pre-defined union to $PSI_UNIONS.
+psi_add_union() {
+	cat >>$PSI_UNIONS <<EOF
+	$1, {0}, 
+EOF
 }
 
 dnl PSI_STRUCT_MEMBER(struct name, decl member)
@@ -14,23 +24,63 @@ AC_DEFUN(PSI_STRUCT_MEMBER, [
 	)
 	if PSI_SH_TEST_SIZEOF($1 member_name); then
 		PSI_CHECK_OFFSETOF($1, member_name)
-		PSI_TYPE_INDIRECTION($2, [$AS_TR_SH([ac_cv_sizeof_]$1[_]member_name)], pl, as)
-		psi_struct_members="[$psi_struct_members, {]PSI_TYPE_PAIR(member_type)[, \"]member_name[\", $]AS_TR_SH([ac_cv_offsetof_]$1[_]member_name)[, $]AS_TR_SH([ac_cv_sizeof_]$1[_]member_name), $pl, $as[}]"
+		PSI_TYPE_INDIRECTION($2, [PSI_SH_SIZEOF([$1 member_name])], pl, as)
+
+		psi_member_sizeof=PSI_SH_SIZEOF($1 member_name)
+		psi_member_offsetof=PSI_SH_OFFSETOF($1 member_name)
+
+		if test $pl -gt 0 && test $as -eq 0; then
+			check_size=PSI_SH_SIZEOF(void *)
+		elif test $pl -eq 1 && test $as -gt 0; then
+			check_size=`expr PSI_SH_SIZEOF(member_type) \* $as`
+		else
+			check_size=PSI_SH_SIZEOF(member_type)
+		fi
+		if test $psi_member_sizeof != "$check_size"; then
+			psi_member_basic_type=PSI_SH_BASIC_TYPE(member_type)
+			psi_member_type_pair="`psi_type_pair $psi_member_basic_type $psi_member_sizeof`"
+			psi_struct_members="$psi_struct_members, {$psi_member_type_pair, \"[]member_name[]\", $psi_member_offsetof, $psi_member_sizeof, $pl, $as}"
+			AC_MSG_WARN(pre-defined size $check_size of $2 in $1 does not match computed size $psi_member_sizeof; adjusting to $psi_member_type_pair)
+		else
+			psi_struct_members="[$psi_struct_members, {]PSI_TYPE_PAIR(member_type)[, \"]member_name[\", $psi_member_offsetof, $psi_member_sizeof, $pl, $as}]"
+		fi
 	fi
 ])
 
 dnl PSI_STRUCT(struct name, struct members)
 dnl Check a struct and its members and add a pre-defined struct and possibly a
 dnl pre-defined type for this struct.
-dnl Calls PSI_CHECK_SIZEOF for the struct and each member.
-dnl Calls PSI_CHECK_OFFSETOF and PSI_TYPE_INDIRECTON for each member.
+dnl Calls PSI_CHECK_SIZEOF and PSI_CHECK_ALIGNOF for the struct.
+dnl Calls PSI_CHECK_SIZEOF, PSI_CHECK_OFFSETOF and PSI_TYPE_INDIRECTON for each member.
 AC_DEFUN(PSI_STRUCT, [
 	PSI_CHECK_SIZEOF($1)
-	psi_struct_name=m4_bregexp([$1], [^\(struct \)?\(\w+\)], [\2])
-	psi_struct_members="{PSI_T_STRUCT, \"struct\", \"$psi_struct_name\", 0, $AS_TR_SH([ac_cv_sizeof_]$1), 0, 0}"
-	ifelse([$2],,,[m4_map_args_sep([PSI_STRUCT_MEMBER($1, m4_normalize(], [))], [], $2)])
-	psi_add_struct "$psi_struct_members"
-	if test "$1" = "$psi_struct_name"; then
-		psi_add_type "{PSI_T_STRUCT, \"$1\", \"$1\"}"
+	if PSI_SH_TEST_SIZEOF($1); then
+		PSI_CHECK_ALIGNOF($1)
+		psi_struct_name=m4_bregexp([$1], [^\(struct \)?\(\w+\)], [\2])
+		psi_struct_members="{PSI_T_STRUCT, \"struct\", \"$psi_struct_name\", PSI_SH_ALIGNOF($1), PSI_SH_SIZEOF($1), 0, 0}"
+		ifelse([$2],,,[m4_map_args_sep([PSI_STRUCT_MEMBER($1, m4_normalize(], [))], [], $2)])
+		psi_add_struct "$psi_struct_members"
+		if test "$1" = "$psi_struct_name"; then
+			psi_add_type "{PSI_T_STRUCT, \"$1\", \"$1\"}"
+		fi
+	fi
+])
+
+dnl PSI_UNION(union name, union/struct members)
+dnl Check a union and its members and add a pre-defined union and possibly a
+dnl pre-defined type for this union.
+dnl Calls PSI_CHECK_SIZEOF for the union and each member.
+dnl Calls PSI_CHECK_OFFSETOF and PSI_TYPE_INDIRECTON for each member.
+AC_DEFUN(PSI_UNION, [
+	PSI_CHECK_SIZEOF($1)
+	if PSI_SH_TEST_SIZEOF($1); then
+		PSI_CHECK_ALIGNOF($1)
+		psi_struct_name=m4_bregexp([$1], [^\(union \)?\(\w+\)], [\2])
+		psi_struct_members="{PSI_T_UNION, \"union\", \"$psi_struct_name\", PSI_SH_ALIGNOF($1), PSI_SH_SIZEOF($1), 0, 0}"
+		ifelse([$2],,,[m4_map_args_sep([PSI_STRUCT_MEMBER($1, m4_normalize(], [))], [], $2)])
+		psi_add_union "$psi_struct_members"
+		if test "$1" = "$psi_struct_name"; then
+			psi_add_type "{PSI_T_UNION, \"$1\", \"$1\"}"
+		fi
 	fi
 ])