projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: fix self-dump validation
[m6w6/ext-psi]
/
src
/
types
/
decl_struct.c
diff --git
a/src/types/decl_struct.c
b/src/types/decl_struct.c
index ab0d9a1a9fe2545d6bcbea572e1f81e952fe7d94..fab2817669690c0ea7e208795d52eaf73f759f7e 100644
(file)
--- a/
src/types/decl_struct.c
+++ b/
src/types/decl_struct.c
@@
-78,21
+78,35
@@
struct psi_decl_arg *psi_decl_struct_get_arg(struct psi_decl_struct *s,
return NULL;
}
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;
struct psi_decl_arg *darg, *prev_arg;
{
size_t i, pos, len, size, align;
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)) {
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;
}
return false;
}
+ psi_validate_scope_add_struct(scope, s->name, s);
+
for (i = 0; psi_plist_get(s->args, i, &darg); ++i) {
darg->var->arg = darg;
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, scope)) {
+ psi_validate_scope_del_struct(scope, s->name);
return false;
}
return false;
}
@@
-100,6
+114,14
@@
bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
pos = darg->layout->pos;
align = psi_decl_arg_align(darg, &pos, &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);
+ 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"
if (darg->layout->len != len) {
data->error(data, darg->token, PSI_WARNING,
"Computed size %zu of %s.%s does not match"
@@
-115,7
+137,7
@@
bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
}
} else {
if (i) {
}
} 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);
struct psi_decl_type *real = NULL;
size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
@@
-132,6
+154,7
@@
bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
default:
data->error(data, darg->token, PSI_WARNING,
"Unsupported type for bit field: %s", real->name);
default:
data->error(data, darg->token, PSI_WARNING,
"Unsupported type for bit field: %s", real->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;
return false;
}
darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
@@
-180,11
+203,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)
{
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);
}
if (!s->align) {
s->align = psi_decl_type_get_args_align(s->args);
}