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 4/7] powerpc: unrel_branch_check.sh: convert grep | sed | awk to just sed
Date: Wed, 12 Aug 2020 00:04:31 +1000 [thread overview]
Message-ID: <20200811140435.20957-5-sfr@canb.auug.org.au> (raw)
In-Reply-To: <20200811140435.20957-1-sfr@canb.auug.org.au>
Also start using sed -E and make all the separate expressions into a
single one with comments. Pull the stripping of condition registers
back into the sed command.
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/tools/unrel_branch_check.sh | 30 ++++++++++++++++--------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh
index 7e936e2cf70d..dc82289b2252 100755
--- a/arch/powerpc/tools/unrel_branch_check.sh
+++ b/arch/powerpc/tools/unrel_branch_check.sh
@@ -27,21 +27,31 @@ awk '$2 == "<__end_interrupts>:" { print $1 }'
BRANCHES=$(
$objdump -R -D --no-show-raw-insn --start-address="$kstart" --stop-address="$end_intr" "$vmlinux" |
-grep -e "^c[0-9a-f]*:\s*b" |
-sed -e '/\<__start_initialization_multiplatform>/d' \
- -e '/b.\?.\?ctr/d' \
- -e '/b.\?.\?lr/d' \
- -e 's/\bbt.\?\s*[[:digit:]][[:digit:]]*,/beq/' \
- -e 's/\bbf.\?\s*[[:digit:]][[:digit:]]*,/bne/' \
- -e 's/\s0x/ /' \
- -e 's/://' |
-awk '{ print $1 ":" $2 ":0x" $3 ":" $4 " "}'
+sed -E -n '
+# match lines that start with a kernel address
+/^c[0-9a-f]*:\s*b/ {
+ # drop a target that we do not care about
+ /\<__start_initialization_multiplatform>/d
+ # drop branches via ctr or lr
+ /\<b.?.?(ct|l)r/d
+ # cope with some differences between Clang and GNU objdumps
+ s/\<bt.?\s*[[:digit:]]+,/beq/
+ s/\<bf.?\s*[[:digit:]]+,/bne/
+ # tidy up
+ s/\s0x/ /
+ s/://
+ # format for the loop below
+ s/^(\S+)\s+(\S+)\s+(\S+)\s*(\S*).*$/\1:\2:0x\3:\4/
+ # 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 | sed 's/cr[0-7],//')
+ to=$(echo "$tuple" | cut -d':' -f3)
sym=$(echo "$tuple" | cut -d':' -f4)
if (( to > end_intr )); then
--
2.28.0
next prev parent reply other threads:[~2020-08-11 14:25 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 ` Stephen Rothwell [this message]
2020-08-11 14:04 ` [PATCH 5/7] powerpc: unrel_branch_check.sh: simplify and tidy up the final loop Stephen Rothwell
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-5-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