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_stack *type_stack)
{
size_t i, pos, len, size, align;
struct psi_decl_arg *darg, *prev_arg;
+ if (!s) {
+ return false;
+ }
+ if (psi_validate_stack_has_struct(type_stack, s->name)) {
+ return true;
+ }
+ psi_validate_stack_add_struct(type_stack, s->name, s);
+
if (!s->size && !psi_plist_count(s->args)) {
data->error(data, s->token, PSI_WARNING,
"Cannot compute size of empty struct '%s'", s->name);
for (i = 0; psi_plist_get(s->args, i, &darg); ++i) {
darg->var->arg = darg;
- if (!psi_decl_arg_validate(data, darg)) {
+ if (!psi_decl_arg_validate(data, darg, type_stack)) {
return false;
}
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, darg->var->name, darg->type->name);
+ return false;
+ }
+
if (darg->layout->len != len) {
data->error(data, darg->token, PSI_WARNING,
"Computed size %zu of %s.%s does not match"
}
} else {
if (i) {
- if (prev_arg->layout->bfw && darg->layout->bfw) {
+ 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);
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);
}