X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=9de278f96cf8ca66c0d2a3de5f71b53128559770;hp=1db2adff529377b922a848f262fbf71e6a680449;hb=09529efcde471127419e141807b83b37077003a0;hpb=6509a2053456d0e63b6f383b757289d3016ed1a5

diff --git a/src/module.c b/src/module.c
index 1db2adf..9de278f 100644
--- a/src/module.c
+++ b/src/module.c
@@ -34,6 +34,7 @@
 #include "php_psi.h"
 #include "token.h"
 #include "parser.h"
+#include "cpp.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -48,9 +49,69 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
+
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
+{
+	const char *end;
+
+	do {
+		size_t len;
+
+		end = strchr(str, ',');
+		if (end) {
+			len = end - str;
+		} else {
+			len = strlen(str);
+		}
+		if (len) {
+			cb(str, len);
+		}
+
+		str = end + 1;
+	} while (end);
+}
+
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+	return SUCCESS;
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+	return SUCCESS;
+}
+
+static void OnDisplayBlacklist(struct psi_plist *bl)
+{
+	size_t i = 0;
+	char *item;
+
+	while (psi_plist_get(bl, i++, &item)) {
+		if (i > 1) {
+			PUTS(",");
+		}
+		PUTS(item);
+	}
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).decls);
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).vars);
+}
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
 	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+	PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
 PHP_INI_END();
 
 static zend_object_handlers psi_object_handlers;
@@ -123,69 +184,112 @@ static PHP_FUNCTION(psi_dump)
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
 	ZEND_ARG_INFO(0, file)
 	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 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};
+	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
+
+#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)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|lz", &file, &flags, &errcnt)) {
 		return;
 	}
 
 	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;
 	}
 
-	psi_parser_parse(&P);
+	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_validate_scope_ctor(&S);
+	S.defs = &P.preproc->defs;
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
+	}
 
+	psi_validate_scope_dtor(&S);
+	psi_data_dtor(&D);
 	psi_parser_dtor(&P);
+	psi_parser_input_free(&I);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
 	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 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};
+	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
+
+#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)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &string, &flags, &errcnt)) {
 		return;
 	}
 
 	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;
 	}
 
-	psi_parser_parse(&P);
+	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_validate_scope_ctor(&S);
+	S.defs = &P.preproc->defs;
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
+	}
 
+	psi_validate_scope_dtor(&S);
+	psi_data_dtor(&D);
 	psi_parser_dtor(&P);
+	psi_parser_input_free(&I);
 }
 
+PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_context);
 static PHP_MINIT_FUNCTION(psi)
 {
-	struct psi_context_ops *ops = NULL;
 	zend_class_entry ce = {0};
-	unsigned flags = 0;
 
 	REGISTER_INI_ENTRIES();
 
@@ -201,40 +305,22 @@ 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 != PHP_MINIT(psi_cpp)(type, module_number)) {
 		return FAILURE;
 	}
-
-	if (psi_check_env("PSI_DEBUG")) {
-		flags |= PSI_DEBUG;
-	}
-	if (psi_check_env("PSI_SILENT")) {
-		flags |= PSI_SILENT;
-	}
-
-	PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
-	psi_context_build(PSI_G(context), PSI_G(directory));
-
-	if (psi_check_env("PSI_DUMP")) {
-		psi_context_dump(PSI_G(context), STDOUT_FILENO);
+	if (SUCCESS != PHP_MINIT(psi_context)(type, module_number)) {
+		return FAILURE;
 	}
 
 	return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_context);
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
-	psi_context_free(&PSI_G(context));
+	PHP_MSHUTDOWN(psi_context)(type, module_number);
+	PHP_MSHUTDOWN(psi_cpp)(type, module_number);
 
 	UNREGISTER_INI_ENTRIES();
 
@@ -254,7 +340,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",
@@ -278,6 +366,71 @@ static PHP_MINFO_FUNCTION(psi)
 	DISPLAY_INI_ENTRIES();
 }
 
+static void ptr_free(void *ptr)
+{
+	free(*(void **) ptr);
+}
+
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **decls = &PSI_G(blacklist).decls;
+
+	*decls = psi_plist_add(*decls, &tmp);
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **vars = &PSI_G(blacklist).vars;
+
+	*vars = psi_plist_add(*vars, &tmp);
+}
+
+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)
@@ -285,8 +438,15 @@ static const zend_function_entry psi_functions[] = {
 	PHP_FE_END
 };
 
+static const zend_module_dep psi_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	{0}
+};
+
 zend_module_entry psi_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	psi_deps,
 	"psi",
 	psi_functions,
 	PHP_MINIT(psi),
@@ -299,7 +459,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