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;
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;
}
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, ops, psi_error_wrapper, flags);
+ 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;
psi_context_free(&PSI_G(context));
+ if (PSI_G(ops)->free) {
+ PSI_G(ops)->free();
+ }
+
UNREGISTER_INI_ENTRIES();
return SUCCESS;
*bl_decls = psi_plist_add(*bl_decls, &tmp)
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");
}
static PHP_GSHUTDOWN_FUNCTION(psi)