LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Linux PowerPC List <linuxppc-dev@lists.ozlabs.org>,
	Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 5/7] powerpc: unrel_branch_check.sh: simplify and tidy up the final loop
Date: Wed, 12 Aug 2020 00:04:32 +1000	[thread overview]
Message-ID: <20200811140435.20957-6-sfr@canb.auug.org.au> (raw)
In-Reply-To: <20200811140435.20957-1-sfr@canb.auug.org.au>

Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/tools/unrel_branch_check.sh | 26 +++++++++---------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh
index dc82289b2252..54ebd05615d4 100755
--- a/arch/powerpc/tools/unrel_branch_check.sh
+++ b/arch/powerpc/tools/unrel_branch_check.sh
@@ -25,7 +25,6 @@ $objdump -R -d --start-address="$kstart" --stop-address="$kend" "$vmlinux" |
 awk '$2 == "<__end_interrupts>:" { print $1 }'
 )
 
-BRANCHES=$(
 $objdump -R -D --no-show-raw-insn --start-address="$kstart" --stop-address="$end_intr" "$vmlinux" |
 sed -E -n '
 # match lines that start with a kernel address
@@ -45,24 +44,19 @@ sed -E -n '
 	# strip out condition registers
 	s/:0xcr[0-7],/:0x/
 	p
-}'
-)
-
-for tuple in $BRANCHES; do
-	from=$(echo "$tuple" | cut -d':' -f1)
-	branch=$(echo "$tuple" | cut -d':' -f2)
-	to=$(echo "$tuple" | cut -d':' -f3)
-	sym=$(echo "$tuple" | cut -d':' -f4)
+}' | {
 
+all_good=true
+while IFS=: read -r from branch to sym; do
 	if (( to > end_intr )); then
-		if [ -z "$bad_branches" ]; then
-			echo "WARNING: Unrelocated relative branches"
-			bad_branches="yes"
+		if $all_good; then
+			printf '%s\n' 'WARNING: Unrelocated relative branches'
+			all_good=false
 		fi
-		echo "$from $branch-> $to $sym"
+		printf '%s %s-> %s %s\n' "$from" "$branch" "$to" "$sym"
 	fi
 done
 
-if [ -z "$bad_branches" ]; then
-	exit 0
-fi
+$all_good
+
+}
-- 
2.28.0


  parent reply	other threads:[~2020-08-11 14:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 14:04 [PATCH 0/7] powerpc: unrel_branch_check.sh: make it suck less Stephen Rothwell
2020-08-11 14:04 ` [PATCH 1/7] powerpc: unrel_branch_check.sh: fix shellcheck complaints Stephen Rothwell
2020-08-11 14:04 ` [PATCH 2/7] powerpc: unrel_branch_check.sh: simplify and combine some executions Stephen Rothwell
2020-08-11 14:04 ` [PATCH 3/7] powerpc: unrel_branch_check.sh: simplify objdump's asm output Stephen Rothwell
2020-08-11 14:04 ` [PATCH 4/7] powerpc: unrel_branch_check.sh: convert grep | sed | awk to just sed Stephen Rothwell
2020-08-11 14:04 ` Stephen Rothwell [this message]
2020-08-11 14:04 ` [PATCH 6/7] powerpc: unrel_branch_check.sh: fix up the file header Stephen Rothwell
2020-08-11 14:04 ` [PATCH 7/7] powerpc: unrel_branch_check.sh: exit silently for early errors Stephen Rothwell
2020-09-09 13:28 ` [PATCH 0/7] powerpc: unrel_branch_check.sh: make it suck less Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200811140435.20957-6-sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox