On 01/08/18 05:36, Julia Lawall wrote:
> With --annotate, one gets only short file names and line numbers.
>
> With --annotate-full, one gets complete paths, starting and ending line
> numbers and starting and ending columns.
>
> --annotate-full indicates no-file and no-line for things that are not
> connected to the source code (fixups, symbols, aliases, etc.).
> --annotate simply has nothing in those cases.
>
> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
> ---
> dtc.c | 13 +++++++++----
> dtc.h | 1 +
> srcpos.c | 27 +++++++++++++++++++--------
> srcpos.h | 4 ++--
> treesource.c | 48 ++++++++++++++++++++++++++++--------------------
> 5 files changed, 59 insertions(+), 34 deletions(-)
>
> diff --git a/dtc.c b/dtc.c
> index 371d04c..24b58eb 100644
> --- a/dtc.c
> +++ b/dtc.c
> @@ -35,7 +35,8 @@ 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 */
> +bool annotate = false; /* annotate .dts with input source location */
> +bool annotate_full = false; /* annotate .dts with full input source location */
>
> static int is_power_of_2(int x)
> {
> @@ -61,7 +62,7 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
>
> /* Usage related data. */
> static const char usage_synopsis[] = "dtc [options] <input file>";
> -static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
> +static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@ATFhv";
> static struct option const usage_long_opts[] = {
> {"quiet", no_argument, NULL, 'q'},
> {"in-format", a_argument, NULL, 'I'},
> @@ -82,9 +83,10 @@ static struct option const usage_long_opts[] = {
> {"error", a_argument, NULL, 'E'},
> {"symbols", no_argument, NULL, '@'},
> {"auto-alias", no_argument, NULL, 'A'},
> + {"annotate", no_argument, NULL, 'T'},
> + {"annotate-full", no_argument, NULL, 'F'},
> {"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[] = {
> @@ -119,6 +121,7 @@ static const char * const usage_opts_help[] = {
> "\n\tPrint this help and exit",
I am getting a really weird result. This patch fragment is clearly moving
the "annotate" and "annotate-full" lines to before the "help" line. But
for some reason my version of patch is placing the "annotate" and
"annotate-full" lines after the "version" line. So the patch tool seems
to be broken ?????
$ patch -v
GNU patch 2.7.1
-Frank
--
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
