Builds on a patch proposed by Frank Rowand: https://www.mail-archive.com/devicetree-compiler@xxxxxxxxxxxxxxx/msg00372.html Added NULL position argument in a few new places in dtc-parser.tab.c (1) and livetree.c (3). For both '/' nodedef productions, include the '/' in the position. Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> --- dtc-parser.y | 23 +++++++++++++---------- dtc.c | 10 ++++++++++ dtc.h | 14 ++++++++++---- flattree.c | 2 +- fstree.c | 8 +++++--- livetree.c | 43 ++++++++++++++++++++++++++++++------------- srcpos.c | 35 +++++++++++++++++++++++++++++++++++ srcpos.h | 3 +++ treesource.c | 38 +++++++++++++++++++++++++++++++++----- 9 files changed, 140 insertions(+), 36 deletions(-) diff --git a/dtc-parser.y b/dtc-parser.y index 44af170..d668349 100644 --- a/dtc-parser.y +++ b/dtc-parser.y @@ -160,11 +160,11 @@ memreserve: devicetree: '/' nodedef { - $$ = name_node($2, ""); + $$ = name_node($2, "", &@$); } | devicetree '/' nodedef { - $$ = merge_nodes($1, $3); + $$ = merge_nodes($1, $3, srcpos_combine(&@2, &@3)); } | DT_REF nodedef { @@ -175,7 +175,10 @@ devicetree: */ if (!($<flags>-1 & DTSF_PLUGIN)) ERROR(&@2, "Label or path %s not found", $1); - $$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1); + $$ = add_orphan_node( + name_node(build_node(NULL, NULL), "", + NULL), + $2, $1, &@2); } | devicetree DT_LABEL DT_REF nodedef { @@ -183,7 +186,7 @@ devicetree: if (target) { add_label(&target->labels, $2); - merge_nodes(target, $4); + merge_nodes(target, $4, &@4); } else ERROR(&@3, "Label or path %s not found", $3); $$ = $1; @@ -193,7 +196,7 @@ devicetree: struct node *target = get_node_by_ref($1, $2); if (target) { - merge_nodes(target, $3); + merge_nodes(target, $3, &@3); } else { /* * We rely on the rule being always: @@ -201,7 +204,7 @@ devicetree: * so $-1 is what we want (plugindecl) */ if ($<flags>-1 & DTSF_PLUGIN) - add_orphan_node($1, $3, $2); + add_orphan_node($1, $3, $2, &@3); else ERROR(&@2, "Label or path %s not found", $2); } @@ -242,11 +245,11 @@ proplist: propdef: DT_PROPNODENAME '=' propdata ';' { - $$ = build_property($1, $3); + $$ = build_property($1, $3, &@$); } | DT_PROPNODENAME ';' { - $$ = build_property($1, empty_data); + $$ = build_property($1, empty_data, &@$); } | DT_DEL_PROP DT_PROPNODENAME ';' { @@ -517,11 +520,11 @@ subnodes: subnode: DT_PROPNODENAME nodedef { - $$ = name_node($2, $1); + $$ = name_node($2, $1, &@$); } | DT_DEL_NODE DT_PROPNODENAME ';' { - $$ = name_node(build_node_delete(), $2); + $$ = name_node(build_node_delete(), $2, &@$); } | DT_LABEL subnode { diff --git a/dtc.c b/dtc.c index c36994e..371d04c 100644 --- a/dtc.c +++ b/dtc.c @@ -35,6 +35,7 @@ int phandle_format = PHANDLE_EPAPR; /* Use linux,phandle or phandle properties * int generate_symbols; /* enable symbols & fixup support */ int generate_fixups; /* suppress generation of fixups on symbol support */ int auto_label_aliases; /* auto generate labels -> aliases */ +bool annotate = false; /* annotate .dts with input source location */ static int is_power_of_2(int x) { @@ -83,6 +84,7 @@ static struct option const usage_long_opts[] = { {"auto-alias", no_argument, NULL, 'A'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'v'}, + {"annotate", no_argument, NULL, 'T'}, {NULL, no_argument, NULL, 0x0}, }; static const char * const usage_opts_help[] = { @@ -116,6 +118,7 @@ static const char * const usage_opts_help[] = { "\n\tEnable auto-alias of labels", "\n\tPrint this help and exit", "\n\tPrint version and exit", + "\n\tAnnotate output .dts with input source file and line", NULL, }; @@ -185,6 +188,9 @@ int main(int argc, char *argv[]) while ((opt = util_getopt_long()) != EOF) { switch (opt) { + case 'T': + annotate = true; + break; case 'I': inform = optarg; break; @@ -297,6 +303,10 @@ int main(int argc, char *argv[]) outform = "dts"; } } + + if (annotate && (!streq(inform, "dts") || !streq(outform, "dts"))) + die("--annotate requires -I dts -O dts\n"); + if (streq(inform, "dts")) dti = dt_from_source(arg); else if (streq(inform, "fs")) diff --git a/dtc.h b/dtc.h index 3b18a42..e7121ef 100644 --- a/dtc.h +++ b/dtc.h @@ -58,6 +58,7 @@ extern int phandle_format; /* Use linux,phandle or phandle properties */ extern int generate_symbols; /* generate symbols for nodes with labels */ extern int generate_fixups; /* generate fixups */ extern int auto_label_aliases; /* auto generate labels -> aliases */ +extern bool annotate; /* annotate .dts with input source location */ #define PHANDLE_LEGACY 0x1 #define PHANDLE_EPAPR 0x2 @@ -149,6 +150,7 @@ struct property { struct property *next; struct label *labels; + struct srcpos *srcpos; }; struct node { @@ -168,6 +170,7 @@ struct node { struct label *labels; const struct bus_type *bus; + struct srcpos *srcpos; }; #define for_each_label_withdel(l0, l) \ @@ -194,17 +197,20 @@ struct node { void add_label(struct label **labels, char *label); void delete_labels(struct label **labels); -struct property *build_property(char *name, struct data val); +struct property *build_property(char *name, struct data val, + struct srcpos *srcpos); struct property *build_property_delete(char *name); struct property *chain_property(struct property *first, struct property *list); struct property *reverse_properties(struct property *first); struct node *build_node(struct property *proplist, struct node *children); struct node *build_node_delete(void); -struct node *name_node(struct node *node, char *name); +struct node *name_node(struct node *node, char *name, struct srcpos *srcpos); struct node *chain_node(struct node *first, struct node *list); -struct node *merge_nodes(struct node *old_node, struct node *new_node); -struct node *add_orphan_node(struct node *old_node, struct node *new_node, char *ref); +struct node *merge_nodes(struct node *old_node, struct node *new_node, + struct srcpos *srcpos); +struct node *add_orphan_node(struct node *old_node, struct node *new_node, + char *ref, struct srcpos *srcpos); void add_property(struct node *node, struct property *prop); void delete_property_by_name(struct node *node, char *name); diff --git a/flattree.c b/flattree.c index 8d268fb..f35ff5e 100644 --- a/flattree.c +++ b/flattree.c @@ -692,7 +692,7 @@ static struct property *flat_read_property(struct inbuf *dtbuf, val = flat_read_data(dtbuf, proplen); - return build_property(name, val); + return build_property(name, val, NULL); } diff --git a/fstree.c b/fstree.c index ae7d06c..da7e537 100644 --- a/fstree.c +++ b/fstree.c @@ -60,7 +60,8 @@ static struct node *read_fstree(const char *dirname) } else { prop = build_property(xstrdup(de->d_name), data_copy_file(pfile, - st.st_size)); + st.st_size), + NULL); add_property(tree, prop); fclose(pfile); } @@ -68,7 +69,8 @@ static struct node *read_fstree(const char *dirname) struct node *newchild; newchild = read_fstree(tmpname); - newchild = name_node(newchild, xstrdup(de->d_name)); + newchild = name_node(newchild, xstrdup(de->d_name), + NULL); add_child(tree, newchild); } @@ -84,7 +86,7 @@ struct dt_info *dt_from_fs(const char *dirname) struct node *tree; tree = read_fstree(dirname); - tree = name_node(tree, ""); + tree = name_node(tree, "", NULL); return build_dt_info(DTSF_V1, NULL, tree, guess_boot_cpuid(tree)); } diff --git a/livetree.c b/livetree.c index 57b7db2..eb40c36 100644 --- a/livetree.c +++ b/livetree.c @@ -19,6 +19,7 @@ */ #include "dtc.h" +#include "srcpos.h" /* * Tree building functions @@ -50,7 +51,8 @@ void delete_labels(struct label **labels) label->deleted = 1; } -struct property *build_property(char *name, struct data val) +struct property *build_property(char *name, struct data val, + struct srcpos *srcpos) { struct property *new = xmalloc(sizeof(*new)); @@ -58,6 +60,7 @@ struct property *build_property(char *name, struct data val) new->name = name; new->val = val; + new->srcpos = srcpos_copy_all(srcpos); return new; } @@ -125,16 +128,18 @@ struct node *build_node_delete(void) return new; } -struct node *name_node(struct node *node, char *name) +struct node *name_node(struct node *node, char *name, struct srcpos *srcpos) { assert(node->name == NULL); node->name = name; + node->srcpos = srcpos_copy_all(srcpos); return node; } -struct node *merge_nodes(struct node *old_node, struct node *new_node) +struct node *merge_nodes(struct node *old_node, struct node *new_node, + struct srcpos *new_node_begin_srcpos) { struct property *new_prop, *old_prop; struct node *new_child, *old_child; @@ -169,6 +174,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) old_prop->val = new_prop->val; old_prop->deleted = 0; + old_prop->srcpos = new_prop->srcpos; free(new_prop); new_prop = NULL; break; @@ -198,7 +204,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) /* Search for a collision. Merge if there is */ for_each_child_withdel(old_node, old_child) { if (streq(old_child->name, new_child->name)) { - merge_nodes(old_child, new_child); + merge_nodes(old_child, new_child, + new_child->srcpos); new_child = NULL; break; } @@ -209,6 +216,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) add_child(old_node, new_child); } + old_node->srcpos = srcpos_copy_all(new_node_begin_srcpos); + /* The new node contents are now merged into the old node. Free * the new node. */ free(new_node); @@ -216,7 +225,8 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node) return old_node; } -struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref) +struct node *add_orphan_node(struct node *dt, struct node *new_node, char *ref, + struct srcpos *srcpos) { static unsigned int next_orphan_fragment = 0; struct node *node; @@ -227,13 +237,13 @@ struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref) d = data_add_marker(d, REF_PHANDLE, ref); d = data_append_integer(d, 0xffffffff, 32); - p = build_property("target", d); + p = build_property("target", d, srcpos); xasprintf(&name, "fragment@%u", next_orphan_fragment++); - name_node(new_node, "__overlay__"); + name_node(new_node, "__overlay__", srcpos); node = build_node(p, new_node); - name_node(node, name); + name_node(node, name, srcpos); add_child(dt, node); return dt; @@ -331,7 +341,8 @@ void append_to_property(struct node *node, p->val = d; } else { d = data_append_data(empty_data, data, len); - p = build_property(name, d); + /* used from fixup or local_fixup, so no position */ + p = build_property(name, d, NULL); add_property(node, p); } } @@ -587,13 +598,17 @@ cell_t get_node_phandle(struct node *root, struct node *node) && (phandle_format & PHANDLE_LEGACY)) add_property(node, build_property("linux,phandle", - data_append_cell(empty_data, phandle))); + data_append_cell(empty_data, + phandle), + NULL)); if (!get_property(node, "phandle") && (phandle_format & PHANDLE_EPAPR)) add_property(node, build_property("phandle", - data_append_cell(empty_data, phandle))); + data_append_cell(empty_data, + phandle), + NULL)); /* If the node *does* have a phandle property, we must * be dealing with a self-referencing phandle, which will be @@ -768,7 +783,7 @@ static struct node *build_and_name_child_node(struct node *parent, char *name) struct node *node; node = build_node(NULL, NULL); - name_node(node, xstrdup(name)); + name_node(node, xstrdup(name), NULL); add_child(parent, node); return node; @@ -827,9 +842,11 @@ static void generate_label_tree_internal(struct dt_info *dti, } /* insert it */ + /* no position information for symbols and aliases */ p = build_property(l->label, data_copy_mem(node->fullpath, - strlen(node->fullpath) + 1)); + strlen(node->fullpath) + 1), + NULL); add_property(an, p); } diff --git a/srcpos.c b/srcpos.c index 7f2626c..1a4db9c 100644 --- a/srcpos.c +++ b/srcpos.c @@ -246,6 +246,41 @@ srcpos_copy(struct srcpos *pos) return pos_new; } +struct srcpos * +srcpos_copy_all(struct srcpos *pos) +{ + struct srcpos *pos_new; + struct srcfile_state *srcfile_state; + + if (!pos) + return NULL; + + pos_new = srcpos_copy(pos); + + if (pos_new) { + /* allocate without free */ + srcfile_state = xmalloc(sizeof(struct srcfile_state)); + memcpy(srcfile_state, pos->file, sizeof(struct srcfile_state)); + + pos_new->file = srcfile_state; + } + + return pos_new; +} + +struct srcpos * +srcpos_combine(struct srcpos *left_srcpos, struct srcpos *right_srcpos) +{ + struct srcpos *pos_new; + + pos_new = srcpos_copy(left_srcpos); + + pos_new->last_line = right_srcpos->last_line; + pos_new->last_column = right_srcpos->last_column; + + return pos_new; +} + char * srcpos_string(struct srcpos *pos) { diff --git a/srcpos.h b/srcpos.h index 9ded12a..ec69d89 100644 --- a/srcpos.h +++ b/srcpos.h @@ -105,6 +105,9 @@ extern struct srcpos srcpos_empty; extern void srcpos_update(struct srcpos *pos, const char *text, int len); extern struct srcpos *srcpos_copy(struct srcpos *pos); +extern struct srcpos *srcpos_copy_all(struct srcpos *pos); +extern struct srcpos *srcpos_combine(struct srcpos *left_srcpos, + struct srcpos *right_srcpos); extern char *srcpos_string(struct srcpos *pos); extern void PRINTF(3, 0) srcpos_verror(struct srcpos *pos, const char *prefix, diff --git a/treesource.c b/treesource.c index 2461a3d..a99eca4 100644 --- a/treesource.c +++ b/treesource.c @@ -200,9 +200,16 @@ static void write_propval(FILE *f, struct property *prop) int nnotstring = 0, nnul = 0; int nnotstringlbl = 0, nnotcelllbl = 0; int i; + char *srcstr; if (len == 0) { - fprintf(f, ";\n"); + if (annotate) { + srcstr = srcpos_string(prop->srcpos); + fprintf(f, "; /* %s */\n", srcstr); + free(srcstr); + } else { + fprintf(f, ";\n"); + } return; } @@ -230,7 +237,13 @@ static void write_propval(FILE *f, struct property *prop) write_propval_bytes(f, prop->val); } - fprintf(f, ";\n"); + if (annotate) { + srcstr = srcpos_string(prop->srcpos); + fprintf(f, "; /* %s */\n", srcstr); + free(srcstr); + } else { + fprintf(f, ";\n"); + } } static void write_tree_source_node(FILE *f, struct node *tree, int level) @@ -238,14 +251,23 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level) struct property *prop; struct node *child; struct label *l; + char *srcstr; write_prefix(f, level); for_each_label(tree->labels, l) fprintf(f, "%s: ", l->label); if (tree->name && (*tree->name)) - fprintf(f, "%s {\n", tree->name); + fprintf(f, "%s {", tree->name); else - fprintf(f, "/ {\n"); + fprintf(f, "/ {"); + + if (annotate) { + srcstr = srcpos_string(tree->srcpos); + fprintf(f, " /* %s */\n", srcstr); + free(srcstr); + } else { + fprintf(f, "\n"); + } for_each_property(tree, prop) { write_prefix(f, level+1); @@ -259,7 +281,13 @@ static void write_tree_source_node(FILE *f, struct node *tree, int level) write_tree_source_node(f, child, level+1); } write_prefix(f, level); - fprintf(f, "};\n"); + if (annotate) { + srcstr = srcpos_string(tree->srcpos); + fprintf(f, "}; /* %s */\n", srcstr); + free(srcstr); + } else { + fprintf(f, "};\n"); + } } -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree-compiler" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
