X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmarshal.c;h=9e9d31e076efa521298dc923564161a50ab43b06;hp=6473eca10a23b2e11021783d0e4d442ebd8811bb;hb=0682ecb84dfe1de08b609c6c0ae641b06f3fa481;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/src/marshal.c b/src/marshal.c
index 6473eca..9e9d31e 100644
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 #include "calc.h"
 
@@ -52,13 +56,13 @@ zend_long psi_zval_count(zval *zvalue)
 	case IS_OBJECT:
 		count = 1;
 		if (Z_OBJ_HT_P(zvalue)->count_elements) {
-			if (SUCCESS == Z_OBJ_HT_P(zvalue)->count_elements(zvalue, &count)) {
+			if (SUCCESS == Z_OBJ_HT_P(zvalue)->count_elements(Z_OBJ_P(zvalue), &count)) {
 				break;
 			}
 		}
 
 		if (instanceof_function(Z_OBJCE_P(zvalue), spl_ce_Countable)) {
-			zend_call_method_with_0_params(zvalue, NULL, NULL, "count", &retval);
+			zend_call_method_with_0_params(Z_OBJ_P(zvalue), NULL, NULL, "count", &retval);
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				count = zval_get_long(&retval);
 				zval_ptr_dtor(&retval);
@@ -95,49 +99,29 @@ zend_internal_arg_info *psi_internal_arginfo(struct psi_impl *impl)
 	zend_internal_arg_info *aip;
 	zend_internal_function_info *fi;
 	struct psi_impl_arg *iarg;
+	zend_type rtyp = ZEND_TYPE_INIT_CODE(psi_internal_type(impl->func->return_type), 1, _ZEND_ARG_INFO_FLAGS(impl->func->return_reference, impl->func->vararg));
 
-	aip = calloc(argc + 1 + !!impl->func->vararg, sizeof(*aip));
+	aip = pecalloc(argc + 1 + !!impl->func->vararg, sizeof(*aip), 1);
 
 	fi = (zend_internal_function_info *) &aip[0];
-#ifdef ZEND_TYPE_ENCODE
-	fi->type = ZEND_TYPE_ENCODE(psi_internal_type(impl->func->return_type), 1);
-#else
-	fi->allow_null = 1;
-	fi->type_hint = psi_internal_type(impl->func->return_type);
-#endif
 	fi->required_num_args = psi_impl_num_min_args(impl);
-	fi->return_reference = impl->func->return_reference;
+	fi->type = rtyp;
 
 	if (impl->func->vararg) {
 		struct psi_impl_arg *vararg = impl->func->vararg;
 		zend_internal_arg_info *ai = &aip[argc];
+		zend_type atyp = ZEND_TYPE_INIT_CODE(psi_internal_type(vararg->type), 1, _ZEND_ARG_INFO_FLAGS(vararg->var->reference, 1));
 
-		ai->name = vararg->var->name;
-#ifdef ZEND_TYPE_ENCODE
-		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(vararg->type), 1);
-#else
-		ai->allow_null = 1;
-		ai->type_hint = psi_internal_type(vararg->type);
-#endif
-		if (vararg->var->reference) {
-			ai->pass_by_reference = 1;
-		}
-		ai->is_variadic = 1;
+		ai->name = &vararg->var->name->val[1];
+		ai->type = atyp;
 	}
 
 	while (psi_plist_get(impl->func->args, i++, &iarg)) {
 		zend_internal_arg_info *ai = &aip[i];
+		zend_type atyp = ZEND_TYPE_INIT_CODE(psi_internal_type(iarg->type), 1, _ZEND_ARG_INFO_FLAGS(iarg->var->reference, 0));
 
-		ai->name = iarg->var->name;
-#ifdef ZEND_TYPE_ENCODE
-		ai->type = ZEND_TYPE_ENCODE(psi_internal_type(iarg->type), 1);
-#else
-		ai->allow_null = 1;
-		ai->type_hint = psi_internal_type(iarg->type);
-#endif
-		if (iarg->var->reference) {
-			ai->pass_by_reference = 1;
-		}
+		ai->name = &iarg->var->name->val[1];
+		ai->type = atyp;
 	}
 
 	return aip;
@@ -226,52 +210,6 @@ impl_val *psi_let_boolval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl
 	return psi_val_boolval(tmp, real_type, boolval);
 }
 
-static inline char *psi_u128_to_buf(char *buf, unsigned __int128 u128)
-{
-	for (*buf = 0; u128 > 0; u128 /= 10) {
-		*--buf = ((u128 % 10) + '0') & 0xff;
-	}
-	return buf;
-}
-
-static inline char *psi_i128_to_buf(char *buf, __int128 i128)
-{
-	if (i128 < 0) {
-		char *res = psi_u128_to_buf(buf, ~((unsigned __int128) i128) + 1);
-
-		*--res = '-';
-		return res;
-	}
-	return psi_u128_to_buf(buf, i128);
-}
-
-#if HAVE_INT128
-# define RETVAL_LONG_STR(V, s) do {\
-		char buf[0x30] = {0}; \
-		if (s && V >= ZEND_LONG_MIN && V <= ZEND_LONG_MAX) { \
-			RETVAL_LONG(V); \
-		} else if (!s && V <= ZEND_LONG_MAX) { \
-			RETVAL_LONG(V); \
-		} else if (!s && V <= ZEND_ULONG_MAX) { \
-			RETVAL_STRING(zend_print_ulong_to_buf(&buf[sizeof(buf) - 1], V)); \
-		} else if (s && V >= INT128_MIN && V <= INT128_MAX) { \
-			RETVAL_STRING(psi_i128_to_buf(&buf[sizeof(buf) - 1], V)); \
-		} else { \
-			RETVAL_STRING(psi_u128_to_buf(&buf[sizeof(buf) - 1], V)); \
-		} \
-	} while (0)
-#else
-# define RETVAL_LONG_STR(V, s) do {\
-		char buf[0x20] = {0}; \
-		if (s && V >= ZEND_LONG_MIN && V <= ZEND_LONG_MAX) { \
-			RETVAL_LONG(V); \
-		} else if (!s && V <= ZEND_LONG_MAX) { \
-			RETVAL_LONG(V); \
-		} else { \
-			RETVAL_STRING(zend_print_ulong_to_buf(&buf[sizeof(buf) - 1], V)); \
-		} \
-	} while (0)
-#endif
 /*
  * set $ivar = to_int(*dvar)
  */
@@ -290,10 +228,10 @@ void psi_set_to_int(zval *return_value, struct psi_set_exp *set, impl_val *ret_v
 	case PSI_T_INT32:		RETVAL_LONG(v->i32);				break;
 	case PSI_T_UINT32:		RETVAL_LONG(v->u32);				break;
 	case PSI_T_INT64:		RETVAL_LONG(v->i64);				break;
-	case PSI_T_UINT64:		RETVAL_LONG_STR(v->u64, 0);			break;
+	case PSI_T_UINT64:		RETVAL_LONG_DOUBLE_STR(v->u64,);	break;
 #ifdef HAVE_INT128
-	case PSI_T_INT128:		RETVAL_LONG_STR(v->i128, 1);		break;
-	case PSI_T_UINT128:		RETVAL_LONG_STR(v->u128, 0);		break;
+	case PSI_T_INT128:		RETVAL_LONG_DOUBLE_STR(v->i128, is_signed=true);	break;
+	case PSI_T_UINT128:		RETVAL_LONG_DOUBLE_STR(v->u128,);	break;
 #endif
 	case PSI_T_FLOAT:
 		RETVAL_DOUBLE((double) v->fval);
@@ -340,7 +278,7 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
 }
 
 #if HAVE_INT128
-void psi_strto_i128(char *ptr, char *end, token_t real_type, impl_val *val) {
+static void psi_strto_i128(char *ptr, char *end, token_t real_type, impl_val *val) {
 	unsigned __int128 i = 0;
 	bool oct = false, hex = false, sign = false;
 
@@ -526,7 +464,7 @@ void psi_set_to_string(zval *return_value, struct psi_set_exp *set, impl_val *re
 	impl_val *ptr = deref_impl_val(ret_val, var);
 	char *str;
 
-	if (var->arg->var->array_size) {
+	if (var->arg->var->array_size && var->arg->var->pointer_level == 1) {
 		str = (char *) ptr;
 	} else {
 		str = ptr->ptr;
@@ -689,8 +627,8 @@ void psi_set_to_array_counted(zval *return_value, struct psi_set_exp *set, impl_
 	count = psi_num_exp_get_long(sub_exp->data.num, frame, NULL);
 	psi_plist_get(set->inner, 1, &sub_exp);
 
-	for (ptr = (char *) ret_val; 0 < count--; ptr += size) {
 	size = psi_decl_var_get_size(psi_set_exp_get_decl_var(sub_exp));
+	for (ptr = (char *) ret_val; 0 < count--; ptr += size) {
 		zval ele;
 
 		ZVAL_NULL(&ele);
@@ -732,7 +670,7 @@ void psi_set_to_array(zval *return_value, struct psi_set_exp *set, impl_val *r_v
 
 		ZVAL_NULL(&ele);
 		psi_set_exp_exec_ex(sub_exp, &ele, sym->ptr, frame);
-		add_assoc_zval(return_value, ivar->name + 1, &ele);
+		add_assoc_zval_ex(return_value, ivar->name->val + 1, ivar->name->len - 1, &ele);
 	}
 }