X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibjit.c;h=13c0aa46f8e13d8420cee2146af1304058b6e098;hp=736b54dbbbd67e7a2a61b12b44b9cba7934d90b3;hb=43f9e142088705cc003bb021a32ecd4d4d3b3d2b;hpb=2d013b4e72d2c803817441fa13cadcac357df276

diff --git a/src/libjit.c b/src/libjit.c
index 736b54d..13c0aa4 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -1,4 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "php.h"
+
+#ifdef HAVE_LIBJIT
+
 #include "php_psi.h"
 #include "libjit.h"
 
@@ -80,6 +87,8 @@ static inline PSI_LibjitCall *PSI_LibjitCallAlloc(PSI_Context *C, decl *decl) {
 	call->params[c] = NULL;
 
 	decl->call.info = call;
+	decl->call.rval = decl->func->ptr;
+	decl->call.argc = c;
 	decl->call.args = (void **) &call->params[c+1];
 
 	call->signature = jit_type_create_signature(
@@ -142,12 +151,14 @@ static void psi_jit_init(PSI_Context *C)
 
 static void psi_jit_dtor(PSI_Context *C)
 {
-	size_t i;
+	if (C->decls) {
+		size_t i;
 
-	for (i = 0; i < C->decls->count; ++i) {
-		decl *decl = C->decls->list[i];
+		for (i = 0; i < C->decls->count; ++i) {
+			decl *decl = C->decls->list[i];
 
-		PSI_LibjitCallFree(decl->call.info);
+			PSI_LibjitCallFree(decl->call.info);
+		}
 	}
 	PSI_LibjitContextFree((void *) &C->context);
 }
@@ -199,11 +210,11 @@ static zend_function_entry *psi_jit_compile(PSI_Context *C)
 	return zfe;
 }
 
-static void psi_jit_call(PSI_Context *C, impl_val *ret_val, decl *decl) {
-	PSI_LibjitCall *call = decl->call.info;
+static void psi_jit_call(PSI_Context *C, decl_callinfo *decl_call) {
+	PSI_LibjitCall *call = decl_call->info;
 
-	jit_apply(call->signature, decl->call.sym, decl->call.args,
-			decl->args->count, ret_val);
+	jit_apply(call->signature, decl_call->sym, decl_call->args,
+			decl_call->argc, decl_call->rval);
 }
 
 static PSI_ContextOps ops = {
@@ -217,3 +228,5 @@ PSI_ContextOps *PSI_Libjit(void)
 {
 	return &ops;
 }
+
+#endif /* HAVE_LIBJIT */