X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi.m4;h=63407beb24bb9fd0c61856c65668475fd0da3aed;hp=81aca2801419e12bcf29077d382ba7054f4ce871;hb=69fb17bcfa5ed9c32754fa143b59f4a4a2dd4bd8;hpb=b1720af16e5d7765e2effcd16e23f351c2f82e54

diff --git a/m4/psi.m4 b/m4/psi.m4
index 81aca28..63407be 100644
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -1,13 +1,38 @@
+dnl Generated headers with pre-defined types, structs, consts and decls.
+PSI_STDINC=$PHP_PSI_SRCDIR/php_psi_stdinc.h
+PSI_STDTYPES=$PHP_PSI_SRCDIR/php_psi_stdtypes.h
 PSI_TYPES=$PHP_PSI_SRCDIR/php_psi_types.h
 PSI_STRUCTS=$PHP_PSI_SRCDIR/php_psi_structs.h
+PSI_UNIONS=$PHP_PSI_SRCDIR/php_psi_unions.h
 PSI_CONSTS=$PHP_PSI_SRCDIR/php_psi_consts.h
 PSI_REDIRS=$PHP_PSI_SRCDIR/php_psi_redirs.h
 PSI_MACROS=$PHP_PSI_SRCDIR/php_psi_macros.h
 PSI_DECLS=$PHP_PSI_SRCDIR/php_psi_decls.h
 PSI_VA_DECLS=$PHP_PSI_SRCDIR/php_psi_va_decls.h
 
+dnl PSI_CONFIG_INIT()
+dnl Creates stubs of the headers with pre-defined types etc.
+dnl These headers are included by src/context.c.
+dnl This macro must be called prior any checks for a type, struct, decl etc.
 AC_DEFUN(PSI_CONFIG_INIT, [
+	cat >$PSI_STDTYPES <<EOF
+/* generated by configure */
+static struct psi_std_type {
+	token_t type_tag;
+	const char *type_name;
+	const char *alias;
+} psi_std_types@<:@@:>@ = {
+	{PSI_T_INT8, "int8_t", NULL},
+	{PSI_T_INT16, "int16_t", NULL},
+	{PSI_T_INT32, "int32_t", NULL},
+	{PSI_T_INT64, "int64_t", NULL},
+	{PSI_T_UINT8, "uint8_t", NULL},
+	{PSI_T_UINT16, "uint16_t", NULL},
+	{PSI_T_UINT32, "uint32_t", NULL},
+	{PSI_T_UINT64, "uint64_t", NULL},
+EOF
 	cat >$PSI_TYPES <<EOF
+/* generated by configure */
 static struct psi_predef_type {
 	token_t type_tag;
 	const char *type_name;
@@ -15,6 +40,7 @@ static struct psi_predef_type {
 } psi_predef_types@<:@@:>@ = {
 EOF
 	cat >$PSI_STRUCTS <<EOF
+/* generated by configure */
 static struct psi_predef_struct {
 	token_t type_tag;
 	const char *type_name;
@@ -24,8 +50,21 @@ static struct psi_predef_struct {
 	size_t pointer_level;
 	size_t array_size;
 } psi_predef_structs@<:@@:>@ = {
+EOF
+	cat >$PSI_UNIONS <<EOF
+/* generated by configure */
+static struct psi_predef_union {
+	token_t type_tag;
+	const char *type_name;
+	const char *var_name;
+	size_t offset;
+	size_t size;
+	size_t pointer_level;
+	size_t array_size;
+} psi_predef_unions@<:@@:>@ = {
 EOF
 	cat >$PSI_CONSTS <<EOF
+/* generated by configure */
 static struct psi_predef_const {
 	token_t type_tag;
 	const char *type_name;
@@ -35,6 +74,7 @@ static struct psi_predef_const {
 } psi_predef_consts@<:@@:>@ = {
 EOF
 	cat >$PSI_REDIRS <<EOF
+/* generated by configure */
 static struct psi_func_redir {
 	const char *name;
 	void (*func)(void);
@@ -42,6 +82,7 @@ static struct psi_func_redir {
 EOF
 	cat >$PSI_MACROS </dev/null
 	cat >$PSI_DECLS <<EOF
+/* generated by configure */
 static struct psi_predef_decl {
 	token_t type_tag;
 	const char *type_name;
@@ -51,12 +92,19 @@ static struct psi_predef_decl {
 } psi_predef_decls@<:@@:>@ = {
 EOF
 	cat >$PSI_VA_DECLS <<EOF
+/* generated by configure */
 static struct psi_predef_decl psi_predef_vararg_decls@<:@@:>@ = {
 EOF
 ])
 
+dnl PSI_CONFIG_DONE()
+dnl Finish the headers with the pre-defined types etc.
 AC_DEFUN(PSI_CONFIG_DONE, [
-	for i in $PSI_TYPES $PSI_STRUCTS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS; do
+	cat >$PSI_STDINC <<EOF
+/* generated by configure */
+PSI_INCLUDES
+EOF
+	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS; do
 		cat >>$i <<EOF
 	{0}
 };
@@ -64,25 +112,148 @@ EOF
 	done
 ])
 
-psi_includes() {
-	local have_
-	have_=`AS_ECHO($ac_header) | $as_tr_cpp`
-	cat <<EOF
-#ifdef HAVE_$have_
-# include <$ac_header>
-#endif
-EOF
-}
+dnl PSI_SH_CONFIG_POSIX_ENABLED(section)
+dnl Expand to $psi_config_posix_<section>
+AC_DEFUN(PSI_SH_CONFIG_POSIX_ENABLED, [$AS_TR_SH([psi_config_posix_]$1)])
 
+dnl PSI_CONFIG_POSIX_ENABLED(section, action-if-yes, action-if-not)
+dnl Internal. Used to check if --enable-psi-posix=section was given.
+AC_DEFUN(PSI_CONFIG_POSIX_ENABLED, [
+	AS_TR_SH([psi_config_posix_]$1)=false
+	case "$PHP_PSI_POSIX" in
+	yes|all)
+		AS_TR_SH([psi_config_posix_]$1)=true 
+		;;
+	*)
+		if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
+			AS_TR_SH([psi_config_posix_]$1)=true
+		fi
+		;;
+	esac
+	if $AS_TR_SH([psi_config_posix_]$1); then
+		ifelse([$2],,:,[$2])
+	else
+		ifelse([$3],,:,[$3])
+	fi
+])
+
+dnl PSI_TEST_POSIX_ENABLED(section, action-if-yes, action-if-not)
+dnl Shell-if test if PSI POSIX section was configured.
+AC_DEFUN(PSI_SH_TEST_POSIX_ENABLED, [
+	if test "PSI_SH_CONFIG_POSIX_ENABLED([$1])" && $PSI_SH_CONFIG_POSIX_ENABLED([$1]); then
+		ifelse([$2],,:,[$2])
+	else
+		ifelse([$3],,:,[$3])
+	fi
+])
+
+dnl PSI_CONFIG_POSIX(section, headers)
+AC_DEFUN(PSI_CONFIG_POSIX, [
+	PSI_CONFIG_POSIX_ENABLED($1, [
+		PHP_CONFIGURE_PART(Configuring PSI POSIX: $1)
+		ifelse([$2],,,AC_CHECK_HEADERS($2))
+	], [
+		return 0
+	])
+])
+
+AC_DEFUN(PSI_PTHREAD_ONCE, [
+	AX_PTHREAD([
+		LIBS="$PTHREAD_LIBS $LIBS"
+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	])
+])
+AC_DEFUN(PSI_PTHREAD, [
+	AC_REQUIRE([PSI_PTHREAD_ONCE])
+])
+
+dnl PSI_INCLUDES()
+dnl Expands to a complete list of include statements including
+dnl AC_INCLUDES_DEFAULT().
 AC_DEFUN(PSI_INCLUDES, [AC_INCLUDES_DEFAULT()
-`psi_includes`])
+#ifdef HAVE_ERRNO_H
+# include <errno.h>
+#endif
+#ifdef HAVE_GLOB_H
+# include <glob.h>
+#endif
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+#ifdef HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
+#endif
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+#ifdef HAVE_NDBM_H
+# include <ndbm.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#endif
+#ifdef HAVE_RESOLV_H
+# include <resolv.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_UTSNAME_H
+# include <sys/utsname.h>
+#endif
+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+#ifdef HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+#ifdef HAVE_WCTYPE_H
+# include <wctype.h>
+#endif
+])
 
+dnl PSI_LEMON()
+dnl Declare $LEMON precious, and check for a `lemon` in $PATH.
 AC_DEFUN(PSI_LEMON, [
 	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
 	AC_PATH_PROG(LEMON, lemon, ./lemon)
 	PHP_SUBST(LEMON)
 ])
 
+dnl PSI_PKG_CONFIG()
+dnl Check for `pkg-config` and add possible libjit and libffi directories to
+dnl $PKG_CONFIG_PATH, because those libs often ship with headers etc. in
+dnl arch-dependent locations.
 AC_DEFUN([PSI_PKG_CONFIG], [
 	if test -z "$PKG_CONFIG"
 	then
@@ -91,13 +262,52 @@ AC_DEFUN([PSI_PKG_CONFIG], [
 	export PKG_CONFIG_PATH="$PHP_PSI_LIBFFI/lib/pkgconfig:$PHP_PSI_LIBJIT/lib/pkgconfig:$PKG_CONFIG_PATH"
 ])
 
+dnl PSI_SH_SIZEOF(type)
+dnl expand to shell variable $ac_cv_sizeof_<TYPE>
+AC_DEFUN([PSI_SH_SIZEOF], [$AS_TR_SH([ac_cv_sizeof_]$1)])
+
+dnl PSI_SH_OFFSETOF(type)
+dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
+AC_DEFUN([PSI_SH_OFFSETOF], [$AS_TR_SH([ac_cv_offsetof_]$1)])
+
+dnl PSI_SH_ALIGNOF(type)
+dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
+AC_DEFUN([PSI_SH_ALIGNOF], [$AS_TR_SH([ac_cv_alignof_]$1)])
+
+dnl PSI_SH_TEST_SIZEOF(type)
+dnl `if` condition to test if $ac_cv_sizeof_$1 is greater than 0.
+AC_DEFUN([PSI_SH_TEST_SIZEOF], [test -n "$AS_TR_SH([ac_cv_sizeof_]$1)" && test "$AS_TR_SH([ac_cv_sizeof_]$1)" -gt 0])
+
+dnl PSI_SH_TEST_ALIGNOF(type)
+dnl `if` condition to test if $ac_cv_alignof_$1 is greater than 0.
+AC_DEFUN([PSI_SH_TEST_ALIGNOF], [test -n "$AS_TR_SH([ac_cv_alignof_]$1)" && test "$AS_TR_SH([ac_cv_alignof_]$1)" -gt 0])
+
+dnl PSI_CHECK_SIZEOF(type, special-includes)
+dnl AC_CHECK_SIZEOF wrapper with PSI_INCLUDES
+dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS.
 AC_DEFUN(PSI_CHECK_SIZEOF, [
-	AC_CHECK_SIZEOF($1, [], $2)
-	if test "$AS_TR_SH([ac_cv_sizeof_]$1)"; then
-		add_int_const "AS_TR_CPP([SIZEOF_]$1)" "$AS_TR_SH([ac_cv_sizeof_]$1)"
+	AC_CHECK_SIZEOF($1, [], PSI_INCLUDES
+		$2)
+	if PSI_SH_TEST_SIZEOF($1); then
+		psi_add_int_const "AS_TR_CPP([SIZEOF_]$1)" "$AS_TR_SH([ac_cv_sizeof_]$1)"
 	fi
 ])
 
+dnl PSI_CHECK_ALIGNOF(type, special-includes)
+dnl AC_CHECK_ALIGNOF wrapper with PSI_INCLUDES
+dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS.
+AC_DEFUN(PSI_CHECK_ALIGNOF, [
+	AC_CHECK_ALIGNOF($1, PSI_INCLUDES
+		$2)
+	if PSI_SH_TEST_ALIGNOF($1); then
+		psi_add_int_const "AS_TR_CPP([ALIGNOF_]$1)" "$AS_TR_SH([ac_cv_alignof_]$1)"
+	fi
+])
+
+dnl PSI_CHECK_OFFSETOF(struct, element)
+dnl Check the offset of a struct element, implemented in the similar manner
+dnl like AC_CHECK_SIZEOF.
+dnl AC_DEFINEs OFFSETOF_<STRUCT>_<ELEMENT>.
 AC_DEFUN(PSI_CHECK_OFFSETOF, [
 	_AC_CACHE_CHECK_INT(
 		[offset of $2 in $1],
@@ -113,9 +323,24 @@ AC_DEFUN(PSI_CHECK_OFFSETOF, [
 	)
 ])
 
+
+dnl PSI_COMPUTE_STR(variable, string or expression)
+dnl Compute a string constant value in a similar manner like AC_COMPUTE_INT.
+AC_DEFUN(PSI_COMPUTE_STR, [
+	AC_TRY_RUN(
+		PSI_INCLUDES
+		[int main() {
+			return EOF == fputs($2, fopen("conftest.out", "w"));
+		}
+	], [
+		eval $1=\\\"`cat conftest.out`\\\"
+	])
+])
+
+dnl PSI_CHECK_LIBJIT()
+dnl Check for libjit in $PHP_PSI_LIBJIT or standard locations
+dnl AC_DEFINEs HAVE_LIBJIT.
 AC_DEFUN(PSI_CHECK_LIBJIT, [
-	PHP_ARG_WITH(psi-libjit, where to find libjit,
-	[  --with-psi-libjit=DIR   PSI: path to libjit], [ ], [ ])
 	AC_CACHE_CHECK(for libjit, psi_cv_libjit_dir, [
 		for psi_cv_libjit_dir in $PHP_PSI_LIBJIT {/usr{,/local},/opt}{,/libjit}
 		do
@@ -136,8 +361,15 @@ AC_DEFUN(PSI_CHECK_LIBJIT, [
 	fi
 ])
 
-PHP_ARG_WITH(psi-libffi, where to find libffi,
-[  --with-psi-libffi=DIR   PSI: path to libffi], [ ], [ ])
+dnl PSI_CHECK_LIBFFI()
+dnl Check for libffi with `pkg-config`. If that fails, `configure` looks into
+dnl $PHP_PSI_LIBFFI or standard locations to find libjit deps.
+dnl Checks for availability of recent closure API:
+dnl \ffi_closure_alloc and \ffi_prep_closure.
+dnl Checks for availability of recent vararg API:
+dnl \ffi_prep_cif_var.
+dnl AC_DEFINEs HAVE_LIBFFI, PSI_HAVE_FFI_CLOSURE_ALLOC,
+dnl PSI_HAVE_FFI_PREP_CLOSURE and PSI_HAVE_FFO_PREP_VIF_VAR.
 AC_DEFUN(PSI_CHECK_LIBFFI, [
 	AC_REQUIRE([PSI_PKG_CONFIG])dnl
 
@@ -148,6 +380,7 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 	else
 		psi_cv_libffi=false
 	fi])
+
 	if $psi_cv_libffi
 	then
 		AC_MSG_CHECKING(for libffi)
@@ -193,15 +426,3 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 	], [
 	], -L$psi_cv_libffi_dir/$PHP_LIBDIR)
 ])
-
-dnl PSI_COMPUTE_STR(variable, string or expression)
-AC_DEFUN(PSI_COMPUTE_STR, [
-	AC_TRY_RUN(
-		PSI_INCLUDES
-		[int main() {
-			return EOF == fputs($2, fopen("conftest.out", "w"));
-		}
-	], [
-		eval $1=\\\"`cat conftest.out`\\\"
-	])
-])