X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_arg.c;h=e62edf0b1fcf396745a9b076bfd7bc8c4369c181;hb=cffcbdd1df9f6d5dcf78f49a3d1b44cefe21b2f5;hp=61aacef3641ad2b0b205449273a9a86b8d3e25b3;hpb=848d77002c2c0451ccb76b9059cb352fabbdd8bc;p=m6w6%2Fext-psi diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c index 61aacef..e62edf0 100644 --- a/src/types/decl_arg.c +++ b/src/types/decl_arg.c @@ -165,7 +165,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 > 2)) { + && (!darg->var->array_size || darg->var->pointer_level > 1)) { align = psi_t_alignment(PSI_T_POINTER); } else { align = psi_decl_type_get_align(darg->type); @@ -179,12 +179,8 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg) size_t size; struct psi_decl_type *real = psi_decl_type_get_real(darg->type); - if (darg->var->array_size) { - if (darg->var->pointer_level > 2) { - size = psi_t_size(PSI_T_POINTER) * darg->var->array_size; - } else { - size = psi_t_size(real->type) * darg->var->array_size; - } + 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->pointer_level) { size = psi_t_size(PSI_T_POINTER); } else { @@ -200,6 +196,10 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg) size = psi_t_size(real->type); break; } + + if (darg->var->array_size) { + size *= darg->var->array_size; + } } return size;