prepare varargs calls

[m6w6/ext-psi] / src / libjit.c

diff --git a/src/libjit.c b/src/libjit.c
index 4866809392aafea74425e6f7d9e36c812b2f67f7..13c0aa46f8e13d8420cee2146af1304058b6e098 100644 (file)
--- 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"
 
@@ -11,9 +18,6 @@ static inline jit_abi_t psi_jit_abi(const char *convention) {
 }
 static inline jit_type_t psi_jit_token_type(token_t t) {
        switch (t) {
-       default:
-               ZEND_ASSERT(0);
-               /* no break */
        case PSI_T_VOID:
                return jit_type_void;
        case PSI_T_INT8:
@@ -34,12 +38,11 @@ static inline jit_type_t psi_jit_token_type(token_t t) {
                return jit_type_ulong;
        case PSI_T_BOOL:
                return jit_type_sys_bool;
-       case PSI_T_INT:
-               return jit_type_sys_int;
        case PSI_T_FLOAT:
                return jit_type_sys_float;
        case PSI_T_DOUBLE:
                return jit_type_sys_double;
+       EMPTY_SWITCH_DEFAULT_CASE();
        }
 }
 static inline jit_type_t psi_jit_decl_type(decl_type *type) {
@@ -84,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(
@@ -146,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);
 }
@@ -203,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 = {
@@ -221,3 +228,5 @@ PSI_ContextOps *PSI_Libjit(void)
 {
        return &ops;
 }
+
+#endif /* HAVE_LIBJIT */