X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=20a1836140a0122c25ff83b726345e867f6dc2bc;hp=c3728a71b961137540d7d51ae747da5824588333;hb=b029005e56a8913fbb3d17ab497b4a37a00a211c;hpb=52815a5aac85e8c69ffba76c25a51de3b6ae1365 diff --git a/src/module.c b/src/module.c index c3728a7..20a1836 100644 --- a/src/module.c +++ b/src/module.c @@ -1,7 +1,29 @@ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +/******************************************************************************* + Copyright (c) 2016, Michael Wallner . + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*******************************************************************************/ + +#include "php_psi_stdinc.h" #include "php.h" #include "php_ini.h" @@ -10,6 +32,11 @@ #include "zend_operators.h" #include "php_psi.h" +#include "token.h" +#include "parser.h" + +#define PSI_CPP_SEARCH +#include "php_psi_cpp.h" #if HAVE_LIBJIT # include "libjit.h" @@ -37,57 +64,31 @@ zend_class_entry *psi_object_get_class_entry() return psi_class_entry; } -void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...) -{ - va_list argv; - const char *fn = NULL; - unsigned ln = 0; - - if (t) { - fn = t->file; - ln = t->line; - } else if (zend_is_executing()) { - fn = zend_get_executed_filename(); - ln = zend_get_executed_lineno(); - } else if (zend_is_compiling()) { - fn = zend_get_compiled_filename(); - ln = zend_get_compiled_lineno(); - } - - va_start(argv, msg); - psi_verror(type, fn, ln, msg, argv); - va_end(argv); -} - -void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...) -{ - va_list argv; - - va_start(argv, msg); - psi_verror(type, fn, ln, msg, argv); - va_end(argv); -} - -void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv) -{ - zend_error_cb(type, fn, ln, msg, argv); -} - static void psi_object_free(zend_object *o) { psi_object *obj = PSI_OBJ(NULL, o); if (obj->data) { - /* FIXME: how about registering a destructor? - // free(obj->data); */ + if (obj->dtor) { + obj->dtor(obj->data); + } obj->data = NULL; } zend_object_std_dtor(o); } -static zend_object *psi_object_init(zend_class_entry *ce) +zend_object *psi_object_init_ex(zend_class_entry *ce, void *data, void (*dtor)(void *)) { - psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + psi_object *o; + + if (!ce) { + ce = psi_class_entry; + } + + o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce)); + + o->data = data; + o->dtor = dtor; zend_object_std_init(&o->std, ce); object_properties_init(&o->std, ce); @@ -95,10 +96,16 @@ static zend_object *psi_object_init(zend_class_entry *ce) return &o->std; } +zend_object *psi_object_init(zend_class_entry *ce) +{ + return psi_object_init_ex(ce, NULL, NULL); +} + ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0) ZEND_ARG_INFO(0, stream) ZEND_END_ARG_INFO(); -static PHP_FUNCTION(psi_dump) { +static PHP_FUNCTION(psi_dump) +{ php_stream *s; zval *r = NULL; int fd = STDOUT_FILENO; @@ -113,47 +120,118 @@ static PHP_FUNCTION(psi_dump) { RETURN_FALSE; } } - PSI_ContextDump(&PSI_G(context), fd); + psi_context_dump(PSI_G(context), fd); } ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1) ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); -static PHP_FUNCTION(psi_validate) { +static PHP_FUNCTION(psi_validate) +{ zend_string *file; - PSI_Parser P; + 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", &file)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) { return; } - if (!PSI_ParserInit(&P, file->val, psi_error_wrapper, 0)) { + if (!psi_parser_init(&P, psi_error_wrapper, flags)) { + RETURN_FALSE; + } + if (!(I = psi_parser_open_file(&P, file->val, true))) { + psi_parser_dtor(&P); RETURN_FALSE; } - while (0 < PSI_ParserScan(&P)) { - PSI_ParserParse(&P, PSI_TokenAlloc(&P)); - if (P.num == PSI_T_EOF) { - break; - } + 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) + ZEND_ARG_INFO(0, string) +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; } - PSI_ParserParse(&P, NULL); - if (0 == PSI_ContextValidateData(NULL, PSI_DATA(&P)) && !P.errors) { - RETVAL_TRUE; - } else { - RETVAL_FALSE; + if (!psi_parser_init(&P, psi_error_wrapper, flags)) { + RETURN_FALSE; + } + if (!(I = psi_parser_open_string(&P, string->val, string->len))) { + psi_parser_dtor(&P); + RETURN_FALSE; } - PSI_ParserDtor(&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_parser_dtor(&P); + free(I); +} + +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) { - PSI_ContextOps *ops = NULL; zend_class_entry ce = {0}; + unsigned flags = 0; REGISTER_INI_ENTRIES(); + zend_register_long_constant(ZEND_STRL("PSI_DEBUG"), PSI_DEBUG, CONST_CS|CONST_PERSISTENT, module_number); + zend_register_long_constant(ZEND_STRL("PSI_SILENT"), PSI_SILENT, CONST_CS|CONST_PERSISTENT, module_number); + INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL); psi_class_entry = zend_register_internal_class_ex(&ce, NULL); psi_class_entry->create_object = psi_object_init; @@ -163,33 +241,37 @@ 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(); - } else -#endif -#ifdef HAVE_LIBFFI - ops = PSI_Libffi(); -#endif - - if (!ops) { - php_error(E_WARNING, "No PSI engine found"); + if (SUCCESS != psi_ops_load()) { return FAILURE; } - PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper); - PSI_ContextBuild(&PSI_G(context), PSI_G(directory)); - - if (psi_check_env("PSI_DUMP")) { - PSI_ContextDump(&PSI_G(context), STDOUT_FILENO); + if (psi_check_env("PSI_DEBUG")) { + flags |= PSI_DEBUG; } + if (psi_check_env("PSI_SILENT")) { + flags |= PSI_SILENT; + } + + 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); + + 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) { - PSI_ContextDtor(&PSI_G(context)); + 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(); @@ -207,15 +289,87 @@ static PHP_RINIT_FUNCTION(psi) static PHP_MINFO_FUNCTION(psi) { php_info_print_table_start(); - php_info_print_table_header(2, "psi support", "enabled"); + 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", +#ifndef PHP_PSI_LIBFFI_VERSION +# define PHP_PSI_LIBFFI_VERSION "unknown" +#endif +#ifdef HAVE_LIBFFI + PHP_PSI_LIBFFI_VERSION, "unknown" +#else + "disabled", "disabled" +#endif + ); + php_info_print_table_row(3, "libjit", +#ifdef HAVE_LIBJIT + "unknown", "unknown" +#else + "disabled", "disabled" +#endif + ); + 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) + PHP_FE(psi_validate_string, ai_psi_validate_string) PHP_FE_END }; @@ -233,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