flush
[m6w6/ext-psi] / src / module.c
index 6f152e3d750ef3933c56a8b44419752dd314592b..873d56bc10192521c211dd55cde3de1e0e6f42f2 100644 (file)
@@ -6,20 +6,34 @@
 #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"
-#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();
 
+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];
@@ -32,6 +46,56 @@ void psi_error(int type, const char *msg, ...)
        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();
+       }
+}
+
+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();
+       }
+}
+
+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) {
@@ -93,177 +157,155 @@ size_t psi_num_min_args(impl *impl)
        return n;
 }
 
-void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val)
 {
-       switch (t) {
-       case PSI_T_FLOAT:
-               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-               convert_to_long(return_value);
-               break;
-       case PSI_T_DOUBLE:
-               RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-               convert_to_long(return_value);
-               break;
-       default:
-               RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
-       }
+       RETVAL_NULL();
 }
 
-void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
 {
-       switch (t) {
-       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:
-               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->lval);
-               break;
-       }
+       psi_to_int(return_value, set, ret_val);
+       convert_to_boolean(return_value);
 }
 
-void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_to_int(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;
+       impl_val *v = deref_impl_val(ret_val, var);
+
        switch (t) {
-       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(ret_val, var);
-                       if (ret_val && ret_val->ptr) {
-                               RETVAL_STRING(ret_val->ptr);
-                       } else {
-                               RETVAL_EMPTY_STRING();
-                       }
-               }
-               break;
        case PSI_T_FLOAT:
-               RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-               convert_to_string(return_value);
+               RETVAL_DOUBLE((double) v->fval);
+               convert_to_long(return_value);
                break;
        case PSI_T_DOUBLE:
-               RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-               convert_to_string(return_value);
-               break;
-       default:
-               RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
-               convert_to_string(return_value);
+               RETVAL_DOUBLE(v->dval);
+               convert_to_long(return_value);
                break;
-       }
-}
-
-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);
+               RETVAL_LONG(v->i8);
                break;
        case PSI_T_UINT8:
-               PSI_TAS_CASE(uint8_t);
+               RETVAL_LONG(v->u8);
                break;
        case PSI_T_INT16:
-               PSI_TAS_CASE(int16_t);
+               RETVAL_LONG(v->i16);
                break;
        case PSI_T_UINT16:
-               PSI_TAS_CASE(uint16_t);
+               RETVAL_LONG(v->u16);
                break;
        case PSI_T_INT32:
-               PSI_TAS_CASE(int32_t);
+               RETVAL_LONG(v->i32);
                break;
        case PSI_T_UINT32:
-               PSI_TAS_CASE(uint32_t);
+#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:
-               PSI_TAS_CASE(int64_t);
+               RETVAL_LONG(v->i64);
                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);
+               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();
        }
-
-       return align;
 }
 
-size_t psi_t_size(token_t t)
+void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
 {
-       size_t size;
+       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:
-               size = 1;
+               RETVAL_DOUBLE((double) v->u8);
                break;
        case PSI_T_INT16:
-       case PSI_T_UINT16:
-               size = 2;
+               RETVAL_DOUBLE((double) v->i16);
                break;
-       case PSI_T_INT:
-               size = sizeof(int);
+       case PSI_T_UINT16:
+               RETVAL_DOUBLE((double) v->u16);
                break;
        case PSI_T_INT32:
+               RETVAL_DOUBLE((double) v->i32);
+               break;
        case PSI_T_UINT32:
-               size = 4;
+               RETVAL_DOUBLE((double) v->u32);
                break;
        case PSI_T_INT64:
+               RETVAL_DOUBLE((double) v->i64);
+               break;
        case PSI_T_UINT64:
-               size = 8;
+               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(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);
+               RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
                break;
-       case PSI_T_POINTER:
-               size = sizeof(char *);
+       default:
+               psi_to_int(return_value, set, ret_val);
                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)
+static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
 {
-       size_t size = psi_t_size(t);
-
        memset(tmp, 0, sizeof(*tmp));
-       memcpy(tmp, val->ptr + size * i, size);
+       memcpy(tmp, ((void*) val->ptr) + size * i, size);
        return tmp;
 }
 
@@ -317,85 +359,139 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
        return mem;
 }
 
-void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+static inline impl_val *struct_member_ref(decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) {
+       void *ptr = (char *) struct_ptr->ptr + set_arg->layout->pos;
+       impl_val *val = enref_impl_val(ptr, set_arg->var);
+
+       if (val != ptr) {
+               *to_free = val;
+       }
+
+       return val;
+}
+void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 {
-       zval ele;
-       unsigned i;
-       impl_val tmp;
+       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);
 
        array_init(return_value);
 
        if (t == PSI_T_STRUCT) {
-               decl_struct *s = real_decl_type(var->arg->type)->strct;
-               ret_val = deref_impl_val(ret_val, var);
+               // decl_struct *s = real_decl_type(var->arg->type)->strct;
 
-               ZEND_ASSERT(s);
-               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;
+               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];
 
-                       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, darg->var);
-                                       break;
+                               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);
+                                       }
                                }
-                               /* 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);
+                       }
+               }
+               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_STRUCT:
-                               psi_to_array(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
+                       case PSI_T_DOUBLE:
+                               ZVAL_DOUBLE(&ele, ptr->dval);
                                break;
                        default:
-                               printf("t=%d\n", real_decl_type(darg->type)->type);
-                               abort();
+                               ZVAL_LONG(&ele, ptr->lval);
+                               break;
                        }
-                       add_assoc_zval(return_value, darg->var->name, &ztmp);
+
+                       add_next_index_zval(return_value, &ele);
                }
                return;
-       }
-       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);
+       } else if (set->vars->count > 1) {
+               /* to_array(arr_var, cnt_var[, cnt_var...], to_int(*arr_var))
+                * check for length in second var
+                */
+               size_t count = 0;
+               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;
+               if (set->outer.set) {
+                       /* struct */
+                       for (i = 1; i < set->vars->count; ++i) {
+                               impl_val *tmp = NULL, *cnt_val;
+                               decl_var *cnt_var = set->vars->vars[i];
+
+                               cnt_val = struct_member_ref(cnt_var->arg, set->outer.val, &tmp);
+                               count += deref_impl_val(cnt_val, cnt_var)->lval;
+
+                               if (tmp) {
+                                       free(tmp);
+                               }
+                       }
+               } else {
+                       ZEND_ASSERT(0);
                }
 
-               add_next_index_zval(return_value, &ele);
+               for (i = 0; i < count; ++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);
        }
 }
 
-ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+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 (ret_val->ptr) {
+               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)
 {
        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)
@@ -434,7 +530,9 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
                        }
                } else if (PSI_T_ARRAY == iarg->type->type) {
                        /* handled as _zv in let or set */
-                       Z_PARAM_PROLOGUE(0);
+                       Z_PARAM_ARRAY_EX(iarg->_zv, 1, 0);
+               } else if (PSI_T_OBJECT == iarg->type->type) {
+                       Z_PARAM_OBJECT_EX(iarg->_zv, 1, 0);
                } else {
                        error_code = ZPP_ERROR_FAILURE;
                        break;
@@ -443,27 +541,24 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
                if (_i < _max_num_args) {
                        goto nextarg;
                }
-       ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
+       ZEND_PARSE_PARAMETERS_END_EX(
+               zend_restore_error_handling(&zeh);
+               return FAILURE
+       );
 
+       zend_restore_error_handling(&zeh);
        return SUCCESS;
 }
 
-void *psi_do_calloc(let_calloc *alloc)
+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);
+       zend_long n = psi_long_num_exp(alloc->nmemb), s = psi_long_num_exp(alloc->size);
+       void *mem = safe_emalloc(n, s, sizeof(void *));
+       memset(mem, 0, n * s + sizeof(void *));
+       return mem;
 }
 
-void *psi_do_let(decl_arg *darg)
+static inline void *psi_do_let(decl_arg *darg)
 {
        impl_arg *iarg = darg->let->arg;
        impl_val *arg_val;
@@ -502,6 +597,7 @@ void *psi_do_let(decl_arg *darg)
                                arg_val->lval = zval_get_long(iarg->_zv);
                        }
                        break;
+               case PSI_T_PATHVAL:
                case PSI_T_STRVAL:
                        if (iarg->type->type == PSI_T_STRING) {
                                arg_val->ptr = estrdup(iarg->val.zend.str->val);
@@ -513,6 +609,12 @@ void *psi_do_let(decl_arg *darg)
                                darg->let->mem = arg_val->ptr;
                                zend_string_release(zs);
                        }
+                       if (PSI_T_PATHVAL == darg->let->val->func->type) {
+                               if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
+                                       efree(arg_val->ptr);
+                                       return NULL;
+                               }
+                       }
                        break;
                case PSI_T_STRLEN:
                        if (iarg->type->type == PSI_T_STRING) {
@@ -536,6 +638,18 @@ void *psi_do_let(decl_arg *darg)
                                }
                        }
                        break;
+               case PSI_T_OBJVAL:
+                       if (iarg->type->type == PSI_T_OBJECT) {
+                               psi_object *obj;
+
+                               if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
+                                       return NULL;
+                               }
+
+                               obj = PSI_OBJ(iarg->_zv, NULL);
+                               arg_val->ptr = obj->data;
+                       }
+                       break;
                EMPTY_SWITCH_DEFAULT_CASE();
                }
        }
@@ -547,57 +661,40 @@ void *psi_do_let(decl_arg *darg)
        }
 }
 
-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;
-
        ZVAL_DEREF(return_value);
        zval_dtor(return_value);
 
-       switch (func->type) {
-       case PSI_T_TO_STRING:
-               psi_to_string(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-               break;
-       case PSI_T_TO_ARRAY:
-               psi_to_array(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-               break;
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
+       set->func->handler(return_value, set, set->vars->vars[0]->arg->let->ptr);
 }
 
-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)
 {
-       return_stmt *ret = impl->stmts->ret.list[0];
-
-       switch (ret->func->type) {
-       case PSI_T_TO_STRING:
-               psi_to_string(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-               break;
-       case PSI_T_TO_INT:
-               psi_to_int(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-               break;
-       case PSI_T_TO_ARRAY:
-               psi_to_array(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, ret->decl);
-               break;
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
+       ret->set->func->handler(return_value, ret->set, ret_val);
 }
 
-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;
 
@@ -632,21 +729,238 @@ void psi_do_clean(impl *impl)
        }
 }
 
+
+#define PSI_CALC_OP(var) res->var = PSI_CALC(v1->var, v2->var)
+#define PSI_CALC_OP2(vres, var1, var2) res->vres = PSI_CALC(v1->var1, v2->var2)
+
+int psi_calc_plus(unsigned char t1, impl_val *v1, unsigned char t2, impl_val *v2, impl_val *res)
+{
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) + (var2)
+       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;
+}
+
+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];
+
+                       if (!(impl->decl->call.args[i] = psi_do_let(darg))) {
+                               goto cleanup;
+                       }
+               }
+       }
+
+       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);
+       return;
+
+cleanup:
+       memset(&ret_val, 0, sizeof(ret_val));
+       psi_do_return(return_value, impl->stmts->ret.list[0], &ret_val);
+       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;
+       PSI_ContextOps *ops = NULL;
+       zend_class_entry ce = {0};
 
        REGISTER_INI_ENTRIES();
 
+       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 {
+       } 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)