diff mbox series

scripts: Fix no space expression between sp and offset

Message ID 20220722063529.7166-1-Kuan-Ying.Lee@mediatek.com (mailing list archive)
State New, archived
Headers show
Series scripts: Fix no space expression between sp and offset | expand

Commit Message

Kuan-Ying Lee (李冠穎) July 22, 2022, 6:35 a.m. UTC
When I use older version aarch64 objdump (2.24) to disassemble
aarch64 vmlinux, I get the result like below.
There is no space between sp and offset.

ffff800008010000 <dw_apb_ictl_handle_irq>:
ffff800008010000:       d503233f        hint    #0x19
ffff800008010004:       a9bc7bfd        stp     x29, x30, [sp,#-64]!
ffff800008010008:       90011e60        adrp    x0, ffff80000a3dc000 <num_ictlrs>
ffff80000801000c:       910003fd        mov     x29, sp
ffff800008010010:       a9025bf5        stp     x21, x22, [sp,#32]

When I use newer version aarch64 objdump (2.35), I get
the result like below.

ffff800008010000 <dw_apb_ictl_handle_irq>:
ffff800008010000:       d503233f        paciasp
ffff800008010004:       a9bc7bfd        stp     x29, x30, [sp, #-64]!
ffff800008010008:       90011e60        adrp    x0, ffff80000a3dc000 <num_ictlrs>
ffff80000801000c:       910003fd        mov     x29, sp
ffff800008010010:       a9025bf5        stp     x21, x22, [sp, #32]

Add no space support of regular expression for old version objdump.

Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
---
 scripts/checkstack.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kuan-Ying Lee (李冠穎) Aug. 3, 2022, 11:18 a.m. UTC | #1
On Fri, 2022-07-22 at 14:35 +0800, Kuan-Ying Lee wrote:

Cc maintainers.

> When I use older version aarch64 objdump (2.24) to disassemble
> aarch64 vmlinux, I get the result like below.
> There is no space between sp and offset.
> 
> ffff800008010000 <dw_apb_ictl_handle_irq>:
> ffff800008010000:       d503233f        hint    #0x19
> ffff800008010004:       a9bc7bfd        stp     x29, x30, [sp,#-64]!
> ffff800008010008:       90011e60        adrp    x0, ffff80000a3dc000
> <num_ictlrs>
> ffff80000801000c:       910003fd        mov     x29, sp
> ffff800008010010:       a9025bf5        stp     x21, x22, [sp,#32]
> 
> When I use newer version aarch64 objdump (2.35), I get
> the result like below.
> 
> ffff800008010000 <dw_apb_ictl_handle_irq>:
> ffff800008010000:       d503233f        paciasp
> ffff800008010004:       a9bc7bfd        stp     x29, x30, [sp, #-64]!
> ffff800008010008:       90011e60        adrp    x0, ffff80000a3dc000
> <num_ictlrs>
> ffff80000801000c:       910003fd        mov     x29, sp
> ffff800008010010:       a9025bf5        stp     x21, x22, [sp, #32]
> 
> Add no space support of regular expression for old version objdump.
> 
> Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
> ---
>  scripts/checkstack.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
> index d2c38584ece6..e404b6b11295 100755
> --- a/scripts/checkstack.pl
> +++ b/scripts/checkstack.pl
> @@ -56,7 +56,7 @@ my (@stack, $re, $dre, $sub, $x, $xs, $funcre,
> $min_stack);
>  	if ($arch =~ '^(aarch|arm)64$') {
>  		#ffffffc0006325cc:       a9bb7bfd        stp     x29,
> x30, [sp, #-80]!
>  		#a110:       d11643ff        sub     sp, sp, #0x590
> -		$re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o;
> +		$re = qr/^.*stp.*sp, ?\#-([0-9]{1,8})\]\!/o;
>  		$dre = qr/^.*sub.*sp, sp, #(0x$x{1,8})/o;
>  	} elsif ($arch eq 'arm') {
>  		#c0008ffc:	e24dd064	sub	sp, sp, #100	
> ; 0x64
> -- 
> 2.18.0
>
diff mbox series

Patch

diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index d2c38584ece6..e404b6b11295 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -56,7 +56,7 @@  my (@stack, $re, $dre, $sub, $x, $xs, $funcre, $min_stack);
 	if ($arch =~ '^(aarch|arm)64$') {
 		#ffffffc0006325cc:       a9bb7bfd        stp     x29, x30, [sp, #-80]!
 		#a110:       d11643ff        sub     sp, sp, #0x590
-		$re = qr/^.*stp.*sp, \#-([0-9]{1,8})\]\!/o;
+		$re = qr/^.*stp.*sp, ?\#-([0-9]{1,8})\]\!/o;
 		$dre = qr/^.*sub.*sp, sp, #(0x$x{1,8})/o;
 	} elsif ($arch eq 'arm') {
 		#c0008ffc:	e24dd064	sub	sp, sp, #100	; 0x64