X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=8637babfa112292dac519ade059e2a7aea4f2960;hp=b8d23008ffcaa4f73139b92224c29f9631234636;hb=61918592ab618c073b9846783ce79fed9f26c5f7;hpb=3c53642a0adccd4b602d147833da24eb4b73bccc

diff --git a/src/module.c b/src/module.c
index b8d2300..8637bab 100644
--- a/src/module.c
+++ b/src/module.c
@@ -10,14 +10,22 @@
 #include "php_psi.h"
 #include "parser.h"
 
-#include "libjit.h"
-#include "libffi.h"
+#if HAVE_LIBJIT
+# include "libjit.h"
+# ifndef HAVE_LIBFFI
+#  define PSI_ENGINE "jit"
+# endif
+#endif
+#if HAVE_LIBFFI
+# include "libffi.h"
+# define PSI_ENGINE "ffi"
+#endif
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("psi.engine", "ffi", PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
-	STD_PHP_INI_ENTRY("psi.directory", "psis", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
+	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
 PHP_INI_END();
 
 void psi_error(int type, const char *msg, ...)
@@ -196,8 +204,10 @@ size_t psi_num_min_args(impl *impl)
 	return n;
 }
 
-void psi_to_bool(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
+void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
 {
+	decl_var *var = set->vars->vars[0];
+	token_t t = real_decl_type(var->arg->type)->type;
 	impl_val *v = deref_impl_val(ret_val, var);
 
 	switch (t) {
@@ -214,8 +224,10 @@ void psi_to_bool(zval *return_value, token_t t, impl_val *ret_val, set_value *se
 	convert_to_boolean(return_value);
 }
 
-void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
+void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
 {
+	decl_var *var = set->vars->vars[0];
+	token_t t = real_decl_type(var->arg->type)->type;
 	impl_val *v = deref_impl_val(ret_val, var);
 
 	switch (t) {
@@ -232,8 +244,10 @@ void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, set_value *set
 	convert_to_long(return_value);
 }
 
-void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
+void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
 {
+	decl_var *var = set->vars->vars[0];
+	token_t t = real_decl_type(var->arg->type)->type;
 	impl_val *v = deref_impl_val(ret_val, var);
 
 	switch (t) {
@@ -249,8 +263,11 @@ void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, set_value *
 	}
 }
 
-void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
+void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
 {
+	decl_var *var = set->vars->vars[0];
+	token_t t = real_decl_type(var->arg->type)->type;
+
 	switch (t) {
 	case PSI_T_INT8:
 	case PSI_T_UINT8:
@@ -338,17 +355,18 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 	return mem;
 }
 
-void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
+void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 {
 	zval ele;
 	unsigned i;
-	impl_val tmp;
+	decl_var *var = set->vars->vars[0];
+	token_t t = real_decl_type(var->arg->type)->type;
+	impl_val tmp, *ret_val = deref_impl_val(r_val, var);
 
 	array_init(return_value);
 
 	if (t == PSI_T_STRUCT) {
 		decl_struct *s = real_decl_type(var->arg->type)->strct;
-		ret_val = deref_impl_val(ret_val, var);
 
 		ZEND_ASSERT(s);
 
@@ -360,22 +378,23 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *s
 				set_value *sub_set = set->inner[i];
 				decl_var *sub_var = sub_set->vars->vars[0];
 				decl_arg *sub_arg = sub_var->arg;
-				token_t t = real_decl_type(sub_arg->type)->type;
-				void *ptr = malloc(sub_arg->layout->len);
-
-				memcpy(ptr, (char *) ret_val->ptr + sub_arg->layout->pos,
-						sub_arg->layout->len);
-				tmp_ptr = enref_impl_val(ptr, sub_arg->var);
-				sub_set->func->handler(&ztmp, t, tmp_ptr, sub_set, sub_var);
-				add_assoc_zval(return_value, sub_var->name, &ztmp);
-				free(tmp_ptr);
-				if (tmp_ptr != ptr) {
-					free(ptr);
+
+				if (sub_arg) {
+					void *ptr = malloc(sub_arg->layout->len);
+
+					memcpy(ptr, (char *) ret_val->ptr + sub_arg->layout->pos,
+							sub_arg->layout->len);
+					tmp_ptr = enref_impl_val(ptr, sub_arg->var);
+					sub_set->func->handler(&ztmp, sub_set, tmp_ptr);
+					add_assoc_zval(return_value, sub_var->name, &ztmp);
+					free(tmp_ptr);
+					if (tmp_ptr != ptr) {
+						free(ptr);
+					}
 				}
 			}
 		}
 		return;
-
 //		for (i = 0; i < s->args->count; ++i) {
 //			decl_arg *darg = s->args->args[i];
 //			impl_val tmp, tmp_ptr;
@@ -414,29 +433,40 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *s
 //			}
 //			add_assoc_zval(return_value, darg->var->name, &ztmp);
 //		}
-		return;
 	}
-	ret_val = deref_impl_val(ret_val, var);
-	for (i = 0; i < var->arg->var->array_size; ++i) {
-		impl_val *ptr = iterate(ret_val, t, i, &tmp);
+	if (var->arg->var->array_size) {
+		/* to_array(foo[NUMBER]) */
+		for (i = 0; i < var->arg->var->array_size; ++i) {
+			impl_val *ptr = iterate(ret_val, t, i, &tmp);
+
+			switch (t) {
+			case PSI_T_FLOAT:
+				ZVAL_DOUBLE(&ele, (double) ptr->fval);
+				break;
+			case PSI_T_DOUBLE:
+				ZVAL_DOUBLE(&ele, ptr->dval);
+				break;
+			default:
+				ZVAL_LONG(&ele, ptr->lval);
+				break;
+			}
 
-		switch (t) {
-		case PSI_T_FLOAT:
-			ZVAL_DOUBLE(&ele, (double) ptr->fval);
-			break;
-		case PSI_T_DOUBLE:
-			ZVAL_DOUBLE(&ele, ptr->dval);
-			break;
-		default:
-			ZVAL_LONG(&ele, ptr->lval);
-			break;
+			add_next_index_zval(return_value, &ele);
 		}
+		return;
+	} else {
+		/* pointer to something */
+		impl_val *ptr;
 
-		add_next_index_zval(return_value, &ele);
+		for (i = 0; (ptr = iterate(ret_val, t, i, &tmp)); ++i) {
+			if (!ptr->ptr) {
+				break;
+			}
+		}
 	}
 }
 
-ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 {
 	impl_arg *iarg;
 
@@ -494,7 +524,7 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 	return SUCCESS;
 }
 
-void *psi_do_calloc(let_calloc *alloc)
+static inline void *psi_do_calloc(let_calloc *alloc)
 {
 	decl_type *type = real_decl_type(alloc->type);
 	size_t size;
@@ -509,7 +539,7 @@ void *psi_do_calloc(let_calloc *alloc)
 	return ecalloc(alloc->n, size);
 }
 
-void *psi_do_let(decl_arg *darg)
+static inline void *psi_do_let(decl_arg *darg)
 {
 	impl_arg *iarg = darg->let->arg;
 	impl_val *arg_val;
@@ -593,39 +623,40 @@ void *psi_do_let(decl_arg *darg)
 	}
 }
 
-void psi_do_set(zval *return_value, set_value *set)
+static inline void psi_do_set(zval *return_value, set_value *set)
 {
-	impl_val *val = (impl_val *) &set->vars->vars[0]->arg->let->ptr;
-	token_t t = real_decl_type(set->vars->vars[0]->arg->type)->type;
-
 	ZVAL_DEREF(return_value);
 	zval_dtor(return_value);
 
-	set->func->handler(return_value, t, val, set, set->vars->vars[0]);
+	set->func->handler(return_value, set, set->vars->vars[0]->arg->let->ptr);
 }
 
-void psi_do_return(zval *return_value, return_stmt *ret, impl_val *ret_val)
+static inline void psi_do_return(zval *return_value, return_stmt *ret, impl_val *ret_val)
 {
-	token_t t = real_decl_type(ret->decl->type)->type;
-
-	ret->set->func->handler(return_value, t, ret_val, ret->set, ret->decl->var);
+	ret->set->func->handler(return_value, ret->set, ret_val);
 }
 
-void psi_do_free(free_stmt *fre)
+static inline void psi_do_free(free_stmt *fre)
 {
-	size_t i;
+	size_t i, j;
+	impl_val dummy;
+
+	for (i = 0; i < fre->calls->count; ++i) {
+		free_call *f = fre->calls->list[i];
 
-	for (i = 0; i < fre->vars->count; ++i) {
-		decl_var *dvar = fre->vars->vars[i];
+		for (j = 0; j < f->vars->count; ++j) {
+			decl_var *dvar = f->vars->vars[j];
+			decl_arg *darg = dvar->arg;
 
-		if (dvar->arg && dvar->arg->let->out.ptr) {
-			free(dvar->arg->let->out.ptr);
-			dvar->arg->let->out.ptr = NULL;
+			f->decl->call.args[j] = &darg->let->out;
 		}
+
+		/* FIXME: check in validate_* that free functions return scalar */
+		PSI_ContextCall(&PSI_G(context), &dummy, f->decl);
 	}
 }
 
-void psi_do_clean(impl *impl)
+static inline void psi_do_clean(impl *impl)
 {
 	size_t i;
 
@@ -660,21 +691,72 @@ void psi_do_clean(impl *impl)
 	}
 }
 
+void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+{
+	impl_val ret_val;
+	size_t i;
+
+	if (SUCCESS != psi_parse_args(execute_data, impl)) {
+		return;
+	}
+
+	if (impl->decl->args) {
+		for (i = 0; i < impl->decl->args->count; ++i) {
+			decl_arg *darg = impl->decl->args->args[i];
+
+			impl->decl->call.args[i] = psi_do_let(darg);
+		}
+	}
+
+	memset(&ret_val, 0, sizeof(ret_val));
+	PSI_ContextCall(&PSI_G(context), &ret_val, impl->decl);
+
+	psi_do_return(return_value, impl->stmts->ret.list[0], &ret_val);
+
+	for (i = 0; i < impl->stmts->set.count; ++i) {
+		set_stmt *set = impl->stmts->set.list[i];
+
+		if (set->arg->_zv) {
+			psi_do_set(set->arg->_zv, set->val);
+		}
+	}
+
+	for (i = 0; i < impl->stmts->fre.count; ++i) {
+		free_stmt *fre = impl->stmts->fre.list[i];
+
+		psi_do_free(fre);
+	}
+
+	psi_do_clean(impl);
+}
+
 PHP_MINIT_FUNCTION(psi)
 {
-	PSI_ContextOps *ops;
+	PSI_ContextOps *ops = NULL;
 
 	REGISTER_INI_ENTRIES();
 
+#ifdef HAVE_LIBJIT
 	if (!strcasecmp(PSI_G(engine), "jit")) {
 		ops = PSI_Libjit();
-	} else {
+	} else
+#endif
+#ifdef HAVE_LIBFFI
 		ops = PSI_Libffi();
+#endif
+
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
 	}
 
 	PSI_ContextInit(&PSI_G(context), ops, psi_error);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
+	if (getenv("PSI_DUMP")) {
+		PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
+	}
+
 	return SUCCESS;
 }
 PHP_MSHUTDOWN_FUNCTION(psi)