@@ -156,6 +156,19 @@ int die_map_add_string(struct die *cd, const char *str)
return 0;
}
+int die_map_add_linebreak(struct die *cd, int linebreak)
+{
+ struct die_fragment *df;
+
+ if (!cd)
+ return 0;
+
+ check(append_item(cd, &df));
+ df->data.linebreak = linebreak;
+ df->type = LINEBREAK;
+ return 0;
+}
+
int die_map_add_die(struct die *cd, struct die *child)
{
struct die_fragment *df;
@@ -5,6 +5,17 @@
#include "gendwarfksyms.h"
+static bool do_linebreak;
+static int indentation_level;
+
+/* Line breaks and indentation for pretty-printing */
+static int process_linebreak(struct die *cache, int n)
+{
+ indentation_level += n;
+ do_linebreak = true;
+ return check(die_map_add_linebreak(cache, n));
+}
+
#define DEFINE_GET_ATTR(attr, type) \
static bool get_##attr##_attr(Dwarf_Die *die, unsigned int id, \
type *value) \
@@ -65,6 +76,12 @@ static int process(struct state *state, struct die *cache, const char *s)
{
s = s ?: "<null>";
+ if (debug && do_linebreak) {
+ fputs("\n", stderr);
+ for (int i = 0; i < indentation_level; i++)
+ fputs(" ", stderr);
+ do_linebreak = false;
+ }
if (debug)
fputs(s, stderr);
@@ -230,6 +247,40 @@ static int process_type_attr(struct state *state, struct die *cache,
return check(process(state, cache, "base_type void"));
}
+/* Container types with DW_AT_type */
+static int __process_type(struct state *state, struct die *cache,
+ Dwarf_Die *die, const char *type)
+{
+ check(process(state, cache, type));
+ check(process_fqn(state, cache, die));
+ check(process(state, cache, " {"));
+ check(process_linebreak(cache, 1));
+ check(process_type_attr(state, cache, die));
+ check(process_linebreak(cache, -1));
+ check(process(state, cache, "}"));
+ check(process_byte_size_attr(state, cache, die));
+ return check(process_alignment_attr(state, cache, die));
+}
+
+#define DEFINE_PROCESS_TYPE(type) \
+ static int process_##type##_type(struct state *state, \
+ struct die *cache, Dwarf_Die *die) \
+ { \
+ return __process_type(state, cache, die, #type "_type "); \
+ }
+
+DEFINE_PROCESS_TYPE(atomic)
+DEFINE_PROCESS_TYPE(const)
+DEFINE_PROCESS_TYPE(immutable)
+DEFINE_PROCESS_TYPE(packed)
+DEFINE_PROCESS_TYPE(pointer)
+DEFINE_PROCESS_TYPE(reference)
+DEFINE_PROCESS_TYPE(restrict)
+DEFINE_PROCESS_TYPE(rvalue_reference)
+DEFINE_PROCESS_TYPE(shared)
+DEFINE_PROCESS_TYPE(volatile)
+DEFINE_PROCESS_TYPE(typedef)
+
static int process_base_type(struct state *state, struct die *cache,
Dwarf_Die *die)
{
@@ -251,6 +302,9 @@ static int process_cached(struct state *state, struct die *cache,
case STRING:
check(process(state, NULL, df->data.str));
break;
+ case LINEBREAK:
+ check(process_linebreak(NULL, df->data.linebreak));
+ break;
case DIE:
if (!dwarf_die_addr_die(state->dbg,
(void *)df->data.addr,
@@ -270,6 +324,11 @@ static int process_cached(struct state *state, struct die *cache,
return 0;
}
+#define PROCESS_TYPE(type) \
+ case DW_TAG_##type##_type: \
+ check(process_##type##_type(state, cache, die)); \
+ break;
+
static int process_type(struct state *state, struct die *parent, Dwarf_Die *die)
{
struct die *cache = NULL;
@@ -288,9 +347,20 @@ static int process_type(struct state *state, struct die *parent, Dwarf_Die *die)
}
switch (tag) {
- case DW_TAG_base_type:
- check(process_base_type(state, cache, die));
- break;
+ /* Type modifiers */
+ PROCESS_TYPE(atomic)
+ PROCESS_TYPE(const)
+ PROCESS_TYPE(immutable)
+ PROCESS_TYPE(packed)
+ PROCESS_TYPE(pointer)
+ PROCESS_TYPE(reference)
+ PROCESS_TYPE(restrict)
+ PROCESS_TYPE(rvalue_reference)
+ PROCESS_TYPE(shared)
+ PROCESS_TYPE(volatile)
+ /* Other types */
+ PROCESS_TYPE(base)
+ PROCESS_TYPE(typedef)
default:
debug("unimplemented type: %x", tag);
break;
@@ -58,6 +58,9 @@ extern bool debug;
/* Error == negative values */
#define checkp(expr) __check(expr, __res < 0, __res)
+/* Consistent aliases (DW_TAG_<type>_type) for DWARF tags */
+#define DW_TAG_typedef_type DW_TAG_typedef
+
/*
* symbols.c
*/
@@ -98,12 +101,13 @@ extern struct symbol *symbol_get(const char *name);
*/
enum die_state { INCOMPLETE, COMPLETE, LAST = COMPLETE };
-enum die_fragment_type { EMPTY, STRING, DIE };
+enum die_fragment_type { EMPTY, STRING, LINEBREAK, DIE };
struct die_fragment {
enum die_fragment_type type;
union {
char *str;
+ int linebreak;
uintptr_t addr;
} data;
struct die_fragment *next;
@@ -136,6 +140,7 @@ extern int __die_map_get(uintptr_t addr, enum die_state state,
struct die **res);
extern int die_map_get(Dwarf_Die *die, enum die_state state, struct die **res);
extern int die_map_add_string(struct die *pd, const char *str);
+extern int die_map_add_linebreak(struct die *pd, int linebreak);
extern int die_map_add_die(struct die *pd, struct die *child);
extern void die_map_free(void);
Add support for expanding DWARF type modifiers, such as pointers, const values etc., and typedefs. These types all have DW_AT_type attribute pointing to the underlying type, and thus produce similar output. Also add linebreaks and indentation to debugging output to make it more readable. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> --- scripts/gendwarfksyms/die.c | 13 +++++ scripts/gendwarfksyms/dwarf.c | 76 +++++++++++++++++++++++++-- scripts/gendwarfksyms/gendwarfksyms.h | 7 ++- 3 files changed, 92 insertions(+), 4 deletions(-)