X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi_decl.m4;h=3bc2558d593cbf60cc23a121c29cff6a71ef64bb;hp=9b2d3eb6846fb032c67f707c5cac7b038025a61e;hb=574519ef5e3ab76f00253fad870afce7135638d1;hpb=b4508f6b917660970f887894a6aaed6c220a2c72

diff --git a/m4/psi_decl.m4 b/m4/psi_decl.m4
index 9b2d3eb..3bc2558 100644
--- a/m4/psi_decl.m4
+++ b/m4/psi_decl.m4
@@ -7,7 +7,7 @@ AC_DEFUN(PSI_FUNC_LIBC_MAIN, [
 	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
 	])
@@ -22,7 +22,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
 	])
@@ -43,16 +43,12 @@ AC_DEFUN(PSI_FUNC, [
 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)
@@ -62,7 +58,7 @@ AC_DEFUN(PSI_DECL, [
 	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"
 	], [