From: Michael Wallner <mike@php.net>
Date: Mon, 1 Feb 2016 16:59:21 +0000 (+0100)
Subject: flush
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6666c904bfd76dee4b0d7395de81ce1cf88edf2f;p=m6w6%2Fext-psi

flush
---

diff --git a/.gitignore b/.gitignore
index ec1ac8e..f0b0682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ php_psi_types.h
 php_psi_va_decls.h
 /tmp/
 *.loT
+php_psi_unions.h
diff --git a/m4/psi.m4 b/m4/psi.m4
index 63407be..cf7a035 100644
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -75,9 +75,10 @@ static struct psi_predef_const {
 EOF
 	cat >$PSI_REDIRS <<EOF
 /* generated by configure */
+typedef void (*psi_func_ptr)();
 static struct psi_func_redir {
 	const char *name;
-	void (*func)(void);
+	psi_func_ptr func;
 } psi_func_redirs@<:@@:>@ = {
 EOF
 	cat >$PSI_MACROS </dev/null
diff --git a/m4/psi_decl.m4 b/m4/psi_decl.m4
index 92da292..d1acd32 100644
--- a/m4/psi_decl.m4
+++ b/m4/psi_decl.m4
@@ -1,7 +1,7 @@
 # psi_add_redir(name, symbol)
 # Add a function redirection to $PSI_REDIRS.
 psi_add_redir() {
-	cat >>$PSI_REDIRS <<<"	{\"$1\", (void(*)(void))$2}, "
+	cat >>$PSI_REDIRS <<<"	{\"$1\", (psi_func_ptr) $2}, "
 }
 
 # psi_add_decl(decl, options)
@@ -37,32 +37,15 @@ 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
-	AC_CACHE_CHECK(for $1, psi_cv_fn_$1, [
-		psi_symbol_redirect=
-		AC_TRY_LINK(PSI_INCLUDES, [
-			void (*fn)(void) = (void (*)(void)) $psi_symbol;
-		], [
-			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
-	])
-	case "$psi_cv_fn_$1" in
-	"")
-		$3
-		;;
-	"$psi_symbol"|"_$psi_symbol")
-		$2
-		;;
-	*)
-		$2
-		PSI_REDIR($1)
-		;;
-	esac
+dnl PSI_DECL_ARGS(decl args)
+dnl INTERNAL: build psi_decl_args
+AC_DEFUN(PSI_DECL_ARGS, [
+	psi_decl_args=
+	PSI_DECL_ARG($1)
+	m4_case([$2],
+		[(void)], [],
+		[()], [],
+		[m4_map_args_sep([PSI_DECL_ARG(m4_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
 ])
 
 dnl PSI_DECL_ARG(decl arg)
@@ -79,25 +62,33 @@ AC_DEFUN(PSI_DECL_ARG, [
 ])
 
 dnl PSI_DECL(type func, args, flags)
-dnl Check for a function or macro declaration.
+dnl Check for a function or macro declaration and a possible asm redirection.
 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_normalize(], [))], [], m4_bregexp([$2], [(\(.*\))], [\1]))])
-	PSI_FUNC(PSI_VAR_NAME($1), [
-		psi_add_decl "$psi_decl_args" $3
-	], [
-		PSI_MACRO($1, $2, [
-			ifelse([$3], vararg, [
-				AC_MSG_ERROR(varargs macro support is not implemented)
-			],[
-				psi_add_decl "$psi_decl_args"
-			])
+	AC_REQUIRE([PSI_FUNC_LIBC_MAIN])
+	PSI_DECL_ARGS($1, $2)
+	
+	psi_symbol="PSI_VAR_NAME($1)"
+	AC_CACHE_CHECK(for PSI_VAR_NAME($1), [psi_cv_fn_]PSI_VAR_NAME($1), [
+		psi_symbol_redirect=
+		AC_TRY_LINK(PSI_INCLUDES, [
+			void (*fn)(void) = (void (*)(void)) $psi_symbol;
+		], [
+			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_]PSI_VAR_NAME($1)=$psi_symbol_redirect
 	])
+	case "$[psi_cv_fn_]PSI_VAR_NAME($1)" in
+	"$psi_symbol"|"_$psi_symbol")
+		psi_add_decl "$psi_decl_args" $3
+		;;
+	*)
+		ifelse([$3], vararg, [
+			AC_MSG_ERROR(varargs macro support is not implemented)
+		],[
+			PSI_MACRO($1, $2, [psi_add_decl "$psi_decl_args"])
+		])
+		;;
+	esac
 ])
diff --git a/m4/psi_macro.m4 b/m4/psi_macro.m4
index 337a7e5..e89e74b 100644
--- a/m4/psi_macro.m4
+++ b/m4/psi_macro.m4
@@ -33,8 +33,8 @@ AC_DEFUN(PSI_MACRO, [
 		], [
 			macro_body="return $macro_name$macro_call;"
 		])
-		psi_add_macro "$macro_type psi_macro_$macro_name$macro_decl { $macro_body }"
-		PSI_REDIR($macro_name, psi_macro_$macro_name)
+		psi_add_macro "$macro_type _psi_redir_$macro_name$macro_decl { $macro_body }"
+		PSI_REDIR($macro_name, _psi_redir_$macro_name)
 	], [], PSI_INCLUDES)
 ])
 
diff --git a/tests/pipe/pipe.psi b/tests/pipe/pipe.psi
index 6fc9e89..24c5723 100644
--- a/tests/pipe/pipe.psi
+++ b/tests/pipe/pipe.psi
@@ -1,5 +1,5 @@
 
-//extern int pipe(int fildes[2]);
+// extern int pipe(int fildes[2]);
 
 function \pipe(array &$fds = null) : int {
 	return to_int(pipe);