projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
avoid warning of empty struct decls
[m6w6/ext-psi]
/
src
/
module.c
diff --git
a/src/module.c
b/src/module.c
index 3cd45f9efde40ecf0433c20589274501af71dfea..1a0ef3534e2f3c64dcee4c050fbff680ce85a823 100644
(file)
--- a/
src/module.c
+++ b/
src/module.c
@@
-198,9
+198,32
@@
static PHP_FUNCTION(psi_validate_string)
free(I);
}
free(I);
}
-static
PHP_MINIT_FUNCTION(psi
)
+static
ZEND_RESULT_CODE psi_ops_load(
)
{
struct psi_context_ops *ops = NULL;
{
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;
zend_class_entry ce = {0};
unsigned flags = 0;
@@
-218,17
+241,7
@@
static PHP_MINIT_FUNCTION(psi)
psi_object_handlers.free_obj = psi_object_free;
psi_object_handlers.clone_obj = NULL;
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;
}
return FAILURE;
}
@@
-242,7
+255,7
@@
static PHP_MINIT_FUNCTION(psi)
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(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_build(PSI_G(context), PSI_G(directory));
return SUCCESS;
@@
-256,6
+269,10
@@
static PHP_MSHUTDOWN_FUNCTION(psi)
psi_context_free(&PSI_G(context));
psi_context_free(&PSI_G(context));
+ if (PSI_G(ops)->free) {
+ PSI_G(ops)->free();
+ }
+
UNREGISTER_INI_ENTRIES();
return SUCCESS;
UNREGISTER_INI_ENTRIES();
return SUCCESS;
@@
-317,7
+334,23
@@
static PHP_GINIT_FUNCTION(psi)
*bl_decls = psi_plist_add(*bl_decls, &tmp)
BL_DECL_ADD("dlsym");
*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("_IO_cookie_init");
+ BL_DECL_ADD("bindresvport6");
+
+ /* va_list as arg */
+ BL_DECL_ADD("*v*printf");
+ BL_DECL_ADD("*v*scanf");
+
+ /* 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)
}
static PHP_GSHUTDOWN_FUNCTION(psi)