X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_struct.c;h=cfe46c91e5b535b1807b88d8d5532696d5b7ce37;hp=bdee3fec00ae58168477a0bb2b6347e041b2a208;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84 diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c index bdee3fe..cfe46c9 100644 --- a/src/types/decl_struct.c +++ b/src/types/decl_struct.c @@ -28,11 +28,11 @@ #include -struct psi_decl_struct* psi_decl_struct_init(const char *name, +struct psi_decl_struct* psi_decl_struct_init(zend_string *name, struct psi_plist *args) { struct psi_decl_struct *s = calloc(1, sizeof(*s)); - s->name = strdup(name); + s->name = zend_string_copy(name); s->args = args; return s; } @@ -43,23 +43,21 @@ void psi_decl_struct_free(struct psi_decl_struct **s_ptr) struct psi_decl_struct *s = *s_ptr; *s_ptr = NULL; - if (s->token) { - free(s->token); - } + psi_token_free(&s->token); if (s->args) { psi_plist_free(s->args); } if (s->engine.type && s->engine.dtor) { s->engine.dtor(s->engine.type); } - free(s->name); + zend_string_release(s->name); free(s); } } void psi_decl_struct_dump(int fd, struct psi_decl_struct *strct) { - dprintf(fd, "struct %s::(%zu, %zu)", strct->name, strct->align, + dprintf(fd, "struct %s::(%zu, %zu)", strct->name->val, strct->align, strct->size); if (psi_plist_count(strct->args)) { psi_decl_type_dump_args_with_layout(fd, strct->args, 0); @@ -78,50 +76,119 @@ struct psi_decl_arg *psi_decl_struct_get_arg(struct psi_decl_struct *s, return NULL; } -bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s) +bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s, + struct psi_validate_scope *scope) { - size_t i, pos, len, size, align; + size_t i, pos = 0, len = 0; struct psi_decl_arg *darg, *prev_arg; + if (!s) { + return false; + } + if (psi_validate_scope_has_struct(scope, s->name)) { + return true; + } + if (!s->size && !psi_plist_count(s->args)) { - data->error(data, s->token, PSI_WARNING, - "Cannot compute size of empty struct '%s'", s->name); + /* TODO: return true and check those structs are only used by address */ + /* suppress needless warning + data->error(data, s->token, PSI_WARNING, "Empty struct %s", + s->name); + */ return false; } + psi_validate_scope_add_struct(scope, s->name, s); + for (i = 0; psi_plist_get(s->args, i, &darg); ++i) { + size_t align; + darg->var->arg = darg; - if (!psi_decl_arg_validate(data, darg)) { + if (!psi_decl_arg_validate(data, darg, scope)) { + psi_validate_scope_del_struct(scope, s->name); return false; } - if (darg->layout) { + if (darg->layout && darg->layout->len) { pos = darg->layout->pos; align = psi_decl_arg_align(darg, &pos, &len); + if (!align) { + data->error(data, darg->token, PSI_WARNING, + "Computed zero alignment of %s.%s of type '%s'", + len, s->name->val, darg->var->name->val, + darg->type->name->val); + psi_validate_scope_del_struct(scope, s->name); + return false; + } + if (darg->layout->len != len) { data->error(data, darg->token, PSI_WARNING, "Computed size %zu of %s.%s does not match" " pre-defined size %zu of type '%s'", - len, s->name, darg->var->name, darg->layout->len, - darg->type->name); + len, s->name->val, darg->var->name->val, + darg->layout->len, darg->type->name->val); } if (darg->layout->pos != pos) { data->error(data, darg->token, PSI_WARNING, "Computed offset %zu of %s.%s does not match" " pre-defined offset %zu", - pos, s->name, darg->var->name, darg->layout->pos); + pos, s->name->val, darg->var->name->val, + darg->layout->pos); } } else { if (i) { - pos = prev_arg->layout->pos + prev_arg->layout->len; + if (prev_arg->layout && prev_arg->layout->bfw && darg->layout && darg->layout->bfw) { + struct psi_decl_type *real = NULL; + size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real); + + switch (real->type) { + case PSI_T_INT8: + case PSI_T_UINT8: + case PSI_T_INT16: + case PSI_T_UINT16: + case PSI_T_INT32: + case PSI_T_UINT32: + case PSI_T_INT64: + case PSI_T_UINT64: + break; + default: + data->error(data, darg->token, PSI_WARNING, + "Unsupported type for bit field: %s", + real->name->val); + psi_validate_scope_del_struct(scope, s->name); + return false; + } + darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len; + if (max_bfw >= darg->layout->bfw->pos + darg->layout->bfw->len) { + pos = prev_arg->layout->pos; + } else { + darg->layout->bfw->pos = 0; + pos = prev_arg->layout->pos + prev_arg->layout->len; + } + } else { + pos = prev_arg->layout->pos + prev_arg->layout->len; + } } else { pos = 0; } align = psi_decl_arg_align(darg, &pos, &len); - darg->layout = psi_layout_init(pos, len); + + if (darg->layout) { + if (darg->layout->pos != pos) { + data->error(data, darg->token, PSI_WARNING, + "Computed offset %zu of %s.%s does not match" + " pre-defined offset %zu", + pos, s->name->val, darg->var->name->val, + darg->layout->pos); + } + darg->layout->pos = pos; + darg->layout->len = len; + } else { + darg->layout = psi_layout_init(pos, len, NULL); + } } if (align > s->align) { @@ -131,6 +198,8 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s) } if (psi_plist_count(s->args)) { + size_t size; + psi_plist_sort(s->args, psi_layout_sort_cmp, NULL); psi_plist_get(s->args, psi_plist_count(s->args) - 1, &darg); @@ -140,11 +209,16 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s) } } + assert(s->size); + return true; } size_t psi_decl_struct_get_align(struct psi_decl_struct *s) { + if (!s) { + return 0; + } if (!s->align) { s->align = psi_decl_type_get_args_align(s->args); }