From b84eaab6ede6477484edc043456cf7d7cfc7f8b3 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 12 Aug 2020 00:04:32 +1000 Subject: [PATCH] powerpc: unrel_branch_check.sh: simplify and tidy up the final loop Signed-off-by: Stephen Rothwell Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200811140435.20957-6-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 dc82289..54ebd05 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.7.4