diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-12 00:04:29 +1000 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2020-09-02 11:00:21 +1000 |
| commit | 20ff8ec182160df86571a8af5773ff1e52837d73 (patch) | |
| tree | b5d1695e8aa9189fcb7c0a3f02983ca738cccf49 /arch/powerpc/tools | |
| parent | powerpc: unrel_branch_check.sh: fix shellcheck complaints (diff) | |
| download | linux-dev-20ff8ec182160df86571a8af5773ff1e52837d73.tar.xz linux-dev-20ff8ec182160df86571a8af5773ff1e52837d73.zip | |
powerpc: unrel_branch_check.sh: simplify and combine some executions
Also some minor style changes.
There should still be no change in behaviour.
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-3-sfr@canb.auug.org.au
Diffstat (limited to 'arch/powerpc/tools')
| -rwxr-xr-x | arch/powerpc/tools/unrel_branch_check.sh | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/arch/powerpc/tools/unrel_branch_check.sh b/arch/powerpc/tools/unrel_branch_check.sh index 4c1e04ba5081..d735e3875b5e 100755 --- a/arch/powerpc/tools/unrel_branch_check.sh +++ b/arch/powerpc/tools/unrel_branch_check.sh @@ -17,37 +17,34 @@ objdump="$1" vmlinux="$2" #__end_interrupts should be located within the first 64K +kstart=0xc000000000000000 +printf -v kend '0x%x' $(( kstart + 0x10000 )) end_intr=0x$( -$objdump -R "$vmlinux" -d --start-address=0xc000000000000000 \ - --stop-address=0xc000000000010000 | -grep '\<__end_interrupts>:' | -awk '{print $1}' +$objdump -R -d --start-address="$kstart" --stop-address="$kend" "$vmlinux" | +awk '$2 == "<__end_interrupts>:" { print $1 }' ) BRANCHES=$( -$objdump -R "$vmlinux" -D --start-address=0xc000000000000000 \ - --stop-address="$end_intr" | +$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" | -grep -v '\<__start_initialization_multiplatform>' | -grep -v -e 'b.\?.\?ctr' | -grep -v -e 'b.\?.\?lr' | -sed -e 's/\bbt.\?[[:space:]]*[[:digit:]][[:digit:]]*,/beq/' \ +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/://' | awk '{ print $1 ":" $6 ":0x" $7 ":" $8 " "}' ) -for tuple in $BRANCHES -do +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],//') sym=$(echo "$tuple" | cut -d':' -f4) - if (( to > end_intr )) - then + if (( to > end_intr )); then if [ -z "$bad_branches" ]; then echo "WARNING: Unrelocated relative branches" bad_branches="yes" |