X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=6f152e3d750ef3933c56a8b44419752dd314592b;hp=2705df1e5616a91f5e8ac5e4fa7f9fc75ba7c99b;hb=7e4c03791c729bce5ebe6226a72786191bc67f8f;hpb=76d285140e4f0bf1d43bb7190bd86f652d818487

diff --git a/src/module.c b/src/module.c
index 2705df1..6f152e3 100644
--- a/src/module.c
+++ b/src/module.c
@@ -38,7 +38,6 @@ int psi_internal_type(impl_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:
@@ -128,8 +127,7 @@ void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *v
 void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
 	switch (t) {
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 	case PSI_T_UINT8:
 		if (!var->arg->var->pointer_level) {
 			RETVAL_STRINGL(&ret_val->cval, 1);
@@ -174,37 +172,25 @@ size_t psi_t_alignment(token_t t)
 	PSI_TAS_C(T); \
 }
 	switch (t) {
-	case PSI_T_CHAR:
-		PSI_TAS_CASE(char);
-		break;
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 		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:
+	case PSI_T_INT16:
 		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:
+	case PSI_T_INT32:
 		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:
+	case PSI_T_INT64:
 		PSI_TAS_CASE(int64_t);
 		break;
 	case PSI_T_UINT64:
@@ -216,9 +202,6 @@ size_t psi_t_alignment(token_t t)
 	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);
@@ -236,31 +219,22 @@ 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_INT8:
 	case PSI_T_UINT8:
 		size = 1;
 		break;
-	case PSI_T_SHORT:
-		size = sizeof(short);
-		break;
-	case PSI_T_SINT16:
+	case PSI_T_INT16:
 	case PSI_T_UINT16:
 		size = 2;
 		break;
 	case PSI_T_INT:
 		size = sizeof(int);
 		break;
-	case PSI_T_SINT32:
+	case PSI_T_INT32:
 	case PSI_T_UINT32:
 		size = 4;
 		break;
-	case PSI_T_LONG:
-		size = sizeof(long);
-		break;
-	case PSI_T_SINT64:
+	case PSI_T_INT64:
 	case PSI_T_UINT64:
 		size = 8;
 		break;
@@ -270,9 +244,6 @@ size_t psi_t_size(token_t t)
 	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;
@@ -307,8 +278,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);
@@ -316,6 +286,7 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 			zend_string_release(zs);
 			break;
 		}
+		/* no break */
 	default:
 		mem->zend.lval = zval_get_long(zv);
 		break;
@@ -324,11 +295,10 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 
 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];
 		zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
 
@@ -338,9 +308,9 @@ 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;
 			}
 		}
 	}
@@ -362,24 +332,36 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *va
 		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;
+			impl_val tmp, tmp_ptr;
 			zval ztmp;
-			char *ptr = (char *) ret_val + layout.pos;
+			char *ptr = (char *) ret_val->ptr + darg->layout->pos;
 
+			tmp_ptr.ptr = &tmp;
 			memset(&tmp, 0, sizeof(tmp));
-			memcpy(&tmp, ptr, layout.len);
+			memcpy(&tmp, ptr, darg->layout->len);
 			switch (real_decl_type(darg->type)->type) {
-			case PSI_T_CHAR:
+			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;
 				}
-				/* nobreak */
-			case PSI_T_INT:
-			case PSI_T_LONG:
+				/* 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();
@@ -427,7 +409,7 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
 			}
 			Z_PARAM_BOOL(iarg->val.zend.bval);
-		} else if (PSI_T_INT == iarg->type->type || PSI_T_LONG == iarg->type->type) {
+		} else if (PSI_T_INT == iarg->type->type) {
 			if (iarg->def) {
 				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
 			}
@@ -472,8 +454,8 @@ void *psi_do_calloc(let_calloc *alloc)
 	size_t size;
 
 	if (type->type == PSI_T_STRUCT) {
-		/* psi_do_clean expects a NULL pointer after the struct */
-		size = decl_struct_size(type->strct) + sizeof(void *);
+		/* 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);
 	}
@@ -481,10 +463,13 @@ void *psi_do_calloc(let_calloc *alloc)
 	return ecalloc(alloc->n, size);
 }
 
-impl_val *psi_do_let(decl_arg *darg)
+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);
@@ -500,62 +485,66 @@ impl_val *psi_do_let(decl_arg *darg)
 		} 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.zend.bval;
-		} else {
-			arg_val->cval = zend_is_true(iarg->_zv);
-		}
-		break;
-	case PSI_T_INTVAL:
-		if (iarg->type->type == PSI_T_INT || iarg->type->type == PSI_T_LONG) {
-			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;
-			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);
+	} 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)
@@ -631,8 +620,7 @@ void psi_do_clean(impl *impl)
 			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++);