X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=20a1836140a0122c25ff83b726345e867f6dc2bc;hp=b253e0a68d1b632d129b6f95d2969a52d95bc77b;hb=b029005e56a8913fbb3d17ab497b4a37a00a211c;hpb=7df12c88a4e14611a2585d6e7c994c59e8d7485a

diff --git a/src/module.c b/src/module.c
index b253e0a..20a1836 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,6 +35,9 @@
 #include "token.h"
 #include "parser.h"
 
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
 #if HAVE_LIBJIT
 # include "libjit.h"
 # ifndef HAVE_LIBFFI
@@ -127,10 +130,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate)
 {
 	zend_string *file;
+	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
 	zend_long flags = 0;
 
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+#endif
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
 		return;
 	}
@@ -138,24 +148,17 @@ static PHP_FUNCTION(psi_validate)
 	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
 		RETURN_FALSE;
 	}
-	if (!psi_parser_open_file(&P, file->val)) {
+	if (!(I = psi_parser_open_file(&P, file->val, true))) {
 		psi_parser_dtor(&P);
 		RETURN_FALSE;
 	}
 
-	while (0 < psi_parser_scan(&P)) {
-		psi_parser_parse(&P, psi_token_alloc(&P));
-		if (P.num == PSI_T_EOF) {
-			break;
-		}
-	}
-	psi_parser_parse(&P, NULL);
-
+	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
 	psi_data_dtor(&D);
-
 	psi_parser_dtor(&P);
+	free(I);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
@@ -164,10 +167,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate_string)
 {
 	zend_string *string;
+	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
 	zend_long flags = 0;
 
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+#endif
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
 		return;
 	}
@@ -175,29 +185,45 @@ static PHP_FUNCTION(psi_validate_string)
 	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
 		RETURN_FALSE;
 	}
-	if (!psi_parser_open_string(&P, string->val, string->len)) {
+	if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
 		psi_parser_dtor(&P);
 		RETURN_FALSE;
 	}
 
-	while (0 < psi_parser_scan(&P)) {
-		psi_parser_parse(&P, psi_token_alloc(&P));
-		if (P.num == PSI_T_EOF) {
-			break;
-		}
-	}
-	psi_parser_parse(&P, NULL);
-
+	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
 	psi_data_dtor(&D);
-
 	psi_parser_dtor(&P);
+	free(I);
 }
 
-static PHP_MINIT_FUNCTION(psi)
+static ZEND_RESULT_CODE psi_ops_load()
 {
 	struct psi_context_ops *ops = NULL;
+#ifdef HAVE_LIBJIT
+	if (!strcasecmp(PSI_G(engine), "jit")) {
+		ops = psi_libjit_ops();
+	} else
+#endif
+#ifdef HAVE_LIBFFI
+		ops = psi_libffi_ops();
+#endif
+
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
+	}
+
+	PSI_G(ops) = ops;
+	if (ops->load) {
+		return ops->load();
+	}
+	return SUCCESS;
+}
+
+static PHP_MINIT_FUNCTION(psi)
+{
 	zend_class_entry ce = {0};
 	unsigned flags = 0;
 
@@ -215,17 +241,7 @@ static PHP_MINIT_FUNCTION(psi)
 	psi_object_handlers.free_obj = psi_object_free;
 	psi_object_handlers.clone_obj = NULL;
 
-#ifdef HAVE_LIBJIT
-	if (!strcasecmp(PSI_G(engine), "jit")) {
-		ops = psi_libjit_ops();
-	} else
-#endif
-#ifdef HAVE_LIBFFI
-		ops = psi_libffi_ops();
-#endif
-
-	if (!ops) {
-		php_error(E_WARNING, "No PSI engine found");
+	if (SUCCESS != psi_ops_load()) {
 		return FAILURE;
 	}
 
@@ -236,20 +252,27 @@ static PHP_MINIT_FUNCTION(psi)
 		flags |= PSI_SILENT;
 	}
 
-	PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
-	psi_context_build(PSI_G(context), PSI_G(directory));
+	PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+	sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
 
-	if (psi_check_env("PSI_DUMP")) {
-		psi_context_dump(PSI_G(context), STDOUT_FILENO);
-	}
+	PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+	psi_context_build(PSI_G(context), PSI_G(directory));
 
 	return SUCCESS;
 }
 
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
+	if (psi_check_env("PSI_DUMP")) {
+		psi_context_dump(PSI_G(context), STDOUT_FILENO);
+	}
+
 	psi_context_free(&PSI_G(context));
 
+	if (PSI_G(ops)->free) {
+		PSI_G(ops)->free();
+	}
+
 	UNREGISTER_INI_ENTRIES();
 
 	return SUCCESS;
@@ -268,7 +291,9 @@ static PHP_MINFO_FUNCTION(psi)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PSI Support", "enabled");
 	php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+	php_info_print_table_row(2, "Search Path", PSI_G(search_path));
 	php_info_print_table_end();
+
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 	php_info_print_table_row(3, "libffi",
@@ -292,6 +317,55 @@ static PHP_MINFO_FUNCTION(psi)
 	DISPLAY_INI_ENTRIES();
 }
 
+static void ptr_free(void *ptr)
+{
+	free(*(void **) ptr);
+}
+
+static PHP_GINIT_FUNCTION(psi)
+{
+	char *tmp;
+	struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+	struct psi_plist **bl_vars = &psi_globals->blacklist.vars;
+
+	*bl_decls = psi_plist_init(ptr_free);
+	*bl_vars = psi_plist_init(ptr_free);
+
+#define BL_ADD(D, d) \
+	tmp = strdup(d); \
+	*D = psi_plist_add(*D, &tmp)
+#define BL_DECL_ADD(d) BL_ADD(bl_decls, d)
+#define BL_VAR_ADD(d) BL_ADD(bl_vars, d)
+
+	BL_DECL_ADD("dlsym");
+	BL_DECL_ADD("alloca");
+	BL_DECL_ADD("atexit");
+	BL_DECL_ADD("at_quick_exit");
+
+	/* missing */
+	BL_DECL_ADD("_IO_cookie_init");
+	BL_DECL_ADD("bindresvport6");
+
+	/* va_list as arg */
+	BL_DECL_ADD("*v*printf");
+	BL_DECL_ADD("*v*scanf");
+	BL_DECL_ADD("vsyslog");
+
+	/* LFS/LFO for 32bit */
+	BL_DECL_ADD("*stat*64");
+	BL_DECL_ADD("*glob*64");
+	/* Hurd only */
+	BL_DECL_ADD("getumask");
+
+	/* using hidden structs */
+	BL_VAR_ADD("_IO_2_*");
+}
+
+static PHP_GSHUTDOWN_FUNCTION(psi)
+{
+	psi_plist_free(psi_globals->blacklist.decls);
+}
+
 static const zend_function_entry psi_functions[] = {
 	PHP_FE(psi_dump, ai_psi_dump)
 	PHP_FE(psi_validate, ai_psi_validate)
@@ -313,7 +387,11 @@ zend_module_entry psi_module_entry = {
 	NULL,
 	PHP_MINFO(psi),
 	PHP_PSI_VERSION,
-	STANDARD_MODULE_PROPERTIES
+	ZEND_MODULE_GLOBALS(psi),
+	PHP_GINIT(psi),
+	PHP_GSHUTDOWN(psi),
+	NULL, /* post-deactivate */
+	STANDARD_MODULE_PROPERTIES_EX
 };
 
 #ifdef COMPILE_DL_PSI