OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
#include "php.h"
#include "php_ini.h"
#include "parser.h"
#include "cpp.h"
-#define PSI_CPP_SEARCH
-#include "php_psi_cpp.h"
-
#if HAVE_LIBJIT
# include "libjit.h"
# ifndef HAVE_LIBFFI
{
php_stream *s;
zval *r = NULL;
- int fd = STDOUT_FILENO;
+ struct psi_dump dump = {.fun = (psi_dump_cb) php_stream_printf};
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
return;
}
if (r) {
php_stream_from_zval(s, r);
-
- if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
- RETURN_FALSE;
- }
+ dump.ctx.hn = s;
+ } else {
+ dump.ctx.hn = php_stream_open_wrapper("php://output", "w", REPORT_ERRORS, NULL);
}
- psi_context_dump(PSI_G(context), fd);
+ psi_context_dump(&dump, PSI_G(context));
}
ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
psi_parser_parse(&P, I);
psi_data_ctor(&D, P.error, P.flags);
psi_validate_scope_ctor(&S);
- S.defs = &P.preproc->defs;
+ S.cpp = P.preproc;
RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
psi_parser_parse(&P, I);
psi_data_ctor(&D, P.error, P.flags);
psi_validate_scope_ctor(&S);
- S.defs = &P.preproc->defs;
+ S.cpp = P.preproc;
RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
psi_parser_input_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;
-}
-
PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_builtin);
+PHP_MINIT_FUNCTION(psi_context);
static PHP_MINIT_FUNCTION(psi)
{
zend_class_entry ce = {0};
- unsigned flags = 0;
REGISTER_INI_ENTRIES();
psi_object_handlers.free_obj = psi_object_free;
psi_object_handlers.clone_obj = NULL;
- if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
+ if (SUCCESS != PHP_MINIT(psi_builtin)(type, module_number)) {
return FAILURE;
}
-
- if (SUCCESS != psi_ops_load()) {
+ 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;
+ if (SUCCESS != PHP_MINIT(psi_context)(type, module_number)) {
+ return FAILURE;
}
- 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;
}
PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_builtin);
+PHP_MSHUTDOWN_FUNCTION(psi_context);
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();
- }
-
+ PHP_MSHUTDOWN(psi_context)(type, module_number);
PHP_MSHUTDOWN(psi_cpp)(type, module_number);
+ PHP_MSHUTDOWN(psi_builtin)(type, module_number);
UNREGISTER_INI_ENTRIES();