@@ -292,6 +292,43 @@ static void check_symbols(struct symbol_
exit(1);
}
+static void list_compound_symbols(struct symbol_list *list)
+{
+ struct symbol *sym, *base;
+
+ /* Only show arrays, structures, unions */
+ FOR_EACH_PTR(list, sym) {
+ /* Only show symbols that have a non-zero size */
+ if (!sym->bit_size)
+ continue;
+ if (!sym->ctype.base_type)
+ continue;
+ if (is_func_type(sym))
+ continue;
+ if (is_float_type(sym) || is_scalar_type(sym))
+ continue;
+ /* Don't show unnamed types */
+ if (!sym->ident)
+ continue;
+
+ if (sym->type == SYM_NODE)
+ base = sym->ctype.base_type;
+ else
+ base = sym;
+ switch (base->type) {
+ case SYM_STRUCT: case SYM_UNION: case SYM_ARRAY:
+ break;
+ default:
+ continue;
+ }
+
+ info(sym->pos, "%s: compound size %u, alignment %lu",
+ show_typename(sym),
+ bits_to_bytes(sym->bit_size),
+ sym->ctype.alignment);
+ } END_FOR_EACH_PTR(sym);
+}
+
int main(int argc, char **argv)
{
struct string_list *filelist = NULL;
@@ -300,7 +337,12 @@ int main(int argc, char **argv)
// Expand, linearize and show it.
check_symbols(sparse_initialize(argc, argv, &filelist));
FOR_EACH_PTR_NOTAG(filelist, file) {
- check_symbols(sparse(file));
+ struct symbol_list *res = sparse(file);
+
+ check_symbols(res);
+
+ if (dbg_compound)
+ list_compound_symbols(res);
} END_FOR_EACH_PTR_NOTAG(file);
report_stats();
@@ -257,6 +257,7 @@ int dump_macro_defs = 0;
int dbg_entry = 0;
int dbg_dead = 0;
+int dbg_compound = 0;
int fmem_report = 0;
int fdump_linearize;
@@ -598,6 +599,7 @@ static char **handle_switch_W(char *arg,
static struct warning debugs[] = {
{ "entry", &dbg_entry},
{ "dead", &dbg_dead},
+ { "compound", &dbg_compound},
};
@@ -150,6 +150,7 @@ extern int dump_macro_defs;
extern int dbg_entry;
extern int dbg_dead;
+extern int dbg_compound;
extern int fmem_report;
extern int fdump_linearize;
@@ -0,0 +1,87 @@
+// This tests sparse "-vcompound" output.
+
+#include <stdlib.h>
+#include <stdint.h>
+
+// Do not list functions.
+static int do_nothing(void)
+{}
+
+// no:
+static inline int zero(void)
+{
+ return 0 / 1;
+}
+
+// no:
+struct inventory {
+ unsigned char description[64];
+ unsigned char department[64];
+ uint32_t dept_number;
+ uint32_t item_cost;
+ uint64_t stock_number;
+ uint32_t tally[12]; // per month
+};
+
+// no
+static struct inventory *get_inv(uint64_t stocknum)
+{
+ return NULL;
+}
+
+// no
+union un {
+ struct inventory inv;
+ unsigned char bytes[0];
+};
+
+// yes
+static union un un;
+
+// yes
+static struct inventory inven[100];
+
+// no
+typedef struct inventory inventory_t;
+
+// no
+static struct inventory *invptr;
+
+// yes
+static inventory_t invent[10];
+
+// no
+static float floater;
+static double double_float;
+
+// yes
+static float floats[42];
+static double doubles[84];
+
+// no
+int main(void)
+{
+ // no, these are not global.
+ struct inventory inv[10];
+ inventory_t invt[10];
+ // what about statics?
+ static struct inventory invtop;
+ static inventory_t inv_top;
+ static uint64_t stocknums[100];
+
+ invptr = get_inv(42000);
+ return 0;
+}
+
+/*
+ * check-name: compound-sizes
+ * check-command: sparse -vcompound $file
+ *
+ * check-error-start
+compound-sizes.c:39:17: union un static [toplevel] un: compound size 192, alignment 8
+compound-sizes.c:42:25: struct inventory static [toplevel] inven[100]: compound size 19200, alignment 8
+compound-sizes.c:51:33: struct inventory static [toplevel] [usertype] invent[10]: compound size 1920, alignment 8
+compound-sizes.c:58:25: float static [toplevel] floats[42]: compound size 168, alignment 4
+compound-sizes.c:59:25: double static [toplevel] doubles[84]: compound size 672, alignment 8
+ * check-error-end
+ */