X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=20b25ead45afe0d7b248dbc82c3aea537b1cee3f;hp=3b4a643e2710986b92039992a167990dee058421;hb=7a717dad32d06fe5273ad3a9ce755908723f6685;hpb=207ff7bc85e967235f0ad1ffbf47c0f85f375063

diff --git a/src/module.c b/src/module.c
index 3b4a643..20b25ea 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,6 +40,109 @@ void psi_error(int type, const char *msg, ...)
 	php_error(type, buf);
 }
 
+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_INT8:
+		PSI_TAS_CASE(int8_t);
+		break;
+	case PSI_T_UINT8:
+		PSI_TAS_CASE(uint8_t);
+		break;
+	case PSI_T_INT16:
+		PSI_TAS_CASE(int16_t);
+		break;
+	case PSI_T_UINT16:
+		PSI_TAS_CASE(uint16_t);
+		break;
+	case PSI_T_INT32:
+		PSI_TAS_CASE(int32_t);
+		break;
+	case PSI_T_UINT32:
+		PSI_TAS_CASE(uint32_t);
+		break;
+	case PSI_T_INT64:
+		PSI_TAS_CASE(int64_t);
+		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_POINTER:
+		{
+			PSI_TAS_P(char);
+			PSI_TAS_C(char_pointer);
+		}
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+
+	return align;
+}
+
+size_t psi_t_size(token_t t)
+{
+	size_t size;
+
+	switch (t) {
+	case PSI_T_INT8:
+	case PSI_T_UINT8:
+		size = 1;
+		break;
+	case PSI_T_INT16:
+	case PSI_T_UINT16:
+		size = 2;
+		break;
+	case PSI_T_INT:
+		size = sizeof(int);
+		break;
+	case PSI_T_INT32:
+	case PSI_T_UINT32:
+		size = 4;
+		break;
+	case PSI_T_INT64:
+	case PSI_T_UINT64:
+		size = 8;
+		break;
+	case PSI_T_FLOAT:
+		size = sizeof(float);
+		break;
+	case PSI_T_DOUBLE:
+		size = sizeof(double);
+		break;
+	case PSI_T_POINTER:
+		size = sizeof(char *);
+		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return size;
+}
+
+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) {
@@ -93,38 +204,60 @@ size_t psi_num_min_args(impl *impl)
 	return n;
 }
 
-void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_bool(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
 {
+	impl_val *v = deref_impl_val(ret_val, var);
+
 	switch (t) {
 	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		convert_to_long(return_value);
+		RETVAL_DOUBLE((double) v->fval);
 		break;
 	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		convert_to_long(return_value);
+		RETVAL_DOUBLE(v->dval);
 		break;
 	default:
-		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
+		RETVAL_LONG(v->lval);
+		break;
 	}
+	convert_to_boolean(return_value);
 }
 
-void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
 {
+	impl_val *v = deref_impl_val(ret_val, var);
+
 	switch (t) {
 	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		RETVAL_DOUBLE((double) v->fval);
 		break;
 	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
+		RETVAL_DOUBLE(v->dval);
 		break;
 	default:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->lval);
+		RETVAL_LONG(v->lval);
+		return;
+	}
+	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)
+{
+	impl_val *v = deref_impl_val(ret_val, var);
+
+	switch (t) {
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) v->fval);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(v->dval);
+		break;
+	default:
+		RETVAL_DOUBLE((double) v->lval);
 		break;
 	}
 }
 
-void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
 {
 	switch (t) {
 	case PSI_T_INT8:
@@ -139,124 +272,20 @@ void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *v
 				RETVAL_EMPTY_STRING();
 			}
 		}
-		break;
+		return;
 	case PSI_T_FLOAT:
 		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		convert_to_string(return_value);
 		break;
 	case PSI_T_DOUBLE:
 		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		convert_to_string(return_value);
 		break;
 	default:
 		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
-		convert_to_string(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_INT8:
-		PSI_TAS_CASE(int8_t);
-		break;
-	case PSI_T_UINT8:
-		PSI_TAS_CASE(uint8_t);
-		break;
-	case PSI_T_INT16:
-		PSI_TAS_CASE(int16_t);
-		break;
-	case PSI_T_UINT16:
-		PSI_TAS_CASE(uint16_t);
-		break;
-	case PSI_T_INT32:
-		PSI_TAS_CASE(int32_t);
-		break;
-	case PSI_T_UINT32:
-		PSI_TAS_CASE(uint32_t);
-		break;
-	case PSI_T_INT64:
-		PSI_TAS_CASE(int64_t);
-		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_POINTER:
-		{
-			PSI_TAS_P(char);
-			PSI_TAS_C(char_pointer);
-		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-
-	return align;
+	convert_to_string(return_value);
 }
 
-size_t psi_t_size(token_t t)
-{
-	size_t size;
-
-	switch (t) {
-	case PSI_T_INT8:
-	case PSI_T_UINT8:
-		size = 1;
-		break;
-	case PSI_T_INT16:
-	case PSI_T_UINT16:
-		size = 2;
-		break;
-	case PSI_T_INT:
-		size = sizeof(int);
-		break;
-	case PSI_T_INT32:
-	case PSI_T_UINT32:
-		size = 4;
-		break;
-	case PSI_T_INT64:
-	case PSI_T_UINT64:
-		size = 8;
-		break;
-	case PSI_T_FLOAT:
-		size = sizeof(float);
-		break;
-	case PSI_T_DOUBLE:
-		size = sizeof(double);
-		break;
-	case PSI_T_POINTER:
-		size = sizeof(char *);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-	return size;
-}
-
-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)
 {
@@ -317,7 +346,7 @@ 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, decl_var *var)
+void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
 {
 	zval ele;
 	unsigned i;
@@ -330,41 +359,73 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *va
 		ret_val = deref_impl_val(ret_val, var);
 
 		ZEND_ASSERT(s);
-		for (i = 0; i < s->args->count; ++i) {
-			decl_arg *darg = s->args->args[i];
-			impl_val tmp;
-			zval ztmp;
-			char *ptr = (char *) ret_val->ptr + darg->layout->pos;
 
-			memset(&tmp, 0, sizeof(tmp));
-			memcpy(&tmp, ptr, darg->layout->len);
-			switch (real_decl_type(darg->type)->type) {
-			case PSI_T_FLOAT:
-			case PSI_T_DOUBLE:
-				psi_to_double(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
-				break;
-			case PSI_T_INT8:
-			case PSI_T_UINT8:
-				if (darg->var->pointer_level) {
-					psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
-					break;
+		if (set->count) {
+			/* explicit member casts */
+			for (i = 0; i < set->count; ++i) {
+				zval ztmp;
+				impl_val *tmp_ptr;
+				set_value *sub_set = set->inner[i];
+				decl_var *sub_var = sub_set->vars->vars[0];
+				decl_arg *sub_arg = sub_var->arg;
+
+				if (sub_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);
+					}
 				}
-				/* no break */
-			case PSI_T_INT16:
-			case PSI_T_UINT16:
-			case PSI_T_INT32:
-			case PSI_T_UINT32:
-			case PSI_T_INT64:
-			case PSI_T_UINT64:
-				psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
-				break;
-			default:
-				printf("t=%d\n", real_decl_type(darg->type)->type);
-				abort();
 			}
-			add_assoc_zval(return_value, darg->var->name, &ztmp);
 		}
 		return;
+
+//		for (i = 0; i < s->args->count; ++i) {
+//			decl_arg *darg = s->args->args[i];
+//			impl_val tmp, tmp_ptr;
+//			zval ztmp;
+//			char *ptr = (char *) ret_val->ptr + darg->layout->pos;
+//
+//			tmp_ptr.ptr = &tmp;
+//			memset(&tmp, 0, sizeof(tmp));
+//			memcpy(&tmp, ptr, darg->layout->len);
+//			switch (real_decl_type(darg->type)->type) {
+//			case PSI_T_FLOAT:
+//			case PSI_T_DOUBLE:
+//				psi_to_double(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+//				break;
+//			case PSI_T_INT8:
+//			case PSI_T_UINT8:
+//				if (darg->var->pointer_level) {
+//					psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
+//					break;
+//				}
+//				/* no break */
+//			case PSI_T_INT16:
+//			case PSI_T_UINT16:
+//			case PSI_T_INT32:
+//			case PSI_T_UINT32:
+//			case PSI_T_INT64:
+//			case PSI_T_UINT64:
+//				psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
+//				break;
+//			case PSI_T_STRUCT:
+//				psi_to_array(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
+//				break;
+//			default:
+//				printf("t=%d\n", real_decl_type(darg->type)->type);
+//				abort();
+//			}
+//			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) {
@@ -386,7 +447,7 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *va
 	}
 }
 
-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;
 
@@ -444,7 +505,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;
@@ -459,7 +520,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;
@@ -543,57 +604,45 @@ void *psi_do_let(decl_arg *darg)
 	}
 }
 
-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;
+	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);
 
-	switch (func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	set->func->handler(return_value, t, val, set, set->vars->vars[0]);
 }
 
-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)
 {
-	return_stmt *ret = impl->stmts->ret.list[0];
+	token_t t = real_decl_type(ret->decl->type)->type;
 
-	switch (ret->func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-		break;
-	case PSI_T_TO_INT:
-		psi_to_int(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	ret->set->func->handler(return_value, t, ret_val, ret->set, ret->decl->var);
 }
 
-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;
 
@@ -628,16 +677,63 @@ 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);