working gmtime

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

diff --git a/src/module.c b/src/module.c
index 4d6e5c9f03ca4b1c093e2f7bd51982b667003510..6674272a8f0a1231569d03bf8502f7a4080767ef 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -142,6 +142,80 @@ void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
        }
 }
 
+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_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);
+               break;
+       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);
+                       PSI_TAS_C(char_pointer);
+               }
+               break;
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
+
+       return align;
+}
+
 size_t psi_t_size(token_t t)
 {
        size_t size;
@@ -181,11 +255,23 @@ 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;
        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;
+}
+
 static impl_val *iterate(impl_val *val, token_t t, unsigned i, impl_val *tmp)
 {
        size_t size = psi_t_size(t);
@@ -200,9 +286,39 @@ void psi_to_array(impl_val *ret_val, decl_arg *func, zval *return_value)
        zval ele;
        unsigned i;
        impl_val tmp;
-       token_t t = real_decl_type(func->type)->type;
+       decl_type *type = real_decl_type(func->type);
+       token_t t = type->type;
+       printf("%d:%s real=%p,strct=%p\n", t, type->name, type->real, type->strct);
 
        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);
+
+               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();
+                       }
+                       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) {
                impl_val *ptr = iterate(ret_val, t, i, &tmp);
@@ -371,6 +487,9 @@ void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
        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();
        }
 }