#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, ...)
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) {
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:
return n;
}
-void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_bool(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
{
- switch (real_decl_type(func->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(deref_impl_val(0, ret_val, func)->dval);
- convert_to_long(return_value);
+ RETVAL_DOUBLE(v->dval);
break;
default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
+ RETVAL_LONG(v->lval);
+ break;
}
+ convert_to_boolean(return_value);
}
-void psi_to_double(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
{
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
-}
+ impl_val *v = deref_impl_val(ret_val, var);
-void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
-{
- switch (real_decl_type(func->type)->type) {
- case PSI_T_CHAR:
- case PSI_T_SINT8:
- case PSI_T_UINT8:
- if (!func->var->pointer_level) {
- char chr = ret_val->lval;
- RETVAL_STRINGL(&chr, 1);
- } else {
- ret_val = deref_impl_val(1, ret_val, func);
- if (ret_val->ptr) {
- RETVAL_STRING(ret_val->ptr);
- } else {
- RETVAL_EMPTY_STRING();
- }
- }
- break;
+ switch (t) {
case PSI_T_FLOAT:
+ RETVAL_DOUBLE((double) v->fval);
+ break;
case PSI_T_DOUBLE:
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
- convert_to_string(return_value);
+ RETVAL_DOUBLE(v->dval);
break;
default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
- convert_to_string(return_value);
- break;
+ RETVAL_LONG(v->lval);
+ return;
}
+ convert_to_long(return_value);
}
-size_t psi_t_alignment(token_t t)
+void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
{
- 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); \
-}
+ impl_val *v = deref_impl_val(ret_val, var);
+
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);
+ RETVAL_DOUBLE((double) v->fval);
break;
case PSI_T_DOUBLE:
- PSI_TAS_CASE(double);
+ RETVAL_DOUBLE(v->dval);
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);
- }
+ default:
+ RETVAL_DOUBLE((double) v->lval);
break;
- EMPTY_SWITCH_DEFAULT_CASE();
}
-
- return align;
}
-size_t psi_t_size(token_t t)
+void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
{
- 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_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;
+ if (!var->arg->var->pointer_level) {
+ RETVAL_STRINGL(&ret_val->cval, 1);
+ } else {
+ ret_val = deref_impl_val(ret_val, var);
+ if (ret_val && ret_val->ptr) {
+ RETVAL_STRING(ret_val->ptr);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+ }
+ return;
case PSI_T_FLOAT:
- size = sizeof(float);
+ RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
break;
case PSI_T_DOUBLE:
- size = sizeof(double);
- break;
- case PSI_T_SIZE_T:
- size = sizeof(size_t);
+ RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
break;
- case PSI_T_POINTER:
- size = sizeof(char *);
+ default:
+ RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
break;
- EMPTY_SWITCH_DEFAULT_CASE();
}
- return size;
+ convert_to_string(return_value);
}
-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)
{
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);
zend_string_release(zs);
break;
}
+ /* no break */
default:
- mem->lval = zval_get_long(zv);
+ mem->zend.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 *));
+ 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];
- 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) {
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;
}
}
}
return mem;
}
-void psi_to_array(impl_val *ret_val, decl_arg *func, zval *return_value)
+void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *set, decl_var *var)
{
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);
+ decl_struct *s = real_decl_type(var->arg->type)->strct;
+ 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];
- 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();
+ 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);
+ }
+ }
}
- 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(0, ret_val, func);
- for (i = 0; i < func->var->array_size; ++i) {
+ ret_val = deref_impl_val(ret_val, var);
+ for (i = 0; i < var->arg->var->array_size; ++i) {
impl_val *ptr = iterate(ret_val, t, i, &tmp);
switch (t) {
case PSI_T_FLOAT:
+ ZVAL_DOUBLE(&ele, (double) ptr->fval);
+ break;
case PSI_T_DOUBLE:
ZVAL_DOUBLE(&ele, ptr->dval);
break;
}
}
-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;
}
if (PSI_T_BOOL == iarg->type->type) {
if (iarg->def) {
- iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
+ iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
}
- Z_PARAM_BOOL(iarg->val.bval);
+ Z_PARAM_BOOL(iarg->val.zend.bval);
} else if (PSI_T_INT == iarg->type->type) {
if (iarg->def) {
- iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
+ iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
}
- Z_PARAM_LONG(iarg->val.lval);
- } else if (PSI_T_FLOAT == iarg->type->type) {
+ Z_PARAM_LONG(iarg->val.zend.lval);
+ } else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
if (iarg->def) {
iarg->val.dval = zend_strtod(iarg->def->text, NULL);
}
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);
+ Z_PARAM_STR_EX(iarg->val.zend.str, 1, 0);
+ if (iarg->val.zend.str) {
+ zend_string_addref(iarg->val.zend.str);
} else if (iarg->def) {
- iarg->val.str = zend_string_init(str.val, str.len, 0);
+ iarg->val.zend.str = zend_string_init(str.val, str.len, 0);
}
} else if (PSI_T_ARRAY == iarg->type->type) {
/* handled as _zv in let or set */
return SUCCESS;
}
-impl_val *psi_do_let(decl_arg *darg)
+static inline void *psi_do_calloc(let_calloc *alloc)
+{
+ decl_type *type = real_decl_type(alloc->type);
+ size_t size;
+
+ if (type->type == PSI_T_STRUCT) {
+ /* 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);
+ }
+
+ return ecalloc(alloc->n, size);
+}
+
+static inline 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);
* let foo = NULL;
* let foo;
*/
- if (darg->var->array_size) {
+ if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
+ arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
+ darg->let->mem = arg_val->ptr;
+ } else 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) {
- case PSI_T_BOOLVAL:
- if (iarg->type->type == PSI_T_BOOL) {
- arg_val->cval = iarg->val.cval;
- } 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;
- } 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.str->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(iarg->val.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.str->len;
- zend_string_release(iarg->val.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- 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);
+ } 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)
+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(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();
- }
+ 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)
{
- switch (impl->stmts->ret.list[0]->func->type) {
- case PSI_T_TO_STRING:
- psi_to_string(ret_val, impl->decl->func, return_value);
- break;
- 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();
- }
+ token_t t = real_decl_type(ret->decl->type)->type;
+
+ 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->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->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;
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) {
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++);
}
}
+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);
projects / m6w6 / ext-psi / blobdiff