From 61fb1f74fe6402b72c227181833337acc131f205 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 12 Nov 2015 07:31:47 +0000 Subject: [PATCH] gen-pass-instances.awk: Make print command clearer in handle_line 2015-11-12 Tom de Vries * gen-pass-instances.awk (handle_line): Print parentheses and pass_name explicitly. From-SVN: r230213 --- gcc/ChangeLog | 5 +++++ gcc/gen-pass-instances.awk | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2c866f30a6..9ab4c6ac458 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-11-12 Tom de Vries + + * gen-pass-instances.awk (handle_line): Print parentheses and pass_name + explicitly. + 2015-11-12 Tom de Vries * gen-pass-instances.awk (handle_line): Add pass_num, prefix and postfix diff --git a/gcc/gen-pass-instances.awk b/gcc/gen-pass-instances.awk index 1aced74bab1..b10c26a65c4 100644 --- a/gcc/gen-pass-instances.awk +++ b/gcc/gen-pass-instances.awk @@ -54,6 +54,7 @@ function handle_line() len_of_call = RLENGTH; len_of_start = length("NEXT_PASS ("); + len_of_open = length("("); len_of_close = length(")"); # Find pass_name argument @@ -61,11 +62,13 @@ function handle_line() pass_starts_at = where + len_of_start; pass_name = substr(line, pass_starts_at, len_of_pass_name); - # Find prefix (until and including pass_name) - prefix = substr(line, 1, pass_starts_at + len_of_pass_name - 1) + # Find call expression prefix (until and including called function) + prefix_len = pass_starts_at - 1 - len_of_open; + prefix = substr(line, 1, prefix_len); - # Find postfix (after pass_name) - postfix = substr(line, pass_starts_at + len_of_pass_name) + # Find call expression postfix + postfix_starts_at = pass_starts_at + len_of_pass_name + len_of_close; + postfix = substr(line, postfix_starts_at); # Set pass_counts if (pass_name in pass_counts) @@ -76,7 +79,7 @@ function handle_line() pass_num = pass_counts[pass_name]; # Print call expression with extra pass_num argument - printf "%s, %s%s\n", prefix, pass_num, postfix; + printf "%s(%s, %s)%s\n", prefix, pass_name, pass_num, postfix; } { handle_line() } -- 2.30.2