#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_exceptions.h"
+#include "zend_constants.h"
+#include "zend_operators.h"
#include "php_psi.h"
-#include "parser.h"
-#include "libjit.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.directory", "psis", PHP_INI_ALL, 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();
+static zend_object_handlers psi_object_handlers;
+static zend_class_entry *psi_class_entry;
+
void psi_error(int type, const char *msg, ...)
{
char buf[0x1000];
php_error(type, buf);
}
+size_t psi_t_alignment(token_t t)
+{
+#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
+ switch (t) {
+ PSI_ALIGNOF(INT8);
+ PSI_ALIGNOF(UINT8);
+ PSI_ALIGNOF(INT16);
+ PSI_ALIGNOF(UINT16);
+ PSI_ALIGNOF(INT32);
+ PSI_ALIGNOF(UINT32);
+ PSI_ALIGNOF(INT64);
+ PSI_ALIGNOF(UINT64);
+ case PSI_T_FLOAT:
+ return ALIGNOF_FLOAT;
+ case PSI_T_DOUBLE:
+ return ALIGNOF_DOUBLE;
+ case PSI_T_POINTER:
+ return ALIGNOF_VOID_P;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ return 0;
+}
+
+size_t psi_t_size(token_t t)
+{
+#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
+ switch (t) {
+ PSI_SIZEOF(INT8);
+ PSI_SIZEOF(UINT8);
+ PSI_SIZEOF(INT16);
+ PSI_SIZEOF(UINT16);
+ PSI_SIZEOF(INT32);
+ PSI_SIZEOF(UINT32);
+ PSI_SIZEOF(INT64);
+ PSI_SIZEOF(UINT64);
+ case PSI_T_FLOAT:
+ return SIZEOF_FLOAT;
+ case PSI_T_DOUBLE:
+ return SIZEOF_DOUBLE;
+ case PSI_T_POINTER:
+ return SIZEOF_VOID_P;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ return 0;
+}
+
+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) {
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:
zend_internal_arg_info *aip;
zend_internal_function_info *fi;
- aip = calloc(impl->func->args->count + 1, sizeof(*aip));
+ aip = calloc(impl->func->args->count + 1 + !!impl->func->args->vararg.name, sizeof(*aip));
fi = (zend_internal_function_info *) &aip[0];
+ fi->allow_null = 1;
fi->required_num_args = psi_num_min_args(impl);
fi->return_reference = impl->func->return_reference;
fi->type_hint = psi_internal_type(impl->func->return_type);
+ if (impl->func->args->vararg.name) {
+ impl_arg *vararg = impl->func->args->vararg.name;
+ zend_internal_arg_info *ai = &aip[impl->func->args->count];
+
+ ai->name = vararg->var->name;
+ ai->type_hint = psi_internal_type(vararg->type);
+ if (vararg->var->reference) {
+ ai->pass_by_reference = 1;
+ }
+ ai->is_variadic = 1;
+ }
+
for (i = 0; i < impl->func->args->count; ++i) {
impl_arg *iarg = impl->func->args->args[i];
zend_internal_arg_info *ai = &aip[i+1];
return n;
}
-void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val)
+{
+ RETVAL_NULL();
+}
+
+void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
+{
+ psi_to_int(return_value, set, ret_val);
+ convert_to_boolean(return_value);
+}
+
+void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
{
- switch (real_decl_type(func->type)->type) {
+ decl_var *var = set->vars->vars[0];
+ token_t t = real_decl_type(var->arg->type)->type;
+ impl_val *v = deref_impl_val(ret_val, var);
+
+ switch (t) {
case PSI_T_FLOAT:
+ RETVAL_DOUBLE((double) v->fval);
+ convert_to_long(return_value);
+ break;
case PSI_T_DOUBLE:
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
+ RETVAL_DOUBLE(v->dval);
convert_to_long(return_value);
break;
- default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
+ case PSI_T_INT8:
+ RETVAL_LONG(v->i8);
+ break;
+ case PSI_T_UINT8:
+ RETVAL_LONG(v->u8);
+ break;
+ case PSI_T_INT16:
+ RETVAL_LONG(v->i16);
+ break;
+ case PSI_T_UINT16:
+ RETVAL_LONG(v->u16);
+ break;
+ case PSI_T_INT32:
+ RETVAL_LONG(v->i32);
+ break;
+ case PSI_T_UINT32:
+#if UINT32_MAX >= ZEND_LONG_MAX
+ if (v->u32 > ZEND_LONG_MAX) {
+ char d[12] = {0};
+
+ RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
+ } else {
+#endif
+ RETVAL_LONG(v->u32);
+#if UINT32_MAX >= ZEND_LONG_MAX
+ }
+#endif
+ break;
+ case PSI_T_INT64:
+ RETVAL_LONG(v->i64);
+ break;
+ case PSI_T_UINT64:
+ if (v->u64 > ZEND_LONG_MAX) {
+ char d[24] = {0};
+
+ RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
+ } else {
+ RETVAL_LONG(v->u64);
+ }
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
}
}
-void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
{
- switch (real_decl_type(func->type)->type) {
- case PSI_T_CHAR:
- case PSI_T_SINT8:
+ decl_var *var = set->vars->vars[0];
+ token_t t = real_decl_type(var->arg->type)->type;
+ 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;
+ case PSI_T_INT8:
+ RETVAL_DOUBLE((double) v->i8);
+ break;
case PSI_T_UINT8:
- if (!func->var->pointer_level) {
- char chr = ret_val->lval;
- RETVAL_STRINGL(&chr, 1);
+ RETVAL_DOUBLE((double) v->u8);
+ break;
+ case PSI_T_INT16:
+ RETVAL_DOUBLE((double) v->i16);
+ break;
+ case PSI_T_UINT16:
+ RETVAL_DOUBLE((double) v->u16);
+ break;
+ case PSI_T_INT32:
+ RETVAL_DOUBLE((double) v->i32);
+ break;
+ case PSI_T_UINT32:
+ RETVAL_DOUBLE((double) v->u32);
+ break;
+ case PSI_T_INT64:
+ RETVAL_DOUBLE((double) v->i64);
+ break;
+ case PSI_T_UINT64:
+ RETVAL_DOUBLE((double) v->u64);
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+}
+
+void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
+{
+ decl_var *var = set->vars->vars[0];
+ token_t t = real_decl_type(var->arg->type)->type;
+
+ switch (t) {
+ case PSI_T_VOID:
+ case PSI_T_INT8:
+ case PSI_T_UINT8:
+ if (!var->arg->var->pointer_level) {
+ RETVAL_STRINGL(&ret_val->cval, 1);
} else {
- ret_val = deref_impl_val(1, ret_val, func);
- if (ret_val->ptr) {
- RETVAL_STRING(ret_val->ptr);
+ ret_val = deref_impl_val(ret_val, var);
+ if (ret_val && ret_val->ptr) {
+ if (set->num) {
+ RETVAL_STRINGL(ret_val->ptr, psi_long_num_exp(set->num, set->outer.val));
+ } else {
+ RETVAL_STRING(ret_val->ptr);
+ }
} else {
RETVAL_EMPTY_STRING();
}
}
+ return;
+ case PSI_T_FLOAT:
+ RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+ break;
+ case PSI_T_DOUBLE:
+ RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
+ break;
+ default:
+ psi_to_int(return_value, set, ret_val);
break;
+ }
+ convert_to_string(return_value);
+}
+
+
+static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
+{
+ memset(tmp, 0, sizeof(*tmp));
+ memcpy(tmp, ((void*) 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:
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
- convert_to_string(return_value);
+ mem->dval = zval_get_double(zv);
break;
+ case PSI_T_INT8:
+ 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;
+ }
+ /* no break */
default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
- convert_to_string(return_value);
+ mem->zend.lval = zval_get_long(zv);
break;
}
}
-ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+void *psi_array_to_struct(decl_struct *s, HashTable *arr)
{
+ size_t i, j = 0;
+ char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
+
+ 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));
+
+ if (entry) {
+ impl_val val;
+ void *tmp = NULL;
+
+ memset(&tmp, 0, sizeof(tmp));
+ psi_from_zval(&val, darg, entry, &tmp);
+ memcpy(mem + darg->layout->pos, &val, darg->layout->len);
+ if (tmp) {
+ ((void **)(mem + s->size))[j++] = tmp;
+ }
+ }
+ }
+ return mem;
+}
+
+void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
+{
+ size_t i;
+ decl_var *var = set->vars->vars[0];
+ token_t t = real_decl_type(var->arg->type)->type;
+ impl_val tmp, *ret_val = deref_impl_val(r_val, var);
+
+ if ((intptr_t) ret_val->ptr <= (intptr_t) 0) {
+ RETURN_NULL();
+ }
+
+ array_init(return_value);
+
+ if (t == PSI_T_STRUCT) {
+ // decl_struct *s = real_decl_type(var->arg->type)->strct;
+
+ if (set->count) {
+ /* explicit member casts */
+ for (i = 0; i < set->count; ++i) {
+ set_value *sub_set = set->inner[i];
+ decl_var *sub_var = sub_set->vars->vars[0];
+
+ sub_set->outer.val = r_val;
+
+ if (sub_var->arg) {
+ impl_val *tmp = NULL, *val;
+ zval ztmp;
+
+ val = deref_impl_val(struct_member_ref(sub_var->arg, ret_val, &tmp), sub_var);
+ sub_set->func->handler(&ztmp, sub_set, val);
+ add_assoc_zval(return_value, sub_var->name, &ztmp);
+
+ if (tmp) {
+ free(tmp);
+ }
+ }
+ }
+ }
+ return;
+ }
+
+ if (var->arg->var->array_size) {
+ /* to_array(foo[NUMBER]) */
+ for (i = 0; i < var->arg->var->array_size; ++i) {
+ size_t size = psi_t_size(var->arg->var->pointer_level > 1 ? PSI_T_POINTER : t);
+ impl_val *ptr = iterate(ret_val, size, i, &tmp);
+ zval ele;
+
+ switch (t) {
+ case PSI_T_FLOAT:
+ ZVAL_DOUBLE(&ele, (double) ptr->fval);
+ break;
+ case PSI_T_DOUBLE:
+ ZVAL_DOUBLE(&ele, ptr->dval);
+ break;
+ default:
+ ZVAL_LONG(&ele, ptr->lval);
+ break;
+ }
+
+ add_next_index_zval(return_value, &ele);
+ }
+ return;
+ } else if (set->num) {
+ /* to_array(arr_var, num_expr, to_int(*arr_var))
+ */
+ zval ele;
+ zend_long i, n = psi_long_num_exp(set->num, set->outer.val);
+
+ for (i = 0; i < n; ++i) {
+ size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+ impl_val *ptr = iterate(ret_val, size, i, &tmp);
+
+ set->inner[0]->func->handler(&ele, set->inner[0], ptr);
+ add_next_index_zval(return_value, &ele);
+ }
+ } else {
+ ZEND_ASSERT(0);
+ }
+}
+
+void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
+{
+ decl_var *var = set->vars->vars[0];
+ impl_val *ret_val = deref_impl_val(r_val, var);
+ psi_object *obj;
+
+ if ((intptr_t) ret_val->ptr > (intptr_t) 0) {
+ object_init_ex(return_value, psi_class_entry);
+ obj = PSI_OBJ(return_value, NULL);
+ obj->data = ret_val->ptr;
+ } else {
+ RETVAL_NULL();
+ }
+}
+
+static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+{
+ size_t i;
+ zval *zarg = ZEND_CALL_ARG(execute_data, 0);
impl_arg *iarg;
+ zend_error_handling zeh;
+
+ zend_replace_error_handling(EH_THROW, zend_exception_get_default(), &zeh);
if (!impl->func->args->count) {
- return zend_parse_parameters_none();
+ ZEND_RESULT_CODE rv;
+
+ rv = zend_parse_parameters_none();
+ zend_restore_error_handling(&zeh);
+ return rv;
}
- ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
+ ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->vararg.name ? -1 : impl->func->args->count)
nextarg:
- iarg = impl->func->args->args[_i];
- if (iarg->def) {
+ if (impl->func->args->vararg.name && _i >= impl->func->args->count) {
+ impl_arg *varg = impl->func->args->vararg.name;
+ iarg = init_impl_arg(
+ init_impl_type(varg->type->type, varg->type->name),
+ init_impl_var(varg->var->name, varg->var->reference),
+ NULL);
+
Z_PARAM_OPTIONAL;
- }
- if (PSI_T_BOOL == iarg->type->type) {
- if (iarg->def) {
- iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
- }
- Z_PARAM_BOOL(iarg->val.bval);
- } else if (PSI_T_INT == iarg->type->type) {
- if (iarg->def) {
- iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+ if (_i == impl->func->args->count) {
+ impl->func->args->vararg.args = init_impl_args(iarg);
+ } else {
+ add_impl_arg(impl->func->args->vararg.args, iarg);
}
- Z_PARAM_LONG(iarg->val.lval);
- } else if (PSI_T_FLOAT == iarg->type->type) {
+ } else {
+ iarg = impl->func->args->args[_i];
if (iarg->def) {
- iarg->val.dval = zend_strtod(iarg->def->text, NULL);
+ Z_PARAM_OPTIONAL;
}
+ }
+ if (PSI_T_BOOL == iarg->type->type) {
+ Z_PARAM_BOOL(iarg->val.zend.bval);
+ } else if (PSI_T_INT == iarg->type->type) {
+ Z_PARAM_LONG(iarg->val.zend.lval);
+ } else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
Z_PARAM_DOUBLE(iarg->val.dval);
} else if (PSI_T_STRING == iarg->type->type) {
- struct {char *val; size_t len;} str;
- if (iarg->def) {
- /* FIXME */
- str.len = strlen(iarg->def->text) - 2;
- str.val = &iarg->def->text[1];
- }
- Z_PARAM_STR_EX(iarg->val.str, 1, 0);
- if (iarg->val.str) {
- zend_string_addref(iarg->val.str);
- } else if (iarg->def) {
- iarg->val.str = zend_string_init(str.val, str.len, 0);
+ Z_PARAM_STR_EX(iarg->val.zend.str, 1, iarg->var->reference);
+ if (iarg->val.zend.str) {
+ zend_string_addref(iarg->val.zend.str);
}
+ } else if (PSI_T_ARRAY == iarg->type->type) {
+ Z_PARAM_PROLOGUE(0);
+ } else if (PSI_T_OBJECT == iarg->type->type) {
+ Z_PARAM_PROLOGUE(0);
+ } else if (PSI_T_MIXED == iarg->type->type) {
+ Z_PARAM_PROLOGUE(0);
} else {
error_code = ZPP_ERROR_FAILURE;
break;
}
iarg->_zv = _arg;
- if (_i < _max_num_args) {
+ ZVAL_DEREF(iarg->_zv);
+ if (_i < _num_args) {
goto nextarg;
}
- ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
+ ZEND_PARSE_PARAMETERS_END_EX(
+ zend_restore_error_handling(&zeh);
+ return FAILURE
+ );
+
+ /* set up defaults */
+ for (i = 0; i < impl->func->args->count; ++i) {
+ iarg = impl->func->args->args[i];
+
+ if (i < EX_NUM_ARGS()) {
+ } else if (iarg->def) {
+ switch (iarg->type->type) {
+ case PSI_T_BOOL:
+ iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+ break;
+ case PSI_T_INT:
+ iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+ break;
+ case PSI_T_FLOAT:
+ case PSI_T_DOUBLE:
+ iarg->val.dval = zend_strtod(iarg->def->text, NULL);
+ break;
+ case PSI_T_STRING:
+ /* FIXME */
+ iarg->val.zend.str = zend_string_init(&iarg->def->text[1], strlen(iarg->def->text) - 2, 0);
+ break;
+ }
+ }
+ }
+ zend_restore_error_handling(&zeh);
return SUCCESS;
}
-impl_val *psi_do_let(decl_arg *darg)
+static inline void *psi_do_calloc(let_calloc *alloc)
{
- impl_val *arg_val = &darg->let->out;
- impl_arg *iarg = darg->let->arg;
+ zend_long n = psi_long_num_exp(alloc->nmemb, NULL), s = psi_long_num_exp(alloc->size, NULL);
+ void *mem = safe_emalloc(n, s, sizeof(void *));
+ memset(mem, 0, n * s + sizeof(void *));
+ return mem;
+}
- if (!iarg) {
- /* let foo = NULL */
- memset(arg_val, 0, sizeof(*arg_val));
- return arg_val;
- }
- switch (darg->let->val->func->type) {
+static inline ZEND_RESULT_CODE 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.cval;
+ 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.lval;
+ 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) {
- arg_val->ptr = estrdup(iarg->val.str->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(iarg->val.str);
+ if (iarg->val.zend.str) {
+ arg_val->ptr = estrdup(iarg->val.zend.str->val);
+ *to_free = arg_val->ptr;
+ } else {
+ arg_val->ptr = "";
+ }
} else {
zend_string *zs = zval_get_string(iarg->_zv);
arg_val->ptr = estrdup(zs->val);
- darg->let->mem = arg_val->ptr;
+ *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 FAILURE;
+ }
+ }
break;
case PSI_T_STRLEN:
if (iarg->type->type == PSI_T_STRING) {
- arg_val->lval = iarg->val.str->len;
- zend_string_release(iarg->val.str);
+ 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;
- EMPTY_SWITCH_DEFAULT_CASE();
- }
-
- return arg_val;
-}
-
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
-{
- impl_val *val = (impl_val *) &vars->vars[0]->arg->let->ptr;
+ case PSI_T_ARRVAL:
+ if (iarg->type->type == PSI_T_ARRAY) {
+ arg_val->ptr = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
+ *to_free = arg_val->ptr;
+ }
+ break;
+ case PSI_T_OBJVAL:
+ if (iarg->type->type == PSI_T_OBJECT) {
+ psi_object *obj;
- ZVAL_DEREF(return_value);
- zval_dtor(return_value);
+ if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
+ return FAILURE;
+ }
- switch (func->type) {
- case PSI_T_TO_STRING:
- psi_to_string(val, vars->vars[0]->arg, return_value);
+ obj = PSI_OBJ(iarg->_zv, NULL);
+ arg_val->ptr = obj->data;
+ }
break;
EMPTY_SWITCH_DEFAULT_CASE();
}
+ return SUCCESS;
}
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
+static inline void *psi_do_let(let_stmt *let)
{
- switch (impl->stmts->ret.list[0]->func->type) {
- case PSI_T_TO_STRING:
- psi_to_string(ret_val, impl->decl->func, return_value);
+ 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:
+ arg_val->ptr = deref_impl_val(let->val->data.var->arg->val.ptr, let->var);
break;
- case PSI_T_TO_INT:
- psi_to_int(ret_val, impl->decl->func, return_value);
+ 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;
+ } else {
+ memset(arg_val, 0, sizeof(*arg_val));
+ }
break;
- EMPTY_SWITCH_DEFAULT_CASE();
+ case PSI_LET_CALLOC:
+ arg_val->ptr = psi_do_calloc(let->val->data.alloc);
+ darg->mem = arg_val->ptr;
+ break;
+ case PSI_LET_NUMEXP:
+ arg_val->zend.lval = psi_long_num_exp(let->val->data.num, NULL);
+ break;
+ case PSI_LET_FUNC:
+ iarg = let->val->data.func->arg;
+
+ if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem)) {
+ return NULL;
+ }
+ }
+
+ if (let->val && let->val->flags.one.is_reference) {
+ return let->ptr = &darg->ptr;
+ } else {
+ return let->ptr = darg->ptr;
}
}
-void psi_do_free(free_stmt *fre)
+static inline void psi_do_set(zval *return_value, set_value *set)
{
- size_t i;
+ zval_dtor(return_value);
+ set->func->handler(return_value, set, set->vars->vars[0]->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);
+}
+
+static inline void psi_do_free(free_stmt *fre)
+{
+ size_t i, j;
- for (i = 0; i < fre->vars->count; ++i) {
- decl_var *dvar = fre->vars->vars[i];
+ for (i = 0; i < fre->calls->count; ++i) {
+ free_call *f = fre->calls->list[i];
- if (dvar->arg && dvar->arg->let->out.ptr) {
- free(dvar->arg->let->out.ptr);
- dvar->arg->let->out.ptr = NULL;
+ for (j = 0; j < f->vars->count; ++j) {
+ decl_var *dvar = f->vars->vars[j];
+ decl_arg *darg = dvar->arg;
+
+ f->decl->call.args[j] = &darg->val;
}
+
+ /* FIXME: check in validate_* that free functions return scalar */
+ PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
}
}
-void psi_do_clean(impl *impl)
+static inline void psi_do_clean(impl *impl)
{
size_t i;
switch (iarg->type->type) {
case PSI_T_STRING:
- if (iarg->val.str) {
- zend_string_release(iarg->val.str);
+ if (iarg->val.zend.str) {
+ zend_string_release(iarg->val.zend.str);
}
break;
}
}
- for (i = 0; i < impl->decl->args->count; ++i) {
+ if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
decl_arg *darg = impl->decl->args->args[i];
- if (darg->let && darg->let->mem) {
- efree(darg->let->mem);
- darg->let->mem = NULL;
+ if (darg->mem) {
+ decl_type *type = real_decl_type(darg->type);
+
+ if (type->type == PSI_T_STRUCT) {
+ void **ptr = (void **) ((char *) darg->mem + type->strct->size);
+
+ while (*ptr) {
+ efree(*ptr++);
+ }
+ }
+ efree(darg->mem);
+ darg->mem = NULL;
}
}
+
+ if (impl->func->args->vararg.args) {
+ free_impl_args(impl->func->args->vararg.args);
+ impl->func->args->vararg.args = NULL;
+ }
+ if (impl->func->args->vararg.types) {
+ efree(impl->func->args->vararg.types);
+ impl->func->args->vararg.types = NULL;
+ }
+ if (impl->func->args->vararg.values) {
+ efree(impl->func->args->vararg.values);
+ impl->func->args->vararg.values = NULL;
+ }
+ if (impl->func->args->vararg.free_list) {
+ void **list = impl->func->args->vararg.free_list;
+
+ while (*list) {
+ efree(*list++);
+ }
+
+ efree(impl->func->args->vararg.free_list);
+ impl->func->args->vararg.free_list = NULL;
+ }
+}
+
+static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
+ impl_val *ref, *tmp = NULL;
+
+ switch (exp->t) {
+ case PSI_T_NUMBER:
+ switch (is_numeric_string(exp->u.numb, strlen(exp->u.numb), (zend_long *) res, (double *) res, 0)) {
+ case IS_LONG:
+ return PSI_T_INT64;
+ case IS_DOUBLE:
+ return PSI_T_DOUBLE;
+ }
+ break;
+
+ case PSI_T_NSNAME:
+ switch (exp->u.cnst->type->type) {
+ case PSI_T_INT:
+ res->i64 = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.lval;
+ return PSI_T_INT64;
+ case PSI_T_FLOAT:
+ res->dval = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.dval;
+ return PSI_T_DOUBLE;
+ default:
+ return 0;
+ }
+ break;
+
+ case PSI_T_NAME:
+ if (strct) {
+ ref = struct_member_ref(exp->u.dvar->arg, strct, &tmp);
+ } else {
+ ref = exp->u.dvar->arg->ptr;
+ }
+ switch (real_decl_type(exp->u.dvar->arg->type)->type) {
+ case PSI_T_INT8:
+ case PSI_T_UINT8:
+ case PSI_T_INT16:
+ case PSI_T_UINT16:
+ case PSI_T_INT32:
+ case PSI_T_UINT32:
+ case PSI_T_INT64:
+ case PSI_T_UINT64:
+ memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
+ if (tmp) {
+ free(tmp);
+ }
+ return real_decl_type(exp->u.dvar->arg->type)->type;
+
+ case PSI_T_FLOAT:
+ case PSI_T_DOUBLE:
+ memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
+ if (tmp) {
+ free(tmp);
+ }
+ return real_decl_type(exp->u.dvar->arg->type)->type;
+
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ break;
+
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ return 0;
+}
+
+int psi_calc_num_exp(num_exp *exp, impl_val *strct, impl_val *res) {
+ impl_val num = {0};
+ int num_type = psi_calc_num_exp_value(exp, strct, &num);
+
+ if (exp->operand) {
+ impl_val tmp = {0};
+ int tmp_type = psi_calc_num_exp(exp->operand, strct, &tmp);
+
+ return exp->calculator(num_type, &num, tmp_type, &tmp, res);
+ }
+
+ memcpy(res, &num, sizeof(*res));
+ return num_type;
+}
+
+#define PRIfval "f"
+#define PRIdval "lf"
+
+#define PSI_CALC_OP(var) do { \
+ const char *fmt = "calc %" PRI##var ", %" PRI##var ": %" PRI##var "\n"; \
+ res->var = PSI_CALC(v1->var, v2->var); \
+ if (!res->var) fprintf(stderr, fmt, v1->var, v2->var, res->var); \
+} while (0)
+#define PSI_CALC_OP2(vres, var1, var2) do { \
+ const char *fmt = "calc %" PRI##var1 ", %" PRI##var2 ": %" PRI##vres "\n"; \
+ res->vres = PSI_CALC(v1->var1, v2->var2); \
+ if (!res->vres) fprintf(stderr, fmt, v1->var1, v2->var2, res->vres); \
+} while(0)
+#define PSI_CALC_FN(op) int psi_calc_##op(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res) \
+{ \
+ if (t1 == t2) { \
+ switch (t1) { \
+ case PSI_T_FLOAT: PSI_CALC_OP(fval); break; \
+ case PSI_T_DOUBLE: PSI_CALC_OP(dval); break; \
+ case PSI_T_INT8: PSI_CALC_OP(i8); break; \
+ case PSI_T_UINT8: PSI_CALC_OP(u8); break; \
+ case PSI_T_INT16: PSI_CALC_OP(i16); break; \
+ case PSI_T_UINT16: PSI_CALC_OP(u16); break; \
+ case PSI_T_INT32: PSI_CALC_OP(i32); break; \
+ case PSI_T_UINT32: PSI_CALC_OP(u32); break; \
+ case PSI_T_INT64: PSI_CALC_OP(i64); break; \
+ case PSI_T_UINT64: PSI_CALC_OP(u64); break; \
+ EMPTY_SWITCH_DEFAULT_CASE(); \
+ } \
+ return t1; \
+ } else if (t1 == PSI_T_DOUBLE) { \
+ switch (t2) { \
+ case PSI_T_FLOAT: PSI_CALC_OP2(dval, dval, fval); break; \
+ case PSI_T_INT8: PSI_CALC_OP2(dval, dval, i8); break; \
+ case PSI_T_UINT8: PSI_CALC_OP2(dval, dval, u8); break; \
+ case PSI_T_INT16: PSI_CALC_OP2(dval, dval, i16); break; \
+ case PSI_T_UINT16: PSI_CALC_OP2(dval, dval, u16); break; \
+ case PSI_T_INT32: PSI_CALC_OP2(dval, dval, i32); break; \
+ case PSI_T_UINT32: PSI_CALC_OP2(dval, dval, u32); break; \
+ case PSI_T_INT64: PSI_CALC_OP2(dval, dval, i64); break; \
+ case PSI_T_UINT64: PSI_CALC_OP2(dval, dval, u64); break; \
+ EMPTY_SWITCH_DEFAULT_CASE(); \
+ } \
+ return t1; \
+ } else if (t2 == PSI_T_DOUBLE) { \
+ switch (t1) { \
+ case PSI_T_FLOAT: PSI_CALC_OP2(dval, fval, dval); break; \
+ case PSI_T_INT8: PSI_CALC_OP2(dval, i8, dval); break; \
+ case PSI_T_UINT8: PSI_CALC_OP2(dval, u8, dval); break; \
+ case PSI_T_INT16: PSI_CALC_OP2(dval, i16, dval); break; \
+ case PSI_T_UINT16: PSI_CALC_OP2(dval, u16, dval); break; \
+ case PSI_T_INT32: PSI_CALC_OP2(dval, i32, dval); break; \
+ case PSI_T_UINT32: PSI_CALC_OP2(dval, u32, dval); break; \
+ case PSI_T_INT64: PSI_CALC_OP2(dval, i64, dval); break; \
+ case PSI_T_UINT64: PSI_CALC_OP2(dval, u64, dval); break; \
+ EMPTY_SWITCH_DEFAULT_CASE(); \
+ } \
+ return t2; \
+ } else if (t1 == PSI_T_FLOAT) { \
+ switch (t2) { \
+ case PSI_T_DOUBLE: PSI_CALC_OP2(dval, fval, dval); return t2; \
+ case PSI_T_INT8: PSI_CALC_OP2(fval, fval, i8); break; \
+ case PSI_T_UINT8: PSI_CALC_OP2(fval, fval, u8); break; \
+ case PSI_T_INT16: PSI_CALC_OP2(fval, fval, i16); break; \
+ case PSI_T_UINT16: PSI_CALC_OP2(fval, fval, u16); break; \
+ case PSI_T_INT32: PSI_CALC_OP2(fval, fval, i32); break; \
+ case PSI_T_UINT32: PSI_CALC_OP2(fval, fval, u32); break; \
+ case PSI_T_INT64: PSI_CALC_OP2(fval, fval, i64); break; \
+ case PSI_T_UINT64: PSI_CALC_OP2(fval, fval, u64); break; \
+ EMPTY_SWITCH_DEFAULT_CASE(); \
+ } \
+ return t1; \
+ } else if (t2 == PSI_T_FLOAT) { \
+ switch (t1) { \
+ case PSI_T_DOUBLE: PSI_CALC_OP2(dval, dval, fval); return t1; \
+ case PSI_T_INT8: PSI_CALC_OP2(fval, i8, fval); break; \
+ case PSI_T_UINT8: PSI_CALC_OP2(fval, u8, fval); break; \
+ case PSI_T_INT16: PSI_CALC_OP2(fval, i16, fval); break; \
+ case PSI_T_UINT16: PSI_CALC_OP2(fval, u16, fval); break; \
+ case PSI_T_INT32: PSI_CALC_OP2(fval, i32, fval); break; \
+ case PSI_T_UINT32: PSI_CALC_OP2(fval, u32, fval); break; \
+ case PSI_T_INT64: PSI_CALC_OP2(fval, i64, fval); break; \
+ case PSI_T_UINT64: PSI_CALC_OP2(fval, u64, fval); break; \
+ EMPTY_SWITCH_DEFAULT_CASE(); \
+ } \
+ return t2; \
+ } else { \
+ int64_t sval1 = v1->i64, sval2 = v2->i64; \
+ uint64_t uval1 = v1->u64, uval2 = v2->u64; \
+ switch (t1) { \
+ case PSI_T_INT8: sval1 >>= 8; \
+ case PSI_T_INT16: sval1 >>= 8; \
+ case PSI_T_INT32: sval1 >>= 8; \
+ case PSI_T_INT64: \
+ switch (t2) { \
+ case PSI_T_INT8: sval2 >>= 8; \
+ case PSI_T_INT16: sval2 >>= 8; \
+ case PSI_T_INT32: sval2 >>= 8; \
+ case PSI_T_INT64: \
+ res->i64 = PSI_CALC(sval1 , sval2); \
+ return PSI_T_INT64; \
+ case PSI_T_UINT8: uval2 >>= 8; \
+ case PSI_T_UINT16: uval2 >>= 8; \
+ case PSI_T_UINT32: uval2 >>= 8; \
+ case PSI_T_UINT64: \
+ res->i64 = PSI_CALC(sval1, uval2); \
+ return PSI_T_INT64; \
+ } \
+ break; \
+ case PSI_T_UINT8: uval1 >>= 8; \
+ case PSI_T_UINT16: uval1 >>= 8; \
+ case PSI_T_UINT32: uval1 >>= 8; \
+ case PSI_T_UINT64: \
+ switch (t2) { \
+ case PSI_T_INT8: sval2 >>= 8; \
+ case PSI_T_INT16: sval2 >>= 8; \
+ case PSI_T_INT32: sval2 >>= 8; \
+ case PSI_T_INT64: \
+ res->i64 = PSI_CALC(uval1, sval2); \
+ return PSI_T_INT64; \
+ case PSI_T_UINT8: uval2 >>= 8; \
+ case PSI_T_UINT16: uval2 >>= 8; \
+ case PSI_T_UINT32: uval2 >>= 8; \
+ case PSI_T_UINT64: \
+ res->u64 = PSI_CALC(uval1, uval2); \
+ return PSI_T_UINT64; \
+ } \
+ break; \
+ } \
+ } \
+ ZEND_ASSERT(0); \
+ return 0; \
+}
+
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) + (var2)
+PSI_CALC_FN(add)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) * (var2)
+PSI_CALC_FN(mul)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) - (var2)
+PSI_CALC_FN(sub)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) / (var2)
+PSI_CALC_FN(div)
+
+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;
+ }
+}
+
+static inline impl_vararg *psi_do_varargs(impl *impl) {
+ size_t i, j;
+ impl_vararg *va = &impl->func->args->vararg;
+ size_t vacount = va->args->count;
+
+
+ if (!vacount) {
+ return NULL;
+ }
+
+ va->types = ecalloc(vacount, sizeof(*va->types));
+ va->values = ecalloc(vacount, sizeof(*va->values));
+
+ 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;
+
+ if (vatype == PSI_T_MIXED) {
+ switch (Z_TYPE_P(vaarg->_zv)) {
+ case IS_TRUE:
+ case IS_FALSE: vatype = PSI_T_BOOL; break;
+ case IS_LONG: vatype = PSI_T_INT; break;
+ case IS_DOUBLE: vatype = PSI_T_FLOAT; break;
+ default: vatype = PSI_T_STRING; break;
+ }
+ }
+
+
+ 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_FLOAT:
+ case PSI_T_DOUBLE: let_fn = PSI_T_FLOATVAL;break;
+ case PSI_T_STRING: let_fn = PSI_T_STRVAL; break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+
+ va->types[i] = vatype;
+ psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
+
+ if (to_free) {
+ if (!va->free_list) {
+ va->free_list = ecalloc(vacount - i + 1, sizeof(*va->free_list));
+ }
+ va->free_list[j++] = to_free;
+ }
+ }
+
+ return va;
+}
+
+void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+{
+ size_t i;
+ impl_vararg *va = NULL;
+
+ memset(impl->decl->func->ptr, 0, sizeof(impl_val));
+
+ if (SUCCESS != psi_parse_args(execute_data, impl)) {
+ return;
+ }
+
+ for (i = 0; i < impl->stmts->let.count; ++i) {
+ let_stmt *let = impl->stmts->let.list[i];
+
+ if (!psi_do_let(let)) {
+ psi_do_return(return_value, impl->stmts->ret.list[0]);
+ psi_do_clean(impl);
+ return;
+ }
+ }
+
+ if (impl->decl->args) {
+ psi_do_args(impl);
+
+ if (impl->func->args->vararg.args) {
+ va = psi_do_varargs(impl);
+ }
+ }
+
+ PSI_ContextCall(&PSI_G(context), &impl->decl->call, va);
+ psi_do_return(return_value, impl->stmts->ret.list[0]);
+
+ 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);
+}
+
+static void psi_object_free(zend_object *o)
+{
+ psi_object *obj = PSI_OBJ(NULL, o);
+
+ if (obj->data) {
+ // free(obj->data);
+ obj->data = NULL;
+ }
+ zend_object_std_dtor(o);
+}
+
+static zend_object *psi_object_init(zend_class_entry *ce)
+{
+ psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+
+ zend_object_std_init(&o->std, ce);
+ object_properties_init(&o->std, ce);
+ o->std.handlers = &psi_object_handlers;
+ return &o->std;
}
PHP_MINIT_FUNCTION(psi)
{
+ PSI_ContextOps *ops = NULL;
+ zend_class_entry ce = {0};
+
REGISTER_INI_ENTRIES();
- PSI_ContextInit(&PSI_G(context), PSI_Libjit(), psi_error);
+ INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
+ psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
+ psi_class_entry->create_object = psi_object_init;
+
+ memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ psi_object_handlers.offset = XtOffsetOf(psi_object, std);
+ psi_object_handlers.free_obj = psi_object_free;
+ psi_object_handlers.clone_obj = NULL;
+
+#ifdef HAVE_LIBJIT
+ if (!strcasecmp(PSI_G(engine), "jit")) {
+ ops = PSI_Libjit();
+ } 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);
PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
+ if (psi_check_env("PSI_DUMP")) {
+ PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
+ }
+
return SUCCESS;
}
+
PHP_MSHUTDOWN_FUNCTION(psi)
{
PSI_ContextDtor(&PSI_G(context));
return SUCCESS;
}
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
PHP_RINIT_FUNCTION(psi)
{
-#if defined(COMPILE_DL_PSI) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(psi)
-{
return SUCCESS;
}
-/* }}} */
+#endif
PHP_MINFO_FUNCTION(psi)
{
psi_functions,
PHP_MINIT(psi),
PHP_MSHUTDOWN(psi),
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
PHP_RINIT(psi), /* Replace with NULL if there's nothing to do at request start */
- PHP_RSHUTDOWN(psi), /* Replace with NULL if there's nothing to do at request end */
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(psi),
PHP_PSI_VERSION,
STANDARD_MODULE_PROPERTIES
projects / m6w6 / ext-psi / blobdiff