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;
}
- 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, 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) {
- 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);
+ 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, darg->var->name, darg->layout->pos);
+ }
+ darg->layout->pos = pos;
+ darg->layout->len = len;
+ } else {
+ darg->layout = psi_layout_init(pos, len, NULL);
+ }
}
if (align > s->align) {
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);
}