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

diff --git a/src/module.c b/src/module.c
index dba74c5..ac08a95 100644
--- a/src/module.c
+++ b/src/module.c
@@ -11,11 +11,13 @@
 #include "parser.h"
 
 #include "libjit.h"
+#include "libffi.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("psi.directory", "psis", PHP_INI_ALL, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	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)
 PHP_INI_END();
 
 void psi_error(int type, const char *msg, ...)
@@ -105,6 +107,11 @@ void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
 	}
 }
 
+void psi_to_double(impl_val *ret_val, decl_arg *func, zval *return_value)
+{
+	RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
+}
+
 void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
 {
 	switch (real_decl_type(func->type)->type) {
@@ -135,6 +142,253 @@ void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
 	}
 }
 
+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);
+		break;
+	case PSI_T_SINT8:
+		PSI_TAS_CASE(int8_t);
+		break;
+	case PSI_T_UINT8:
+		PSI_TAS_CASE(uint8_t);
+		break;
+	case PSI_T_SHORT:
+		PSI_TAS_CASE(short);
+		break;
+	case PSI_T_SINT16:
+		PSI_TAS_CASE(int16_t);
+		break;
+	case PSI_T_UINT16:
+		PSI_TAS_CASE(uint16_t);
+		break;
+	case PSI_T_INT:
+		PSI_TAS_CASE(int);
+		break;
+	case PSI_T_SINT32:
+		PSI_TAS_CASE(int32_t);
+		break;
+	case PSI_T_UINT32:
+		PSI_TAS_CASE(uint32_t);
+		break;
+	case PSI_T_LONG:
+		PSI_TAS_CASE(long);
+		break;
+	case PSI_T_SINT64:
+		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_SIZE_T:
+		PSI_TAS_CASE(size_t);
+		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_CHAR:
+		size = sizeof(char);
+		break;
+	case PSI_T_SINT8:
+	case PSI_T_UINT8:
+		size = 1;
+		break;
+	case PSI_T_SHORT:
+		size = sizeof(short);
+		break;
+	case PSI_T_SINT16:
+	case PSI_T_UINT16:
+		size = 2;
+		break;
+	case PSI_T_INT:
+		size = sizeof(int);
+		break;
+	case PSI_T_SINT32:
+	case PSI_T_UINT32:
+		size = 4;
+		break;
+	case PSI_T_LONG:
+		size = sizeof(long);
+		break;
+	case PSI_T_SINT64:
+	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_SIZE_T:
+		size = sizeof(size_t);
+		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)
+{
+	size_t size = psi_t_size(t);
+
+	memset(tmp, 0, sizeof(*tmp));
+	memcpy(tmp, val->ptr + size * i, size);
+	return tmp;
+}
+
+void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
+{
+	decl_type *type = real_decl_type(spec->type);
+
+	switch (type->type) {
+	case PSI_T_FLOAT:
+		mem->fval = (float) zval_get_double(zv);
+		break;
+	case PSI_T_DOUBLE:
+		mem->dval = zval_get_double(zv);
+		break;
+	case PSI_T_CHAR:
+	case PSI_T_SINT8:
+	case PSI_T_UINT8:
+		if (spec->var->pointer_level) {
+			zend_string *zs = zval_get_string(zv);
+			*tmp = mem->ptr = estrndup(zs->val, zs->len);
+			zend_string_release(zs);
+			break;
+		}
+	default:
+		mem->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 *));
+
+	for (i = 0; i < s->args->count; ++i) {
+		decl_struct_layout *layout = &s->layout[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) {
+			impl_val val;
+			void *tmp = NULL;
+
+			memset(&tmp, 0, sizeof(tmp));
+			psi_from_zval(&val, darg, entry, &tmp);
+			memcpy(mem + layout->pos, &val, layout->len);
+			if (tmp) {
+				((void **)(mem + size))[j++] = tmp;
+			}
+		}
+	}
+	return mem;
+}
+
+void psi_to_array(impl_val *ret_val, decl_arg *func, zval *return_value)
+{
+	zval ele;
+	unsigned i;
+	impl_val tmp;
+	decl_type *type = real_decl_type(func->type);
+	token_t t = type->type;
+
+	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);
+
+		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;
+
+			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);
+				break;
+			case PSI_T_CHAR:
+				psi_to_string(&tmp, darg, &ztmp);
+				break;
+			EMPTY_SWITCH_DEFAULT_CASE();
+			}
+			add_assoc_zval(return_value, darg->var->name, &ztmp);
+		}
+		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;
+		}
+
+		add_next_index_zval(return_value, &ele);
+	}
+}
+
 ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 {
 	impl_arg *iarg;
@@ -177,6 +431,9 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 			} else if (iarg->def) {
 				iarg->val.str = zend_string_init(str.val, str.len, 0);
 			}
+		} else if (PSI_T_ARRAY == iarg->type->type) {
+			/* handled as _zv in let or set */
+			Z_PARAM_PROLOGUE(0);
 		} else {
 			error_code = ZPP_ERROR_FAILURE;
 			break;
@@ -196,8 +453,16 @@ impl_val *psi_do_let(decl_arg *darg)
 	impl_arg *iarg = darg->let->arg;
 
 	if (!iarg) {
-		/* let foo = NULL */
-		memset(arg_val, 0, sizeof(*arg_val));
+		/*
+		 * let foo = NULL;
+		 * let foo;
+		 */
+		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) {
@@ -237,6 +502,22 @@ impl_val *psi_do_let(decl_arg *darg)
 			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);
+
+			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();
 	}
 
@@ -254,6 +535,9 @@ void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
 	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();
 	}
 }
@@ -267,6 +551,9 @@ void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
 	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();
 	}
 }
@@ -289,10 +576,32 @@ void psi_do_clean(impl *impl)
 {
 	size_t i;
 
+	for (i = 0; i < impl->func->args->count; ++i ) {
+		impl_arg *iarg = impl->func->args->args[i];
+
+		switch (iarg->type->type) {
+		case PSI_T_STRING:
+			if (iarg->val.str) {
+				zend_string_release(iarg->val.str);
+			}
+			break;
+		}
+	}
+
 	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);
+
+				while (*ptr) {
+					efree(*ptr++);
+				}
+			}
 			efree(darg->let->mem);
 			darg->let->mem = NULL;
 		}
@@ -301,9 +610,17 @@ void psi_do_clean(impl *impl)
 
 PHP_MINIT_FUNCTION(psi)
 {
+	PSI_ContextOps *ops;
+
 	REGISTER_INI_ENTRIES();
 
-	PSI_ContextInit(&PSI_G(context), PSI_Libjit(), psi_error);
+	if (!strcasecmp(PSI_G(engine), "jit")) {
+		ops = PSI_Libjit();
+	} else {
+		ops = PSI_Libffi();
+	}
+
+	PSI_ContextInit(&PSI_G(context), ops, psi_error);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
 	return SUCCESS;