# define PSI_ENGINE "ffi"
#endif
+#include <ndbm.h>
+
ZEND_DECLARE_MODULE_GLOBALS(psi);
PHP_INI_BEGIN()
static zend_object_handlers psi_object_handlers;
static zend_class_entry *psi_class_entry;
-void psi_error(int type, const char *msg, ...)
+void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...)
{
- char buf[0x1000];
va_list argv;
va_start(argv, msg);
- vslprintf(buf, 0x1000, msg, argv);
+ psi_verror(type, t?t->file:"Unknown", t?*t->line:0, msg, argv);
va_end(argv);
+}
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
+{
+ va_list argv;
- php_error(type, buf);
+ va_start(argv, msg);
+ psi_verror(type, fn, ln, msg, argv);
+ va_end(argv);
+}
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
+{
+ zend_error_cb(type, fn, ln, msg, argv);
}
size_t psi_t_alignment(token_t t)
return ((s - 1) | (a - 1)) + 1;
}
+size_t psi_offset_padding(size_t diff, size_t alignment)
+{
+ if (diff && diff <= ((diff - 1) | (alignment -1)) + 1) {
+ diff = 0;
+ }
+
+ return diff;
+}
+
int psi_internal_type(impl_type *type)
{
switch (type->type) {
zend_internal_arg_info *ai = &aip[impl->func->args->count];
ai->name = vararg->var->name;
+ ai->allow_null = 1;
ai->type_hint = psi_internal_type(vararg->type);
if (vararg->var->reference) {
ai->pass_by_reference = 1;
if (iarg->var->reference) {
ai->pass_by_reference = 1;
}
- if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
+ //if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
ai->allow_null = 1;
- }
+ //}
}
return aip;
void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
{
+ char *str;
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:
+ 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:
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) {
+ if (var->arg->var->array_size) {
+ str = (char *) ret_val;
+ } else {
+ str = ret_val->ptr;
+ }
+ if (str) {
if (set->num) {
- RETVAL_STRINGL(ret_val->ptr, psi_long_num_exp(set->num, set->outer.val));
+ zend_long n = psi_long_num_exp(set->num, set->outer.val);
+ RETVAL_STRINGL(str, n);
} else {
- RETVAL_STRING(ret_val->ptr);
+ RETVAL_STRING(str);
}
} 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);
+ memcpy(tmp, ((void*) val) + size * i, size);
return tmp;
}
case PSI_T_DOUBLE:
mem->dval = zval_get_double(zv);
break;
+ case PSI_T_VOID:
case PSI_T_INT8:
case PSI_T_UINT8:
if (spec->var->pointer_level) {
return mem;
}
+void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val)
+{
+ set->outer.set->func->handler(return_value, set, r_val);
+}
+
void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
{
size_t i;
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) {
+ if ((intptr_t) ret_val <= (intptr_t) 0) {
RETURN_NULL();
}
set_value *sub_set = set->inner[i];
decl_var *sub_var = sub_set->vars->vars[0];
- sub_set->outer.val = r_val;
+ sub_set->outer.val = ret_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);
+ val = struct_member_ref(sub_var->arg, ret_val, &tmp);
sub_set->func->handler(&ztmp, sub_set, val);
add_assoc_zval(return_value, sub_var->name, &ztmp);
}
return;
} else if (set->num) {
- /* to_array(arr_var, num_expr, to_int(*arr_var))
- */
+ /* to_array(arr_var, num_expr, to_int(*arr_var)) */
zval ele;
+ char *ptr;
zend_long i, n = psi_long_num_exp(set->num, set->outer.val);
+ size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+ set_value *sub_set = set->inner[0];
+ sub_set->outer.val = 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);
+ ptr = (char *) ret_val->ptr + i * size;
+ sub_set->func->handler(&ele, sub_set, (void *) ptr);
add_next_index_zval(return_value, &ele);
}
} else {
- ZEND_ASSERT(0);
+ /* to_array(arr_var, to_int(*arr_var)) */
+ zval ele;
+ char *ptr = ret_val->ptr;
+ size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+ set_value *sub_set = set->inner[0];
+
+ sub_set->outer.val = set->outer.val;
+ while (*(void **) ptr) {
+ sub_set->func->handler(&ele, sub_set, (void *) ptr);
+ add_next_index_zval(return_value, &ele);
+ ptr += size;
+ }
}
}
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 *));
+#if 0
+ fprintf(stderr, "calloc: %p\n", mem);
+#endif
return mem;
}
-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)
+static inline impl_val *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:
case PSI_T_STRVAL:
if (iarg->type->type == PSI_T_STRING) {
if (iarg->val.zend.str) {
- arg_val->ptr = estrdup(iarg->val.zend.str->val);
+ arg_val->ptr = estrndup(iarg->val.zend.str->val, iarg->val.zend.str->len);
*to_free = arg_val->ptr;
} else {
arg_val->ptr = "";
if (PSI_T_PATHVAL == let_func) {
if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
efree(arg_val->ptr);
- return FAILURE;
+ return NULL;
}
}
break;
break;
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;
+ arg_val = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
+ *to_free = arg_val;
}
break;
case PSI_T_OBJVAL:
psi_object *obj;
if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
- return FAILURE;
+ return NULL;
}
obj = PSI_OBJ(iarg->_zv, NULL);
break;
EMPTY_SWITCH_DEFAULT_CASE();
}
- return SUCCESS;
+ return arg_val;
}
static inline void *psi_do_let(let_stmt *let)
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);
+ memcpy(arg_val, deref_impl_val(let->val->data.var->arg->let->ptr, let->val->data.var), sizeof(*arg_val));
+#if 0
+ fprintf(stderr, "LET TMP: %p -> %p\n",
+ let->val->data.var->arg->let->ptr,
+ arg_val->ptr);
+#endif
break;
case PSI_LET_NULL:
if (darg->var->array_size) {
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)) {
+ if (!(darg->ptr = psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem))) {
return NULL;
}
}
static inline void psi_do_set(zval *return_value, set_value *set)
{
+ decl_arg *set_arg = set->vars->vars[0]->arg;
+
zval_dtor(return_value);
- set->func->handler(return_value, set, set->vars->vars[0]->arg->ptr);
+ set->func->handler(return_value, set, set_arg->let ? set_arg->let->ptr : set_arg->ptr);
}
static inline void psi_do_return(zval *return_value, return_stmt *ret)
for (j = 0; j < f->vars->count; ++j) {
decl_var *dvar = f->vars->vars[j];
decl_arg *darg = dvar->arg;
+ impl_val *fval = darg->let ? darg->let->ptr : darg->ptr;
- f->decl->call.args[j] = &darg->val;
+ f->decl->call.args[j] = deref_impl_val(fval, dvar);
}
/* FIXME: check in validate_* that free functions return scalar */
}
}
+static inline void psi_clean_array_struct(decl_arg *darg) {
+ if (darg->let
+ && darg->let->val->kind == PSI_LET_FUNC
+ && darg->let->val->data.func->type == PSI_T_ARRVAL) {
+ 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++);
+ }
+ }
+ }
+}
+
static inline void psi_do_clean(impl *impl)
{
size_t i;
+ if (impl->decl->func->ptr != &impl->decl->func->val) {
+ efree(impl->decl->func->ptr);
+ impl->decl->func->ptr = &impl->decl->func->val;
+ }
for (i = 0; i < impl->func->args->count; ++i ) {
impl_arg *iarg = impl->func->args->args[i];
decl_arg *darg = impl->decl->args->args[i];
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++);
- }
- }
+ psi_clean_array_struct(darg);
efree(darg->mem);
darg->mem = NULL;
}
+ darg->ptr = &darg->val;
}
if (impl->func->args->vararg.args) {
case PSI_T_NAME:
if (strct) {
ref = struct_member_ref(exp->u.dvar->arg, strct, &tmp);
+ } else if (exp->u.dvar->arg->let) {
+ ref = exp->u.dvar->arg->let->ptr;
} else {
ref = exp->u.dvar->arg->ptr;
}
for (i = 0; i < impl->decl->args->count; ++i) {
impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
}
+
+ if (!impl->decl->func->var->pointer_level) {
+ decl_type *real = real_decl_type(impl->decl->func->type);
+
+ switch (real->type) {
+ case PSI_T_STRUCT:
+ impl->decl->func->ptr = psi_array_to_struct(real->strct, NULL);
+ break;
+ }
+ }
}
static inline impl_vararg *psi_do_varargs(impl *impl) {
}
va->types[i] = vatype;
- psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
+ /* FIXME: varargs with struct-by-value :) */
+ if (!psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free)) {
+ return NULL;
+ }
if (to_free) {
if (!va->free_list) {
return FAILURE;
}
- PSI_ContextInit(&PSI_G(context), ops, psi_error);
+ PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
if (psi_check_env("PSI_DUMP")) {
projects / m6w6 / ext-psi / blobdiff