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
This commit is contained in:
Stephen Rothwell 2020-08-12 00:04:29 +10:00 committed by Michael Ellerman
parent d9de6b0da8
commit 20ff8ec182
1 changed files with 11 additions and 14 deletions

View File

@ -17,37 +17,34 @@ objdump="$1"
vmlinux="$2" vmlinux="$2"
#__end_interrupts should be located within the first 64K #__end_interrupts should be located within the first 64K
kstart=0xc000000000000000
printf -v kend '0x%x' $(( kstart + 0x10000 ))
end_intr=0x$( end_intr=0x$(
$objdump -R "$vmlinux" -d --start-address=0xc000000000000000 \ $objdump -R -d --start-address="$kstart" --stop-address="$kend" "$vmlinux" |
--stop-address=0xc000000000010000 | awk '$2 == "<__end_interrupts>:" { print $1 }'
grep '\<__end_interrupts>:' |
awk '{print $1}'
) )
BRANCHES=$( BRANCHES=$(
$objdump -R "$vmlinux" -D --start-address=0xc000000000000000 \ $objdump -R -D --start-address="$kstart" --stop-address="$end_intr" "$vmlinux" |
--stop-address="$end_intr" |
grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" | grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" |
grep -v '\<__start_initialization_multiplatform>' | sed -e '/\<__start_initialization_multiplatform>/d' \
grep -v -e 'b.\?.\?ctr' | -e '/b.\?.\?ctr/d' \
grep -v -e 'b.\?.\?lr' | -e '/b.\?.\?lr/d' \
sed -e 's/\bbt.\?[[:space:]]*[[:digit:]][[:digit:]]*,/beq/' \ -e 's/\bbt.\?[[:space:]]*[[:digit:]][[:digit:]]*,/beq/' \
-e 's/\bbf.\?[[:space:]]*[[:digit:]][[:digit:]]*,/bne/' \ -e 's/\bbf.\?[[:space:]]*[[:digit:]][[:digit:]]*,/bne/' \
-e 's/[[:space:]]0x/ /' \ -e 's/[[:space:]]0x/ /' \
-e 's/://' | -e 's/://' |
awk '{ print $1 ":" $6 ":0x" $7 ":" $8 " "}' awk '{ print $1 ":" $6 ":0x" $7 ":" $8 " "}'
) )
for tuple in $BRANCHES for tuple in $BRANCHES; do
do
from=$(echo "$tuple" | cut -d':' -f1) from=$(echo "$tuple" | cut -d':' -f1)
branch=$(echo "$tuple" | cut -d':' -f2) branch=$(echo "$tuple" | cut -d':' -f2)
to=$(echo "$tuple" | cut -d':' -f3 | sed 's/cr[0-7],//') to=$(echo "$tuple" | cut -d':' -f3 | sed 's/cr[0-7],//')
sym=$(echo "$tuple" | cut -d':' -f4) sym=$(echo "$tuple" | cut -d':' -f4)
if (( to > end_intr )) if (( to > end_intr )); then
then
if [ -z "$bad_branches" ]; then if [ -z "$bad_branches" ]; then
echo "WARNING: Unrelocated relative branches" echo "WARNING: Unrelocated relative branches"
bad_branches="yes" bad_branches="yes"