X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi_decl.m4;h=92da2929816947da13d3fa7eb7c35a1380bb0794;hp=3bc2558d593cbf60cc23a121c29cff6a71ef64bb;hb=77a446cbcdce6558c00066e5f13e43e8b1b18ff7;hpb=ff9d77817b7feffd43dacd8e5b1d5f644a35ae7d

diff --git a/m4/psi_decl.m4 b/m4/psi_decl.m4
index 3bc2558..92da292 100644
--- a/m4/psi_decl.m4
+++ b/m4/psi_decl.m4
@@ -1,6 +1,30 @@
-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])
@@ -14,6 +38,7 @@ AC_DEFUN(PSI_FUNC_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
@@ -40,6 +65,8 @@ 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))
@@ -51,7 +78,10 @@ AC_DEFUN(PSI_DECL_ARG, [
     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)
@@ -60,10 +90,14 @@ AC_DEFUN(PSI_DECL, [
 		[()], [],
 		[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"
+			])
 		])
 	])
 ])