fix pointer size calculation

[m6w6/ext-psi] / src / types / decl_arg.c

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index 46ce8e01942d9dc0b248333d9d79c6d4ecde880c..1d143ee26b96974bc3aa990561d0dc96d1064d35 100644 (file)
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -61,6 +61,9 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 {
        if (arg->type->type == PSI_T_FUNCTION) {
                psi_decl_type_dump(fd, arg->type->real.func->func->type, level);
+               if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+                       dprintf(fd, "(");
+               }
                dprintf(fd, " %s(*%s)",
                                psi_t_indirection(arg->var->pointer_level - !! arg->var->array_size),
                                arg->var->name);
@@ -82,8 +85,25 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
                        }
                }
                dprintf(fd, ")");
-               if (arg->var->array_size) {
-                       dprintf(fd, "[%u]", arg->var->array_size);
+               if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+                       struct psi_decl *decl = arg->type->real.func->func->type->real.func;
+
+                       dprintf(fd, "(");
+                       if (decl->args) {
+                               size_t i;
+                               struct psi_decl_arg *arg;
+
+                               for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+                                       if (i) {
+                                               dprintf(fd, ", ");
+                                       }
+                                       psi_decl_arg_dump(fd, arg, 0);
+                               }
+                               if (decl->varargs) {
+                                       dprintf(fd, ", ...");
+                               }
+                       }
+                       dprintf(fd, "))");
                }
        } else {
                psi_decl_type_dump(fd, arg->type, level);
@@ -95,7 +115,7 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg,
                struct psi_validate_scope *scope)
 {
-       if (!psi_decl_type_validate(data, arg->type, arg, scope)) {
+       if (!psi_decl_type_validate(data, arg->type, NULL, scope)) {
                 if (!arg->var->pointer_level) {
                        data->error(data, arg->type->token, PSI_WARNING,
                                        "Cannot use '%s' as type for '%s'%s%s", arg->type->name,
@@ -148,6 +168,19 @@ bool psi_decl_arg_validate_typedef(struct psi_data *data,
        return true;
 }
 
+bool psi_decl_arg_is_pointer(struct psi_decl_arg *darg)
+{
+       if (darg->var->pointer_level) {
+               if (darg->var->array_size) {
+                       return darg->var->pointer_level > 1;
+               }
+               return true;
+       } else if (psi_decl_type_is_weak(darg->type) && darg->type->real.def) {
+               return psi_decl_arg_is_pointer(darg->type->real.def);
+       }
+       return false;
+}
+
 size_t psi_decl_arg_align(struct psi_decl_arg *darg, size_t *pos, size_t *len)
 {
        size_t align = psi_decl_arg_get_align(darg);
@@ -164,8 +197,7 @@ size_t psi_decl_arg_get_align(struct psi_decl_arg *darg)
 {
        size_t align;
 
-       if (darg->var->pointer_level
-                       && (!darg->var->array_size || darg->var->pointer_level > 1)) {
+       if (psi_decl_arg_is_pointer(darg)) {
                align = psi_t_alignment(PSI_T_POINTER);
        } else {
                align = psi_decl_type_get_align(darg->type);
@@ -181,7 +213,7 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
 
        if (darg->var->array_size && darg->var->pointer_level > 1) {
                size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
-       } else if (!darg->var->array_size && darg->var->pointer_level) {
+       } else if (psi_decl_arg_is_pointer(darg)) {
                size = psi_t_size(PSI_T_POINTER);
        } else {
                switch (real->type) {