}
bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
- struct psi_validate_stack *type_stack)
+ 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_stack_has_struct(type_stack, s->name)) {
+ if (psi_validate_scope_has_struct(scope, s->name)) {
return true;
}
if (!s->size && !psi_plist_count(s->args)) {
+ /* 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_stack_add_struct(type_stack, s->name, s);
+ 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, type_stack)) {
- psi_validate_stack_del_struct(type_stack, s->name);
+ if (!psi_decl_arg_validate(data, darg, scope)) {
+ psi_validate_scope_del_struct(scope, s->name);
return false;
}
data->error(data, darg->token, PSI_WARNING,
"Computed zero alignment of %s.%s of type '%s'",
len, s->name, darg->var->name, darg->type->name);
- psi_validate_stack_del_struct(type_stack, s->name);
+ psi_validate_scope_del_struct(scope, s->name);
return false;
}
default:
data->error(data, darg->token, PSI_WARNING,
"Unsupported type for bit field: %s", real->name);
- psi_validate_stack_del_struct(type_stack, s->name);
+ 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 (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);