scripts/checkstack.pl: don't display $dre as different entity

currently script prints stack usage for functions
in two ways:($re and $dre)

dre breaks sorting mechanism.
0xffffa00011f26f88 sunxi_mux_clk_setup.isra.0 [vmlinux]:Dynamic (0x140)
..
0xffffa00011f27210 sunxi_divs_clk_setup [vmlinux]:      Dynamic (0x1d0)

so we can print it in decimal only.

Also address before function name is changed to function
start address rather than stack consumption address.
Because in next patch, arm has two ways to use stack
which can be clubbed and printed in one function only.

All symbols whose stack by adding(re and dre) is greater than
100, will be printed.

0xffffa00011f2720c0 sunxi_divs_clk_setup [vmlinux]:     464
...
0xffffa00011f26f840 sunxi_mux_clk_setup.isra.0 [vmlinux]:320

Co-developed-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 371bd17a49830c1dbf6083b038aa532fd1c5ca17..695710895560e9474c0d0bbc9b533ccad5eb7f16 100755 (executable)
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -109,11 +109,30 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
 #
 # main()
 #
-my ($func, $file, $lastslash);
+my ($func, $file, $lastslash, $total_size, $addr, $intro);
+
+$total_size = 0;
 
 while (my $line = <STDIN>) {
        if ($line =~ m/$funcre/) {
                $func = $1;
+               next if $line !~ m/^($xs*)/;
+               if ($total_size > 100) {
+                       push @stack, "$intro$total_size\n";
+               }
+
+               $addr = $1;
+               $addr =~ s/ /0/g;
+               $addr = "0x$addr";
+
+               $intro = "$addr $func [$file]:";
+               my $padlen = 56 - length($intro);
+               while ($padlen > 0) {
+                       $intro .= '     ';
+                       $padlen -= 8;
+               }
+
+               $total_size = 0;
        }
        elsif ($line =~ m/(.*):\s*file format/) {
                $file = $1;
@@ -134,37 +153,18 @@ while (my $line = <STDIN>) {
                }
                next if ($size > 0x10000000);
 
-               next if $line !~ m/^($xs*)/;
-               my $addr = $1;
-               $addr =~ s/ /0/g;
-               $addr = "0x$addr";
-
-               my $intro = "$addr $func [$file]:";
-               my $padlen = 56 - length($intro);
-               while ($padlen > 0) {
-                       $intro .= '     ';
-                       $padlen -= 8;
-               }
-               next if ($size < 100);
-               push @stack, "$intro$size\n";
+               $total_size += $size;
        }
        elsif (defined $dre && $line =~ m/$dre/) {
-               my $size = "Dynamic ($1)";
-
-               next if $line !~ m/^($xs*)/;
-               my $addr = $1;
-               $addr =~ s/ /0/g;
-               $addr = "0x$addr";
+               my $size = $1;
 
-               my $intro = "$addr $func [$file]:";
-               my $padlen = 56 - length($intro);
-               while ($padlen > 0) {
-                       $intro .= '     ';
-                       $padlen -= 8;
-               }
-               push @stack, "$intro$size\n";
+               $size = hex($size) if ($size =~ /^0x/);
+               $total_size += $size;
        }
 }
+if ($total_size > 100) {
+       push @stack, "$intro$total_size\n";
+}
 
 # Sort output by size (last field)
 print sort { ($b =~ /:\t*(\d+)$/)[0] <=> ($a =~ /:\t*(\d+)$/)[0] } @stack;