X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi%2Fpsi.m4;h=bb8254bf2f25e0b9a0081d7d00e2d591e0f00ecd;hp=c8eec1850d9f546efeef16b550e39bbf1be9c38a;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=9c6a90318dc5e20b73820d7c2bb8eb3b30888cb3

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index c8eec18..bb8254b 100644
--- a/m4/psi/psi.m4
+++ b/m4/psi/psi.m4
@@ -1,191 +1,83 @@
-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
-PSI_FN_DECLS=$PHP_PSI_SRCDIR/php_psi_fn_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 >$PHP_PSI_BUILDDIR/php_psi.dep <<EOF
-\$(PHP_PSI_SRCDIR)/php_psi.h:
-php_psi.h:
-\$(PHP_PSI_SRCDIR)/php_psi_stdinc.h:
-php_psi_stdinc.h:
-EOF
-	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_MACROS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
-		cat >>$PHP_PSI_BUILDDIR/php_psi.dep <<EOF
-$i:
-$(basename $i):
-EOF
-		cat >$i <<EOF
-/* generated by configure */
-#include "php_psi_stdinc.h"
-EOF
-	done
-	cat >>$PSI_STDTYPES <<EOF
-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
-static struct psi_predef_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_predef_types@<:@@:>@ = {
-EOF
-	cat >>$PSI_STRUCTS <<EOF
-static struct psi_predef_struct {
-	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_structs@<:@@:>@ = {
-EOF
-	cat >>$PSI_UNIONS <<EOF
-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
-static struct psi_predef_const {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	const char *val_text;
-	token_t val_type_tag;
-} psi_predef_consts@<:@@:>@ = {
-EOF
-	cat >>$PSI_REDIRS <<EOF
-typedef void (*psi_func_ptr)();
-static struct psi_func_redir {
-	const char *name;
-	psi_func_ptr func;
-} psi_func_redirs@<:@@:>@ = {
-EOF
-	cat >>$PSI_MACROS <<EOF
-EOF
-	cat >>$PSI_DECLS <<EOF
-static struct psi_predef_decl {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_VA_DECLS <<EOF
-static struct psi_predef_decl psi_predef_vararg_decls@<:@@:>@ = {
-EOF
-	cat >>$PSI_FN_DECLS <<EOF
-static struct psi_predef_decl psi_predef_functor_decls@<:@@:>@ = {
-EOF
-])
-
-dnl PSI_CONFIG_DONE()
-dnl Finish the headers with the pre-defined types etc.
-AC_DEFUN(PSI_CONFIG_DONE, [
-	cat >$PSI_STDINC <<EOF
-/* generated by configure */
-#ifndef PSI_STDINC_H
-#define PSI_STDINC_H
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
-# include "php_config.h"
-#endif
+	psi_save_LIBS=$LIBS
+	LIBS=
 
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
+	ac_includes_default="AC_INCLUDES_DEFAULT"
+	
+	AC_PROG_AWK
+	
+	AC_MSG_CHECKING(for preprocessor defaults)
+	psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -U__BLOCKS__ - </dev/null`
+	psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null 2>&1 >/dev/null \
+		| $AWK '
+			/include.*search.*start/ { 
+				capture = 1
+				next
+			}
+			/@<:@Ee@:>@nd.*search/ {
+				capture = 0
+			}
+			{ 
+				if (capture)
+					print $1
+			}
+		' \
+	`
+	psi_cpp_predef_count=`printf %s "$psi_cpp_predef" | wc -l`
+	psi_cpp_search_count=`printf %s "$psi_cpp_search" | wc -l`
+	AC_MSG_RESULT([$psi_cpp_predef_count predefined macros, and $psi_cpp_search_count search paths])
+	PSI_CPP_PREDEF=`printf "%s\n" "$psi_cpp_predef" | \
+		$AWK '{
+			gsub(/"/, "\\\\\"");
+			printf "\"%s\\\n\"\n", $[]0
+		}' \
+	`
+	PSI_CPP_SEARCH=`printf %s "$psi_cpp_search" | \
+		$AWK '{
+			if (i) printf ":";
+			gsub(/^@<:@@<:@:space:@:>@@:>@+/,"");
+			gsub(/@<:@@<:@:space:@:>@@:>@+$/,"");
+			printf "%s", $[]0;
+			++i
+		}' \
+	`
 
-PSI_INCLUDES
-#endif
-EOF
-	for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
-		cat >>$i <<EOF
-	{0}
-};
-EOF
-	done
-])
-
-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])
+	if test "$PHP_PSI_MAINTAINER_MODE" = "yes"; then
+		PSI_DEPS=true
+		PHP_SUBST(PSI_DEPS)
 	else
-		ifelse([$3],,:,[$3])
+		PSI_DEPS=false
 	fi
-])
+	
+	PSI_STDTYPES=
+	PSI_CONSTS=
+	
+	AC_CONFIG_FILES(
+		[$PHP_PSI_BUILDDIR/php_psi_stdinc.h:$PHP_PSI_SRCDIR/php_psi_stdinc.h.in]
+		[$PHP_PSI_BUILDDIR/php_psi_posix.h:$PHP_PSI_SRCDIR/php_psi_posix.h.in]
+		[$PHP_PSI_BUILDDIR/php_psi_cpp.h:$PHP_PSI_SRCDIR/php_psi_cpp.h.in]
+	)
 
-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
-	])
+dnl PSI_CONFIG_DONE()
+dnl Finish the headers with the pre-defined types etc.
+AC_DEFUN(PSI_CONFIG_DONE, [
+	psi_eval_LIBS=$LIBS
+	LIBS=$psi_save_LIBS
+	PHP_EVAL_LIBLINE($psi_eval_LIBS, PSI_SHARED_LIBADD)
+	
+	[PSI_INCLUDES]="PSI_INCLUDES"
+	AC_SUBST([PSI_INCLUDES])
+	AC_SUBST([PSI_STDTYPES])
+	AC_SUBST([PSI_CONSTS])
+	AC_SUBST([PSI_CPP_SEARCH])
+	AC_SUBST([PSI_CPP_PREDEF])
 ])
 
 AC_DEFUN(PSI_PTHREAD_ONCE, [
@@ -200,16 +92,15 @@ AC_DEFUN(PSI_PTHREAD, [
 
 dnl PSI_INCLUDES()
 dnl Expands to a complete list of include statements including
-dnl AC_INCLUDES_DEFAULT().
-AC_DEFUN(PSI_INCLUDES, [dnl
-#define PSI_INCLUDES
+dnl autoconf's defaults.
+AC_DEFUN(PSI_INCLUDES, [
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
 #ifndef _REENTRANT
 # define _REENTRANT
 #endif
-AC_INCLUDES_DEFAULT()
+$ac_includes_default
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
@@ -246,6 +137,9 @@ typedef bool _Bool;
 #ifdef HAVE_ARPA_NAMESER_H
 # include <arpa/nameser.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
@@ -306,8 +200,14 @@ AC_DEFUN(PSI_LEMON, [
 	AC_ARG_VAR(LEMON, The lemon parser generator of the SQLite project)
 	if test -z "$LEMON"
 	then
-		AC_PATH_PROG(LEMON, lemon, ./lemon)
+		AC_PATH_PROG(LEMON, lemon, $PHP_PSI_BUILDDIR/lemon)
+		if expr + "$LEMON" : "/" >/dev/null; then
+			LEMON_PATH=
+		else
+			LEMON_PATH=$abs_builddir/
+		fi
 	fi
+	PHP_SUBST(LEMON_PATH)
 	PHP_SUBST(LEMON)
 ])
 
@@ -345,7 +245,7 @@ AC_DEFUN([PSI_SH_TEST_ALIGNOF], [test -n "$AS_TR_SH([ac_cv_alignof_]$1)" && test
 
 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.
+dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS_H.
 AC_DEFUN(PSI_CHECK_SIZEOF, [
 	AC_CHECK_SIZEOF($1, [], PSI_INCLUDES
 		$2)
@@ -356,7 +256,7 @@ AC_DEFUN(PSI_CHECK_SIZEOF, [
 
 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.
+dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS_H.
 AC_DEFUN(PSI_CHECK_ALIGNOF, [
 	AC_CHECK_ALIGNOF($1, PSI_INCLUDES
 		$2)
@@ -374,7 +274,7 @@ AC_DEFUN(PSI_CHECK_OFFSETOF, [
 		[offset of $2 in $1],
 		[AS_TR_SH([ac_cv_offsetof_$1_$2])],
 		[(long int) (offsetof ($1, $2))],
-		[PSI_INCLUDES],
+		PSI_INCLUDES,
 		[AC_MSG_FAILURE([cannot compute offsetof ($1, $2)])]
 	)
 	AC_DEFINE_UNQUOTED(
@@ -470,6 +370,13 @@ AC_DEFUN(PSI_CHECK_LIBFFI, [
 			AC_MSG_WARN([Could not find libffi, please provide the base install path])
 		fi
 	fi
+	
+	save_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $INCLUDES"
+	AC_CHECK_DECL(FFI_STDCALL,[AC_DEFINE([HAVE_FFI_STDCALL],[1],[ ])],,[#include "ffi.h"])
+	AC_CHECK_DECL(FFI_FASTCALL,[AC_DEFINE([HAVE_FFI_FASTCALL],[1],[ ])],,[#include "ffi.h"])
+	CFLAGS=$save_CFLAGS
+	
 	PHP_CHECK_LIBRARY(ffi, ffi_closure_alloc, [
 		PHP_CHECK_LIBRARY(ffi, ffi_prep_closure_loc, [
 			AC_DEFINE(PSI_HAVE_FFI_PREP_CLOSURE_LOC, 1, [ ])