X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=469fb4d6f72498ea7f5ecf9c70e0c87b66e5941f;hp=ac08a9541a21aef83d2efa92fc8eceaafb481aa7;hb=ea0162a1698563a49de50456cd3f2cc18b83a05e;hpb=bcd9e150292290ce2951fdca61fad526c478e787

diff --git a/src/module.c b/src/module.c
index ac08a95..469fb4d 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, ...)
@@ -32,13 +40,62 @@ void psi_error(int type, const char *msg, ...)
 	php_error(type, buf);
 }
 
+size_t psi_t_alignment(token_t t)
+{
+#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
+	switch (t) {
+	PSI_ALIGNOF(INT8);
+	PSI_ALIGNOF(UINT8);
+	PSI_ALIGNOF(INT16);
+	PSI_ALIGNOF(UINT16);
+	PSI_ALIGNOF(INT32);
+	PSI_ALIGNOF(UINT32);
+	PSI_ALIGNOF(INT64);
+	PSI_ALIGNOF(UINT64);
+	case PSI_T_FLOAT:
+		return ALIGNOF_FLOAT;
+	case PSI_T_DOUBLE:
+		return ALIGNOF_DOUBLE;
+	case PSI_T_POINTER:
+		return ALIGNOF_VOID_P;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+}
+
+size_t psi_t_size(token_t t)
+{
+#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
+	switch (t) {
+	PSI_SIZEOF(INT8);
+	PSI_SIZEOF(UINT8);
+	PSI_SIZEOF(INT16);
+	PSI_SIZEOF(UINT16);
+	PSI_SIZEOF(INT32);
+	PSI_SIZEOF(UINT32);
+	PSI_SIZEOF(INT64);
+	PSI_SIZEOF(UINT64);
+	case PSI_T_FLOAT:
+		return SIZEOF_FLOAT;
+	case PSI_T_DOUBLE:
+		return SIZEOF_DOUBLE;
+	case PSI_T_POINTER:
+		return SIZEOF_VOID_P;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+}
+
+size_t psi_t_align(token_t t, size_t s)
+{
+	size_t a = psi_t_alignment(t);
+	return ((s - 1) | (a - 1)) + 1;
+}
+
 int psi_internal_type(impl_type *type)
 {
 	switch (type->type) {
 	case PSI_T_BOOL:
 		return _IS_BOOL;
 	case PSI_T_INT:
-	case PSI_T_LONG:
 		return IS_LONG;
 	case PSI_T_FLOAT:
 	case PSI_T_DOUBLE:
@@ -94,190 +151,149 @@ size_t psi_num_min_args(impl *impl)
 	return n;
 }
 
-void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
 {
-	switch (real_decl_type(func->type)->type) {
-	case PSI_T_FLOAT:
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
-		convert_to_long(return_value);
-		break;
-	default:
-		RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
-	}
+	psi_to_int(return_value, set, ret_val);
+	convert_to_boolean(return_value);
 }
 
-void psi_to_double(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
 {
-	RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
-}
+	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);
 
-void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
-{
-	switch (real_decl_type(func->type)->type) {
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
-	case PSI_T_UINT8:
-		if (!func->var->pointer_level) {
-			char chr = ret_val->lval;
-			RETVAL_STRINGL(&chr, 1);
-		} else {
-			ret_val = deref_impl_val(1, ret_val, func);
-			if (ret_val->ptr) {
-				RETVAL_STRING(ret_val->ptr);
-			} else {
-				RETVAL_EMPTY_STRING();
-			}
-		}
-		break;
+	switch (t) {
 	case PSI_T_FLOAT:
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
-		convert_to_string(return_value);
-		break;
-	default:
-		RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
-		convert_to_string(return_value);
+		RETVAL_DOUBLE((double) v->fval);
+		convert_to_long(return_value);
 		break;
-	}
-}
-
-size_t psi_t_alignment(token_t t)
-{
-	size_t align;
-#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
-	char c; \
-	T x; \
-}
-#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
-	char c; \
-	T *x; \
-}
-#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
-#define PSI_TAS_CASE(T) { \
-	PSI_TAS_D(T); \
-	PSI_TAS_C(T); \
-}
-	switch (t) {
-	case PSI_T_CHAR:
-		PSI_TAS_CASE(char);
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(v->dval);
+		convert_to_long(return_value);
 		break;
-	case PSI_T_SINT8:
-		PSI_TAS_CASE(int8_t);
+	case PSI_T_INT8:
+		RETVAL_LONG(v->i8);
 		break;
 	case PSI_T_UINT8:
-		PSI_TAS_CASE(uint8_t);
-		break;
-	case PSI_T_SHORT:
-		PSI_TAS_CASE(short);
+		RETVAL_LONG(v->u8);
 		break;
-	case PSI_T_SINT16:
-		PSI_TAS_CASE(int16_t);
+	case PSI_T_INT16:
+		RETVAL_LONG(v->i16);
 		break;
 	case PSI_T_UINT16:
-		PSI_TAS_CASE(uint16_t);
-		break;
-	case PSI_T_INT:
-		PSI_TAS_CASE(int);
+		RETVAL_LONG(v->u16);
 		break;
-	case PSI_T_SINT32:
-		PSI_TAS_CASE(int32_t);
+	case PSI_T_INT32:
+		RETVAL_LONG(v->i32);
 		break;
 	case PSI_T_UINT32:
-		PSI_TAS_CASE(uint32_t);
-		break;
-	case PSI_T_LONG:
-		PSI_TAS_CASE(long);
+#if UINT32_MAX >= ZEND_LONG_MAX
+		if (v->u32 > ZEND_LONG_MAX) {
+			char d[12] = {0};
+
+			RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
+		} else {
+#endif
+			RETVAL_LONG(v->u32);
+#if UINT32_MAX >= ZEND_LONG_MAX
+		}
+#endif
 		break;
-	case PSI_T_SINT64:
-		PSI_TAS_CASE(int64_t);
+	case PSI_T_INT64:
+		RETVAL_LONG(v->i64);
 		break;
 	case PSI_T_UINT64:
-		PSI_TAS_CASE(uint64_t);
-		break;
-	case PSI_T_FLOAT:
-		PSI_TAS_CASE(float);
-		break;
-	case PSI_T_DOUBLE:
-		PSI_TAS_CASE(double);
-		break;
-	case PSI_T_SIZE_T:
-		PSI_TAS_CASE(size_t);
-		break;
-	case PSI_T_POINTER:
-		{
-			PSI_TAS_P(char);
-			PSI_TAS_C(char_pointer);
+		if (v->u64 > ZEND_LONG_MAX) {
+			char d[24] = {0};
+
+			RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
+		} else {
+			RETVAL_LONG(v->u64);
 		}
 		break;
 	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-
-	return align;
 }
 
-size_t psi_t_size(token_t t)
+void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
 {
-	size_t size;
+	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) {
-	case PSI_T_CHAR:
-		size = sizeof(char);
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) v->fval);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(v->dval);
+		break;
+	case PSI_T_INT8:
+		RETVAL_DOUBLE((double) v->i8);
 		break;
-	case PSI_T_SINT8:
 	case PSI_T_UINT8:
-		size = 1;
+		RETVAL_DOUBLE((double) v->u8);
 		break;
-	case PSI_T_SHORT:
-		size = sizeof(short);
+	case PSI_T_INT16:
+		RETVAL_DOUBLE((double) v->i16);
 		break;
-	case PSI_T_SINT16:
 	case PSI_T_UINT16:
-		size = 2;
+		RETVAL_DOUBLE((double) v->u16);
 		break;
-	case PSI_T_INT:
-		size = sizeof(int);
+	case PSI_T_INT32:
+		RETVAL_DOUBLE((double) v->i32);
 		break;
-	case PSI_T_SINT32:
 	case PSI_T_UINT32:
-		size = 4;
+		RETVAL_DOUBLE((double) v->u32);
 		break;
-	case PSI_T_LONG:
-		size = sizeof(long);
+	case PSI_T_INT64:
+		RETVAL_DOUBLE((double) v->i64);
 		break;
-	case PSI_T_SINT64:
 	case PSI_T_UINT64:
-		size = 8;
+		RETVAL_DOUBLE((double) v->u64);
 		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+}
+
+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:
+		if (!var->arg->var->pointer_level) {
+			RETVAL_STRINGL(&ret_val->cval, 1);
+		} else {
+			ret_val = deref_impl_val(ret_val, var);
+			if (ret_val && ret_val->ptr) {
+				RETVAL_STRING(ret_val->ptr);
+			} else {
+				RETVAL_EMPTY_STRING();
+			}
+		}
+		return;
 	case PSI_T_FLOAT:
-		size = sizeof(float);
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
 		break;
 	case PSI_T_DOUBLE:
-		size = sizeof(double);
-		break;
-	case PSI_T_SIZE_T:
-		size = sizeof(size_t);
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
 		break;
-	case PSI_T_POINTER:
-		size = sizeof(char *);
+	default:
+		psi_to_int(return_value, set, ret_val);
 		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-	return size;
+	convert_to_string(return_value);
 }
 
-size_t psi_t_align(token_t t, size_t s)
-{
-	size_t a = psi_t_alignment(t);
-	return ((s - 1) | (a - 1)) + 1;
-}
 
-static impl_val *iterate(impl_val *val, token_t t, unsigned i, impl_val *tmp)
+static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
 {
-	size_t size = psi_t_size(t);
-
 	memset(tmp, 0, sizeof(*tmp));
-	memcpy(tmp, val->ptr + size * i, size);
+	memcpy(tmp, ((void*) val->ptr) + size * i, size);
 	return tmp;
 }
 
@@ -292,8 +308,7 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 	case PSI_T_DOUBLE:
 		mem->dval = zval_get_double(zv);
 		break;
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
 		if (spec->var->pointer_level) {
 			zend_string *zs = zval_get_string(zv);
@@ -301,21 +316,20 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 			zend_string_release(zs);
 			break;
 		}
+		/* no break */
 	default:
-		mem->lval = zval_get_long(zv);
+		mem->zend.lval = zval_get_long(zv);
 		break;
 	}
 }
 
 void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 {
-	size_t i, j = 0, size = decl_struct_size(s);
-	char *mem = ecalloc(1, size + s->args->count * sizeof(void *));
+	size_t i, j = 0;
+	char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
 
-	for (i = 0; i < s->args->count; ++i) {
-		decl_struct_layout *layout = &s->layout[i];
+	if (arr) for (i = 0; i < s->args->count; ++i) {
 		decl_arg *darg = s->args->args[i];
-		decl_type *type = real_decl_type(darg->type);
 		zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
 
 		if (entry) {
@@ -324,72 +338,122 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 
 			memset(&tmp, 0, sizeof(tmp));
 			psi_from_zval(&val, darg, entry, &tmp);
-			memcpy(mem + layout->pos, &val, layout->len);
+			memcpy(mem + darg->layout->pos, &val, darg->layout->len);
 			if (tmp) {
-				((void **)(mem + size))[j++] = tmp;
+				((void **)(mem + s->size))[j++] = tmp;
 			}
 		}
 	}
 	return mem;
 }
 
-void psi_to_array(impl_val *ret_val, decl_arg *func, zval *return_value)
+static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
+	void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
+	impl_val *val = enref_impl_val(ptr, set_arg->var);
+
+	if (val != ptr) {
+		*to_free = val;
+	}
+
+	return val;
+}
+void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 {
-	zval ele;
-	unsigned i;
-	impl_val tmp;
-	decl_type *type = real_decl_type(func->type);
-	token_t t = type->type;
+	size_t i;
+	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 = type->strct;
-		ret_val = deref_impl_val(func->var->pointer_level, ret_val, func);
+		// decl_struct *s = real_decl_type(var->arg->type)->strct;
 
-		ZEND_ASSERT(s);
-		for (i = 0; i < s->args->count; ++i) {
-			decl_arg *darg = s->args->args[i];
-			decl_struct_layout layout = s->layout[i];
-			impl_val tmp;
-			zval ztmp;
-			char *ptr = (char *) ret_val->ptr + layout.pos;
+		if (set->count) {
+			/* explicit member casts */
+			for (i = 0; i < set->count; ++i) {
+				set_value *sub_set = set->inner[i];
+				decl_var *sub_var = sub_set->vars->vars[0];
 
-			memset(&tmp, 0, sizeof(tmp));
-			memcpy(&tmp, ptr, layout.len);
-			switch (real_decl_type(darg->type)->type) {
-			case PSI_T_INT:
-			case PSI_T_LONG:
-				psi_to_int(&tmp, darg, &ztmp);
+				sub_set->outer.val = r_val;
+
+				if (sub_var->arg) {
+					impl_val *tmp = NULL, *val;
+					zval ztmp;
+
+					val = deref_impl_val(struct_member_ref(sub_var->arg, ret_val, &tmp), sub_var);
+					sub_set->func->handler(&ztmp, sub_set, val);
+					add_assoc_zval(return_value, sub_var->name, &ztmp);
+
+					if (tmp) {
+						free(tmp);
+					}
+				}
+			}
+		}
+		return;
+	}
+
+	if (var->arg->var->array_size) {
+		/* to_array(foo[NUMBER]) */
+		for (i = 0; i < var->arg->var->array_size; ++i) {
+			size_t size = psi_t_size(var->arg->var->pointer_level > 1 ? PSI_T_POINTER : t);
+			impl_val *ptr = iterate(ret_val, size, i, &tmp);
+			zval ele;
+
+			switch (t) {
+			case PSI_T_FLOAT:
+				ZVAL_DOUBLE(&ele, (double) ptr->fval);
 				break;
-			case PSI_T_CHAR:
-				psi_to_string(&tmp, darg, &ztmp);
+			case PSI_T_DOUBLE:
+				ZVAL_DOUBLE(&ele, ptr->dval);
+				break;
+			default:
+				ZVAL_LONG(&ele, ptr->lval);
 				break;
-			EMPTY_SWITCH_DEFAULT_CASE();
 			}
-			add_assoc_zval(return_value, darg->var->name, &ztmp);
+
+			add_next_index_zval(return_value, &ele);
 		}
 		return;
-	}
-	ret_val = deref_impl_val(0, ret_val, func);
-	for (i = 0; i < func->var->array_size; ++i) {
-		impl_val *ptr = iterate(ret_val, t, i, &tmp);
-
-		switch (t) {
-		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:
-			ZVAL_DOUBLE(&ele, ptr->dval);
-			break;
-		default:
-			ZVAL_LONG(&ele, ptr->lval);
-			break;
+	} else if (set->vars->count > 1) {
+		/* to_array(arr_var, cnt_var[, cnt_var...], to_int(*arr_var))
+		 * check for length in second var
+		 */
+		size_t count = 0;
+		zval ele;
+
+		if (set->outer.set) {
+			/* struct */
+			for (i = 1; i < set->vars->count; ++i) {
+				impl_val *tmp = NULL, *cnt_val;
+				decl_var *cnt_var = set->vars->vars[i];
+
+				cnt_val = struct_member_ref(cnt_var->arg, set->outer.val, &tmp);
+				count += deref_impl_val(cnt_val, cnt_var)->lval;
+
+				if (tmp) {
+					free(tmp);
+				}
+			}
+		} else {
+			ZEND_ASSERT(0);
 		}
 
-		add_next_index_zval(return_value, &ele);
+		for (i = 0; i < count; ++i) {
+			size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+			impl_val *ptr = iterate(ret_val, size, i, &tmp);
+
+			set->inner[0]->func->handler(&ele, set->inner[0], ptr);
+			add_next_index_zval(return_value, &ele);
+		}
+	} else {
+		ZEND_ASSERT(0);
 	}
+
 }
 
-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;
 
@@ -405,15 +469,15 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 		}
 		if (PSI_T_BOOL == iarg->type->type) {
 			if (iarg->def) {
-				iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
 			}
-			Z_PARAM_BOOL(iarg->val.bval);
+			Z_PARAM_BOOL(iarg->val.zend.bval);
 		} else if (PSI_T_INT == iarg->type->type) {
 			if (iarg->def) {
-				iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
 			}
-			Z_PARAM_LONG(iarg->val.lval);
-		} else if (PSI_T_FLOAT == iarg->type->type) {
+			Z_PARAM_LONG(iarg->val.zend.lval);
+		} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
 			if (iarg->def) {
 				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
 			}
@@ -425,11 +489,11 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 				str.len = strlen(iarg->def->text) - 2;
 				str.val = &iarg->def->text[1];
 			}
-			Z_PARAM_STR_EX(iarg->val.str, 1, 0);
-			if (iarg->val.str) {
-				zend_string_addref(iarg->val.str);
+			Z_PARAM_STR_EX(iarg->val.zend.str, 1, 0);
+			if (iarg->val.zend.str) {
+				zend_string_addref(iarg->val.zend.str);
 			} else if (iarg->def) {
-				iarg->val.str = zend_string_init(str.val, str.len, 0);
+				iarg->val.zend.str = zend_string_init(str.val, str.len, 0);
 			}
 		} else if (PSI_T_ARRAY == iarg->type->type) {
 			/* handled as _zv in let or set */
@@ -447,132 +511,139 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 	return SUCCESS;
 }
 
-impl_val *psi_do_let(decl_arg *darg)
+static inline void *psi_do_calloc(let_calloc *alloc)
+{
+	decl_type *type = real_decl_type(alloc->type);
+	size_t size;
+
+	if (type->type == PSI_T_STRUCT) {
+		/* psi_do_clean expects at least one NULL pointer after the struct */
+		size = type->strct->size + sizeof(void *);
+	} else {
+		size = psi_t_size(type->type);
+	}
+
+	return ecalloc(alloc->n, size);
+}
+
+static inline void *psi_do_let(decl_arg *darg)
 {
-	impl_val *arg_val = &darg->let->out;
 	impl_arg *iarg = darg->let->arg;
+	impl_val *arg_val;
+
+	darg->let->ptr = &darg->let->out;
+	arg_val = darg->let->ptr;
 
 	if (!iarg) {
-		/*
+		/* let foo = calloc(1, long);
 		 * let foo = NULL;
 		 * let foo;
 		 */
-		if (darg->var->array_size) {
+		if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
+			arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
+			darg->let->mem = arg_val->ptr;
+		} else if (darg->var->array_size) {
 			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
 			darg->let->mem = arg_val->ptr;
 		} else {
 			memset(arg_val, 0, sizeof(*arg_val));
 		}
-		return arg_val;
-	}
-	switch (darg->let->val->func->type) {
-	case PSI_T_BOOLVAL:
-		if (iarg->type->type == PSI_T_BOOL) {
-			arg_val->cval = iarg->val.cval;
-		} else {
-			arg_val->cval = zend_is_true(iarg->_zv);
-		}
-		break;
-	case PSI_T_INTVAL:
-		if (iarg->type->type == PSI_T_INT) {
-			arg_val->lval = iarg->val.lval;
-		} else {
-			arg_val->lval = zval_get_long(iarg->_zv);
-		}
-		break;
-	case PSI_T_STRVAL:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->ptr = estrdup(iarg->val.str->val);
-			darg->let->mem = arg_val->ptr;
-			zend_string_release(iarg->val.str);
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->ptr = estrdup(zs->val);
-			darg->let->mem = arg_val->ptr;
-			zend_string_release(zs);
-		}
-		break;
-	case PSI_T_STRLEN:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->lval = iarg->val.str->len;
-			zend_string_release(iarg->val.str);
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->lval = zs->len;
-			zend_string_release(zs);
-		}
-		break;
-	case PSI_T_CALLOC:
-		arg_val->ptr = calloc(1, darg->let->val->func->size);
-		darg->let->mem = arg_val->ptr;
-		break;
-	case PSI_T_ARRVAL:
-		if (iarg->type->type == PSI_T_ARRAY) {
-			decl_type *type = real_decl_type(darg->type);
+	} else {
 
-			switch (type->type) {
-			case PSI_T_STRUCT:
-				arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
+		switch (darg->let->val->func->type) {
+		case PSI_T_BOOLVAL:
+			if (iarg->type->type == PSI_T_BOOL) {
+				arg_val->cval = iarg->val.zend.bval;
+			} else {
+				arg_val->cval = zend_is_true(iarg->_zv);
+			}
+			break;
+		case PSI_T_INTVAL:
+			if (iarg->type->type == PSI_T_INT) {
+				arg_val->lval = iarg->val.zend.lval;
+			} else {
+				arg_val->lval = zval_get_long(iarg->_zv);
+			}
+			break;
+		case PSI_T_STRVAL:
+			if (iarg->type->type == PSI_T_STRING) {
+				arg_val->ptr = estrdup(iarg->val.zend.str->val);
 				darg->let->mem = arg_val->ptr;
-				break;
+				zend_string_release(iarg->val.zend.str);
+			} else {
+				zend_string *zs = zval_get_string(iarg->_zv);
+				arg_val->ptr = estrdup(zs->val);
+				darg->let->mem = arg_val->ptr;
+				zend_string_release(zs);
 			}
+			break;
+		case PSI_T_STRLEN:
+			if (iarg->type->type == PSI_T_STRING) {
+				arg_val->lval = iarg->val.zend.str->len;
+				zend_string_release(iarg->val.zend.str);
+			} else {
+				zend_string *zs = zval_get_string(iarg->_zv);
+				arg_val->lval = zs->len;
+				zend_string_release(zs);
+			}
+			break;
+		case PSI_T_ARRVAL:
+			if (iarg->type->type == PSI_T_ARRAY) {
+				decl_type *type = real_decl_type(darg->type);
+
+				switch (type->type) {
+				case PSI_T_STRUCT:
+					arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
+					darg->let->mem = arg_val->ptr;
+					break;
+				}
+			}
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
 		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 
-	return arg_val;
+	if (darg->let->val && darg->let->val->is_reference) {
+		return &darg->let->ptr;
+	} else {
+		return darg->let->ptr;
+	}
 }
 
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
+static inline void psi_do_set(zval *return_value, set_value *set)
 {
-	impl_val *val = (impl_val *) &vars->vars[0]->arg->let->ptr;
-
 	ZVAL_DEREF(return_value);
 	zval_dtor(return_value);
 
-	switch (func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(val, vars->vars[0]->arg, return_value);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(val, vars->vars[0]->arg, return_value);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	set->func->handler(return_value, set, set->vars->vars[0]->arg->let->ptr);
 }
 
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
+static inline void psi_do_return(zval *return_value, return_stmt *ret, impl_val *ret_val)
 {
-	switch (impl->stmts->ret.list[0]->func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(ret_val, impl->decl->func, return_value);
-		break;
-	case PSI_T_TO_INT:
-		psi_to_int(ret_val, impl->decl->func, return_value);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(ret_val, impl->decl->func, return_value);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	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->vars->count; ++i) {
-		decl_var *dvar = fre->vars->vars[i];
+	for (i = 0; i < fre->calls->count; ++i) {
+		free_call *f = fre->calls->list[i];
 
-		if (dvar->arg && dvar->arg->let->out.ptr) {
-			free(dvar->arg->let->out.ptr);
-			dvar->arg->let->out.ptr = NULL;
+		for (j = 0; j < f->vars->count; ++j) {
+			decl_var *dvar = f->vars->vars[j];
+			decl_arg *darg = dvar->arg;
+
+			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;
 
@@ -581,22 +652,21 @@ void psi_do_clean(impl *impl)
 
 		switch (iarg->type->type) {
 		case PSI_T_STRING:
-			if (iarg->val.str) {
-				zend_string_release(iarg->val.str);
+			if (iarg->val.zend.str) {
+				zend_string_release(iarg->val.zend.str);
 			}
 			break;
 		}
 	}
 
-	for (i = 0; i < impl->decl->args->count; ++i) {
+	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
 		decl_arg *darg = impl->decl->args->args[i];
 
 		if (darg->let && darg->let->mem) {
 			decl_type *type = real_decl_type(darg->type);
 
 			if (type->type == PSI_T_STRUCT) {
-				size_t eos = decl_struct_size(type->strct);
-				void **ptr = (void **) ((char *) darg->let->mem + eos);
+				void **ptr = (void **) ((char *) darg->let->mem + type->strct->size);
 
 				while (*ptr) {
 					efree(*ptr++);
@@ -608,21 +678,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 (psi_check_env("PSI_DUMP")) {
+		PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
+	}
+
 	return SUCCESS;
 }
 PHP_MSHUTDOWN_FUNCTION(psi)