fix retval

[m6w6/ext-psi] / src / parser.h

diff --git a/src/parser.h b/src/parser.h
index 3b4c77faca030b0bef00ce37f9219c0f8ad52880..d8955e56d2294394b996f260bc98b040d7ea59fe 100644 (file)
--- a/src/parser.h
+++ b/src/parser.h
@@ -234,7 +234,12 @@ typedef struct decl {
        decl_abi *abi;
        decl_arg *func;
        decl_args *args;
-       void *dlptr;
+       struct impl *impl;
+       struct {
+               void *sym;
+               void *info;
+               void **args;
+       } call;
 } decl;
 
 static inline decl* init_decl(decl_abi *abi, decl_arg *func, decl_args *args) {
@@ -356,10 +361,10 @@ static inline impl_val *enref_impl_val(void *ptr, decl_var *var) {
        impl_val *val, *val_ptr;
        unsigned i;
 
-       if (!var->pointer_level) {
+       if (!var->pointer_level && real_decl_type(var->arg->type)->type != PSI_T_STRUCT) {
                return ptr;
        }
-       val = val_ptr = calloc(var->pointer_level, sizeof(void *));
+       val = val_ptr = calloc(var->pointer_level + 1, sizeof(void *));
        for (i = 1; i < var->pointer_level; ++i) {
                val_ptr->ptr = (void **) val_ptr + 1;
                val_ptr = val_ptr->ptr;
@@ -674,19 +679,68 @@ static inline void free_return_stmt(return_stmt *ret) {
        free(ret);
 }
 
-typedef struct free_stmt {
+typedef struct free_call {
+       char *func;
        decl_vars *vars;
+       decl *decl;
+} free_call;
+
+static inline free_call *init_free_call(const char *func, decl_vars *vars) {
+       free_call *f = calloc(1, sizeof(*f));
+       f->func = strdup(func);
+       f->vars = vars;
+       return f;
+}
+
+static inline void free_free_call(free_call *f) {
+       free(f->func);
+       free(f);
+}
+
+typedef struct free_calls {
+       free_call **list;
+       size_t count;
+} free_calls;
+
+static inline free_calls *init_free_calls(free_call *f) {
+       free_calls *fcs = calloc(1, sizeof(*fcs));
+       if (f) {
+               fcs->count = 1;
+               fcs->list = calloc(1, sizeof(*fcs->list));
+               fcs->list[0] = f;
+       }
+       return fcs;
+}
+
+static inline void free_free_calls(free_calls *fcs) {
+       size_t i;
+
+       for (i = 0; i < fcs->count; ++i) {
+               free_free_call(fcs->list[i]);
+       }
+       free(fcs->list);
+       free(fcs);
+}
+
+static inline free_calls *add_free_call(free_calls *fcs, free_call *f) {
+       fcs->list = realloc(fcs->list, ++fcs->count * sizeof(*fcs->list));
+       fcs->list[fcs->count-1] = f;
+       return fcs;
+}
+
+typedef struct free_stmt {
+       free_calls *calls;
 } free_stmt;
 
-static inline free_stmt *init_free_stmt(decl_vars *vars) {
-       free_stmt *free_ = calloc(1, sizeof(*free_));
-       free_->vars = vars;
-       return free_;
+static inline free_stmt *init_free_stmt(free_calls *calls) {
+       free_stmt *f = calloc(1, sizeof(*f));
+       f->calls = calls;
+       return f;
 }
 
-static inline void free_free_stmt(free_stmt *free_) {
-       free_decl_vars(free_->vars);
-       free(free_);
+static inline void free_free_stmt(free_stmt *f) {
+       free_free_calls(f->calls);
+       free(f);
 }
 
 typedef struct impl_stmt {