aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell2020-08-12 00:04:30 +1000
committerMichael Ellerman2020-09-02 11:00:22 +1000
commit4e71106c343c625c0bf72a65b244e35e7d2cd037 (patch)
tree1090bab47353f9546dd047e148b534b43b425050
parent20ff8ec182160df86571a8af5773ff1e52837d73 (diff)
powerpc: unrel_branch_check.sh: simplify objdump's asm output
We don't use the raw hex instruction dump, so elide it and adjust the following expressions. Also use \s instead of [[:space:]] everywhere. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200811140435.20957-4-sfr@canb.auug.org.au
-rwxr-xr-xarch/powerpc/tools/unrel_branch_check.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh
index d735e3875b5e..7e936e2cf70d 100755
--- a/arch/powerpc/tools/unrel_branch_check.sh
+++ b/arch/powerpc/tools/unrel_branch_check.sh
@@ -26,16 +26,16 @@ awk '$2 == "<__end_interrupts>:" { print $1 }'
)
BRANCHES=$(
-$objdump -R -D --start-address="$kstart" --stop-address="$end_intr" "$vmlinux" |
-grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" |
+$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.\?[[:space:]]*[[:digit:]][[:digit:]]*,/beq/' \
- -e 's/\bbf.\?[[:space:]]*[[:digit:]][[:digit:]]*,/bne/' \
- -e 's/[[:space:]]0x/ /' \
+ -e 's/\bbt.\?\s*[[:digit:]][[:digit:]]*,/beq/' \
+ -e 's/\bbf.\?\s*[[:digit:]][[:digit:]]*,/bne/' \
+ -e 's/\s0x/ /' \
-e 's/://' |
-awk '{ print $1 ":" $6 ":0x" $7 ":" $8 " "}'
+awk '{ print $1 ":" $2 ":0x" $3 ":" $4 " "}'
)
for tuple in $BRANCHES; do