flush

[m6w6/ext-psi] / src / module.c

diff --git a/src/module.c b/src/module.c
index 03d9d8350f3c0b0412cfd6833b403d6e90b5d3a6..a883e62bd982dd721d405362166f691de90aad49 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -38,7 +38,6 @@ int psi_internal_type(impl_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:
@@ -128,8 +127,7 @@ void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *v
 void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
 {
        switch (t) {
-       case PSI_T_CHAR:
-       case PSI_T_SINT8:
+       case PSI_T_INT8:
        case PSI_T_UINT8:
                if (!var->arg->var->pointer_level) {
                        RETVAL_STRINGL(&ret_val->cval, 1);
@@ -174,37 +172,25 @@ size_t psi_t_alignment(token_t t)
        PSI_TAS_C(T); \
 }
        switch (t) {
-       case PSI_T_CHAR:
-               PSI_TAS_CASE(char);
-               break;
-       case PSI_T_SINT8:
+       case PSI_T_INT8:
                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:
+       case PSI_T_INT16:
                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:
+       case PSI_T_INT32:
                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:
+       case PSI_T_INT64:
                PSI_TAS_CASE(int64_t);
                break;
        case PSI_T_UINT64:
@@ -216,9 +202,6 @@ size_t psi_t_alignment(token_t t)
        case PSI_T_DOUBLE:
                PSI_TAS_CASE(double);
                break;
-       case PSI_T_SIZE_T:
-               PSI_TAS_CASE(size_t);
-               break;
        case PSI_T_POINTER:
                {
                        PSI_TAS_P(char);
@@ -236,31 +219,22 @@ size_t psi_t_size(token_t t)
        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_INT16:
        case PSI_T_UINT16:
                size = 2;
                break;
        case PSI_T_INT:
                size = sizeof(int);
                break;
-       case PSI_T_SINT32:
+       case PSI_T_INT32:
        case PSI_T_UINT32:
                size = 4;
                break;
-       case PSI_T_LONG:
-               size = sizeof(long);
-               break;
-       case PSI_T_SINT64:
+       case PSI_T_INT64:
        case PSI_T_UINT64:
                size = 8;
                break;
@@ -270,9 +244,6 @@ size_t psi_t_size(token_t t)
        case PSI_T_DOUBLE:
                size = sizeof(double);
                break;
-       case PSI_T_SIZE_T:
-               size = sizeof(size_t);
-               break;
        case PSI_T_POINTER:
                size = sizeof(char *);
                break;
@@ -307,8 +278,7 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **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);
@@ -325,11 +295,10 @@ void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
 
 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 *));
 
        if (arr) for (i = 0; i < s->args->count; ++i) {
-               decl_struct_layout *layout = &s->layout[i];
                decl_arg *darg = s->args->args[i];
                zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
 
@@ -339,9 +308,9 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 
                        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;
                        }
                }
        }
@@ -363,24 +332,36 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *va
                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;
+                       impl_val tmp, tmp_ptr;
                        zval ztmp;
-                       char *ptr = (char *) ret_val->ptr + layout.pos;
+                       char *ptr = (char *) ret_val->ptr + darg->layout->pos;
 
+                       tmp_ptr.ptr = &tmp;
                        memset(&tmp, 0, sizeof(tmp));
-                       memcpy(&tmp, ptr, layout.len);
+                       memcpy(&tmp, ptr, darg->layout->len);
                        switch (real_decl_type(darg->type)->type) {
-                       case PSI_T_CHAR:
+                       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);
+                                       psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
                                        break;
                                }
                                /* no break */
-                       case PSI_T_INT:
-                       case PSI_T_LONG:
+                       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();
@@ -428,7 +409,7 @@ ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
                                iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
                        }
                        Z_PARAM_BOOL(iarg->val.zend.bval);
-               } else if (PSI_T_INT == iarg->type->type || PSI_T_LONG == iarg->type->type) {
+               } else if (PSI_T_INT == iarg->type->type) {
                        if (iarg->def) {
                                iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
                        }
@@ -473,8 +454,8 @@ void *psi_do_calloc(let_calloc *alloc)
        size_t size;
 
        if (type->type == PSI_T_STRUCT) {
-               /* psi_do_clean expects a NULL pointer after the struct */
-               size = decl_struct_size(type->strct) + sizeof(void *);
+               /* 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);
        }
@@ -515,7 +496,7 @@ void *psi_do_let(decl_arg *darg)
                        }
                        break;
                case PSI_T_INTVAL:
-                       if (iarg->type->type == PSI_T_INT || iarg->type->type == PSI_T_LONG) {
+                       if (iarg->type->type == PSI_T_INT) {
                                arg_val->lval = iarg->val.zend.lval;
                        } else {
                                arg_val->lval = zval_get_long(iarg->_zv);
@@ -566,9 +547,9 @@ void *psi_do_let(decl_arg *darg)
        }
 }
 
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
+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;
 
        ZVAL_DEREF(return_value);
        zval_dtor(return_value);
@@ -584,10 +565,8 @@ void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
        }
 }
 
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
+void psi_do_return(return_stmt *ret, impl_val *ret_val, zval *return_value)
 {
-       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);
@@ -639,8 +618,7 @@ void psi_do_clean(impl *impl)
                        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++);