X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fengine.c;h=aa4feeb87d1e0e5ef66e0cede6d1fe1c76bf2ab3;hp=a86cd0b62460e598d782912cb59dd6368fcbd99d;hb=98d971f89db2431ef24dac508cf9797ef93646c6;hpb=29137b5f19713219a1b9b5fdf54ad94a34d6fde0

diff --git a/src/engine.c b/src/engine.c
index a86cd0b..aa4feeb 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -7,6 +7,7 @@
 
 #include "zend_exceptions.h"
 
+#include "parser.h"
 #include "engine.h"
 #include "calc.h"
 #include "marshal.h"
@@ -194,7 +195,16 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 		} else if (PSI_T_MIXED == iarg->type->type) {
 			Z_PARAM_PROLOGUE(0);
 		} else if (PSI_T_CALLABLE == iarg->type->type) {
-			Z_PARAM_FUNC_EX(iarg->val.zend.cb.fci, iarg->val.zend.cb.fcc, 1, 0);
+			zend_fcall_info fci;
+			zend_fcall_info_cache fcc;
+
+			Z_PARAM_FUNC_EX(fci, fcc, 1, 0);
+
+			if (fci.size) {
+				iarg->val.zend.cb = ecalloc(1, sizeof(zend_fcall));
+				iarg->val.zend.cb->fci = fci;
+				iarg->val.zend.cb->fcc = fcc;
+			}
 		} else {
 			error_code = ZPP_ERROR_FAILURE;
 			break;
@@ -250,144 +260,54 @@ static inline void *psi_do_calloc(let_calloc *alloc)
 
 static inline impl_val *psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
 {
-	switch (let_func) {
-	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_FLOATVAL:
-		if (iarg->type->type == PSI_T_FLOAT || iarg->type->type == PSI_T_DOUBLE) {
-			arg_val->dval = iarg->val.dval;
-		} else {
-			arg_val->dval = zval_get_double(iarg->_zv);
-		}
-		break;
-	case PSI_T_PATHVAL:
-	case PSI_T_STRVAL:
-		if (iarg->type->type == PSI_T_STRING) {
-			if (iarg->val.zend.str) {
-				arg_val->ptr = estrndup(iarg->val.zend.str->val, iarg->val.zend.str->len);
-				*to_free = arg_val->ptr;
-			} else {
-				arg_val->ptr = "";
-			}
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->ptr = estrdup(zs->val);
-			*to_free = arg_val->ptr;
-			zend_string_release(zs);
-		}
-		if (PSI_T_PATHVAL == let_func) {
-			if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
-				efree(arg_val->ptr);
-				return NULL;
-			}
-		}
-		break;
-	case PSI_T_STRLEN:
-		if (iarg->type->type == PSI_T_STRING) {
-			if (iarg->val.zend.str) {
-				arg_val->lval = iarg->val.zend.str->len;
-			} else {
-				arg_val->lval = 0;
-			}
-		} 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) {
-			arg_val = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
-			*to_free = arg_val;
-		}
-		break;
-	case PSI_T_OBJVAL:
-		if (iarg->type->type == PSI_T_OBJECT) {
-			psi_object *obj;
-
-			if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_object_get_class_entry())) {
-				return NULL;
-			}
-
-			obj = PSI_OBJ(iarg->_zv, NULL);
-			arg_val->ptr = obj->data;
-		}
-		break;
-	case PSI_T_CBVAL:
-		if (iarg->type->type == PSI_T_CALLABLE) {
-			
-		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	abort();
 	return arg_val;
 }
 
+static inline impl_val *psi_let_func(let_func *func, decl_arg *darg) {
+	return darg->ptr = func->handler(darg->ptr, darg->type, func->var->arg, &darg->mem);
+}
+
 static inline void *psi_do_let(let_stmt *let)
 {
 	decl_arg *darg = let->var->arg;
-	impl_val *arg_val = darg->ptr;
-	impl_arg *iarg;
 
 	switch (let->val ? let->val->kind : PSI_LET_NULL) {
 	case PSI_LET_TMP:
-		memcpy(arg_val, deref_impl_val(let->val->data.var->arg->let->ptr, let->val->data.var), sizeof(*arg_val));
-#if 0
-		fprintf(stderr, "LET TMP: %p -> %p\n",
-				let->val->data.var->arg->let->ptr,
-				arg_val->ptr);
-#endif
+		memcpy(darg->ptr, deref_impl_val(let->val->data.var->arg->let, let->val->data.var), sizeof(impl_val));
 		break;
 	case PSI_LET_NULL:
 		if (darg->var->array_size) {
-			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
-			darg->mem = arg_val->ptr;
+			darg->val.ptr = ecalloc(darg->var->array_size, sizeof(impl_val));
+			darg->mem = darg->val.ptr;
 		} else {
-			memset(arg_val, 0, sizeof(*arg_val));
+			memset(&darg->val, 0, sizeof(impl_val));
 		}
 		break;
 	case PSI_LET_CALLOC:
-		arg_val->ptr = psi_do_calloc(let->val->data.alloc);
-		darg->mem = arg_val->ptr;
+		darg->val.ptr = psi_do_calloc(let->val->data.alloc);
+		darg->mem = darg->val.ptr;
+		break;
+	case PSI_LET_CALLBACK:
+		darg->val.ptr = let->val->data.callback->decl->call.sym;
 		break;
 	case PSI_LET_NUMEXP:
-		arg_val->zend.lval = psi_long_num_exp(let->val->data.num, NULL);
+		darg->val.zend.lval = psi_long_num_exp(let->val->data.num, NULL);
 		break;
 	case PSI_LET_FUNC:
-		iarg = let->val->data.func->arg;
-
-		if (!(darg->ptr = psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem))) {
+		if (!psi_let_func(let->val->data.func, darg)) {
 			return NULL;
 		}
+		break;
 	}
 
 	if (let->val && let->val->flags.one.is_reference) {
-		return let->ptr = &darg->ptr;
+		return darg->let = &darg->ptr;
 	} else {
-		return let->ptr = darg->ptr;
+		return darg->let = darg->ptr;
 	}
 }
 
-static inline void psi_do_set(zval *return_value, set_value *set)
-{
-	decl_arg *set_arg = set->vars->vars[0]->arg;
-
-	zval_dtor(return_value);
-	set->func->handler(return_value, set, set_arg->let ? set_arg->let->ptr : set_arg->ptr);
-}
-
 static inline void psi_do_return(zval *return_value, return_stmt *ret)
 {
 	ret->set->func->handler(return_value, ret->set, ret->set->vars->vars[0]->arg->ptr);
@@ -403,7 +323,7 @@ static inline void psi_do_free(free_stmt *fre)
 		for (j = 0; j < f->vars->count; ++j) {
 			decl_var *dvar = f->vars->vars[j];
 			decl_arg *darg = dvar->arg;
-			impl_val *fval = darg->let ? darg->let->ptr : darg->ptr;
+			impl_val *fval = darg->let;
 
 			f->decl->call.args[j] = deref_impl_val(fval, dvar);
 		}
@@ -413,10 +333,9 @@ static inline void psi_do_free(free_stmt *fre)
 	}
 }
 
-static inline void psi_clean_array_struct(decl_arg *darg) {
-	if (darg->let
-	&&	darg->let->val->kind == PSI_LET_FUNC
-	&&	darg->let->val->data.func->type == PSI_T_ARRVAL) {
+static inline void psi_clean_array_struct(let_stmt *let, decl_arg *darg) {
+	if (let->val->kind == PSI_LET_FUNC
+	&&	let->val->data.func->type == PSI_T_ARRVAL) {
 		decl_type *type = real_decl_type(darg->type);
 
 		if (type->type == PSI_T_STRUCT) {
@@ -437,6 +356,7 @@ static inline void psi_do_clean(impl *impl)
 		efree(impl->decl->func->ptr);
 		impl->decl->func->ptr = &impl->decl->func->val;
 	}
+
 	for (i = 0; i < impl->func->args->count; ++i ) {
 		impl_arg *iarg = impl->func->args->args[i];
 
@@ -446,18 +366,28 @@ static inline void psi_do_clean(impl *impl)
 				zend_string_release(iarg->val.zend.str);
 			}
 			break;
+		case PSI_T_CALLABLE:
+			if (iarg->val.zend.cb) {
+				if (iarg->val.zend.cb->fci.size) {
+					zend_fcall_info_args_clear(&iarg->val.zend.cb->fci, 1);
+				}
+				efree(iarg->val.zend.cb);
+			}
+			break;
 		}
 	}
 
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		decl_arg *darg = impl->decl->args->args[i];
+	for (i = 0; i < impl->stmts->let.count; ++i) {
+		let_stmt *let = impl->stmts->let.list[i];
+		decl_arg *darg = let->var->arg;
 
 		if (darg->mem) {
-			psi_clean_array_struct(darg);
+			psi_clean_array_struct(let, darg);
 			efree(darg->mem);
 			darg->mem = NULL;
 		}
 		darg->ptr = &darg->val;
+		darg->let = darg->ptr;
 	}
 
 	if (impl->func->args->vararg.args) {
@@ -489,7 +419,7 @@ static inline void psi_do_args(impl *impl) {
 	size_t i;
 
 	for (i = 0; i < impl->decl->args->count; ++i) {
-		impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+		impl->decl->call.args[i] = impl->decl->args->args[i]->let;
 	}
 
 	if (!impl->decl->func->var->pointer_level) {
@@ -519,7 +449,8 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
 	for (i = 0, j = 0; i < vacount; ++i) {
 		impl_arg *vaarg = va->args->args[i];
 		void *to_free = NULL;
-		token_t let_fn, vatype = va->name->type->type;
+		token_t vatype = va->name->type->type;
+		let_func_handler let_fn;
 
 		if (vatype == PSI_T_MIXED) {
 			switch (Z_TYPE_P(vaarg->_zv)) {
@@ -533,17 +464,19 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
 
 
 		switch (vatype) {
-		case PSI_T_BOOL:	let_fn = PSI_T_BOOLVAL;	break;
-		case PSI_T_INT:		let_fn = PSI_T_INTVAL;	break;
+		case PSI_T_BOOL:	let_fn = psi_let_boolval;	break;
+		case PSI_T_INT:		let_fn = psi_let_intval;	break;
 		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:	let_fn = PSI_T_FLOATVAL;break;
-		case PSI_T_STRING:	let_fn = PSI_T_STRVAL;	break;
+		case PSI_T_DOUBLE:	let_fn = psi_let_floatval;	break;
+		case PSI_T_STRING:	let_fn = psi_let_strval;	break;
 		EMPTY_SWITCH_DEFAULT_CASE();
 		}
 
 		va->types[i] = vatype;
+
 		/* FIXME: varargs with struct-by-value :) */
-		if (!psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free)) {
+		//if (!psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free)) {
+		if (!let_fn(&va->values[i], NULL, vaarg, &to_free)) {
 			return NULL;
 		}
 
@@ -558,7 +491,7 @@ static inline impl_vararg *psi_do_varargs(impl *impl) {
 	return va;
 }
 
-void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+ZEND_RESULT_CODE psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 {
 	size_t i;
 	impl_vararg *va = NULL;
@@ -566,7 +499,7 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 	memset(impl->decl->func->ptr, 0, sizeof(impl_val));
 
 	if (SUCCESS != psi_parse_args(execute_data, impl)) {
-		return;
+		return FAILURE;
 	}
 
 	for (i = 0; i < impl->stmts->let.count; ++i) {
@@ -575,7 +508,7 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 		if (!psi_do_let(let)) {
 			psi_do_return(return_value, impl->stmts->ret.list[0]);
 			psi_do_clean(impl);
-			return;
+			return FAILURE;
 		}
 	}
 
@@ -604,4 +537,54 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 		psi_do_free(fre);
 	}
 	psi_do_clean(impl);
+
+	return SUCCESS;
+}
+
+ZEND_RESULT_CODE psi_callback(let_callback *cb, void *retval, unsigned argc, void **argv)
+{
+	size_t i;
+	decl *decl_cb = cb->decl;
+	impl_arg *iarg = cb->func->var->arg;
+	zval return_value, *zargv = calloc(argc, sizeof(*zargv));
+	void *result, *to_free = NULL;
+
+	ZEND_ASSERT(argc == cb->decl->args->count);
+
+	/* prepare args for the userland call */
+	for (i = 0; i < argc; ++i) {
+		cb->decl->args->args[i]->let = argv[i];
+	}
+	for (i = 0; i < cb->args->count; ++i) {
+		psi_do_set(&zargv[i], cb->args->vals[i]);
+	}
+	zend_fcall_info_argp(&iarg->val.zend.cb->fci, cb->args->count, zargv);
+
+	/* callback into userland */
+	ZVAL_UNDEF(&return_value);
+	iarg->_zv = &return_value;
+	zend_fcall_info_call(&iarg->val.zend.cb->fci, &iarg->val.zend.cb->fcc, iarg->_zv, NULL);
+
+	/* marshal return value of the userland call */
+	switch (iarg->type->type) {
+	case PSI_T_BOOL:	zend_parse_arg_bool(iarg->_zv, &iarg->val.zend.bval, NULL, 0);		break;
+	case PSI_T_LONG:	zend_parse_arg_long(iarg->_zv, &iarg->val.zend.lval, NULL, 0, 1);	break;
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:	zend_parse_arg_double(iarg->_zv, &iarg->val.dval, NULL, 0);			break;
+	case PSI_T_STRING:	zend_parse_arg_str(iarg->_zv, &iarg->val.zend.str, 0);				break;
+	}
+	result = cb->func->handler(retval, decl_cb->func->type, iarg, &to_free);
+
+	if (result != retval) {
+		*(void **)retval = result;
+	}
+
+	zend_fcall_info_args_clear(&iarg->val.zend.cb->fci, 0);
+	for (i = 0; i < cb->args->count; ++i) {
+		zval_ptr_dtor(&zargv[i]);
+	}
+	free(zargv);
+
+	return SUCCESS;
+
 }