X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi_decl.m4;h=92da2929816947da13d3fa7eb7c35a1380bb0794;hp=9b2d3eb6846fb032c67f707c5cac7b038025a61e;hb=4894ee9055330ed9b001967112c5363ba91042ca;hpb=b4508f6b917660970f887894a6aaed6c220a2c72

diff --git a/m4/psi_decl.m4 b/m4/psi_decl.m4
index 9b2d3eb..92da292 100644
--- a/m4/psi_decl.m4
+++ b/m4/psi_decl.m4
@@ -1,19 +1,44 @@
-AC_DEFUN(PSI_REDIR, [psi_symbol=ifelse([$2],[],[$1],[$2])
-	PSI_REDIRS="{\"$1\", (void(*)(void))$psi_symbol}, $PSI_REDIRS"])
+# psi_add_redir(name, symbol)
+# Add a function redirection to $PSI_REDIRS.
+psi_add_redir() {
+	cat >>$PSI_REDIRS <<<"	{\"$1\", (void(*)(void))$2}, "
+}
 
+# psi_add_decl(decl, options)
+# Add a pre-defined decl to $PSI_VA_DECLS/$PSI_DECLS.
+psi_add_decl() {
+	case "$2" in
+	*vararg*)
+		cat >>$PSI_VA_DECLS <<<"	$1, {0}, "
+		;;
+	*)
+		cat >>$PSI_DECLS <<<"	$1, {0}, "
+		;;
+	esac
+}
+
+dnl PSI_REDIR(name, custom symbol)
+dnl Create a function redirection to an optional custom symbol.
+AC_DEFUN(PSI_REDIR, [
+	psi_add_redir $1 ifelse([$2],[],[$1],[$2])
+])
+
+dnl PSI_FUNC_LIBC_MAIN()
+dnl Check for the platforms default stub in executables.
 AC_DEFUN(PSI_FUNC_LIBC_MAIN, [
 	AC_REQUIRE([AC_PROG_NM])
 	AC_REQUIRE([AC_PROG_AWK])
 	AC_CACHE_CHECK(for libc start main symbol, psi_cv_libc_main, [
 		psi_libc_main=
 		AC_TRY_LINK(PSI_INCLUDES, [(void)0;], [
-			psi_libc_main=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^\s+U / {print$[]3; exit}'`
+			psi_libc_main=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
 		])
 		psi_cv_libc_main=$psi_libc_main
 	])
 ])
 
 dnl PSI_FUNC(fn, action-if-yes, action-if-no)
+dnl Check for a possible function redirection.
 AC_DEFUN(PSI_FUNC, [
 	AC_REQUIRE([PSI_FUNC_LIBC_MAIN])
 	psi_symbol=$1
@@ -22,7 +47,7 @@ AC_DEFUN(PSI_FUNC, [
 		AC_TRY_LINK(PSI_INCLUDES, [
 			void (*fn)(void) = (void (*)(void)) $psi_symbol;
 		], [
-			psi_symbol_redirect=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^\s+U '$psi_cv_libc_main'/ {next} /^\s+U / {print$[]3; exit}'`
+			psi_symbol_redirect=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/^@<:@@<:@:space:@:>@@:>@+U '$psi_cv_libc_main'/ {next} /^@<:@@<:@:space:@:>@@:>@+U / {print$[]3; exit}'`
 		])
 		psi_cv_fn_$1=$psi_symbol_redirect
 	])
@@ -40,34 +65,39 @@ AC_DEFUN(PSI_FUNC, [
 	esac
 ])
 
+dnl PSI_DECL_ARG(decl arg)
+dnl INTERNAL: build psi_decl_args
 AC_DEFUN(PSI_DECL_ARG, [
     m4_define([member_name], PSI_VAR_NAME($1))
     m4_define([member_type], PSI_VAR_TYPE($1))
-    m4_define([pointer_level], m4_len(m4_bpatsubst([$1], [[^*]])))
-	m4_define([array_size], [m4_bregexp([$1], [@<:@\([0-9]+\)@:>@], [\1])])
-	ifelse(array_size, [],
-		[m4_define([array_size], 0)],
-		[m4_define([pointer_level], m4_incr(pointer_level))]
-	)
+
+	PSI_TYPE_INDIRECTION([$1],, pl, as)
     if test -n "$psi_decl_args"; then
         psi_decl_args="$psi_decl_args, "
     fi
-    psi_decl_args="[$psi_decl_args{]PSI_TYPE_PAIR(member_type)[, \"]member_name[\",] pointer_level, array_size[}]"
+    psi_decl_args="[$psi_decl_args{]PSI_TYPE_PAIR(member_type)[, \"]member_name[\",] $pl, $as[}]"
 ])
 
-dnl PSI_DECL(type func, args)
+dnl PSI_DECL(type func, args, flags)
+dnl Check for a function or macro declaration.
+dnl Adds a pre-defined (vararg) decl to $PSI_VA_DECLS/$PSI_DECLS.
+dnl Calls PSI_MACRO if PSI_FUNC fails. 
 AC_DEFUN(PSI_DECL, [
 	psi_decl_args=
 	PSI_DECL_ARG($1)
 	m4_case([$2],
 		[(void)], [],
 		[()], [],
-		[m4_map_args_sep([PSI_DECL_ARG(], [)], [], [m4_bregexp([$2], [(\(.*\))], [\1])])])
+		[m4_map_args_sep([PSI_DECL_ARG(m4_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
 	PSI_FUNC(PSI_VAR_NAME($1), [
-		PSI_DECLS="$psi_decl_args, {0}, $PSI_DECLS"
+		psi_add_decl "$psi_decl_args" $3
 	], [
 		PSI_MACRO($1, $2, [
-			PSI_DECLS="$psi_decl_args, {0}, $PSI_DECLS"
+			ifelse([$3], vararg, [
+				AC_MSG_ERROR(varargs macro support is not implemented)
+			],[
+				psi_add_decl "$psi_decl_args"
+			])
 		])
 	])
 ])