Skip to content

Commit fda9f99

Browse files
koct9itorvalds
koct9i
authored and
torvalds
committed
scripts/checkstack.pl: automatically handle 32-bit and 64-bit mode for ARCH=x86
This patch adds support for ARCH=x86 into checkstack. Commit ffee0de ("x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT") had merged ARCH=i386 and ARCH=x86_64 into one ARCH=x86. checkstack.pl searches patterns of machine instructions which are usually used for allocating stack frames. checkstalk.pl needs either i386 or x86_64, x86 isn't enough: $ make checkstack objdump -d vmlinux $(find . -name '*.ko') | \ perl linux/scripts/checkstack.pl x86 wrong or unknown architecture "x86" Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Richard Weinberger <richard@nod.at> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent c965526 commit fda9f99

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

‎scripts/checkstack.pl‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@
5252
#8000008a: 20 1d sub sp,4
5353
#80000ca8: fa cd 05 b0 sub sp,sp,1456
5454
$re = qr/^.*sub.*sp.*,([0-9]{1,8})/o;
55-
} elsif ($arch =~ /^i[3456]86$/) {
55+
} elsif ($arch =~ /^x86(_64)?$/ || $arch =~ /^i[3456]86$/) {
5656
#c0105234: 81 ec ac 05 00 00 sub $0x5ac,%esp
57-
$re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%esp$/o;
58-
$dre = qr/^.*[as][du][db] (%.*),\%esp$/o;
59-
} elsif ($arch eq 'x86_64') {
60-
# 2f60: 48 81 ec e8 05 00 00 sub $0x5e8,%rsp
61-
$re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%rsp$/o;
62-
$dre = qr/^.*[as][du][db] (\%.*),\%rsp$/o;
57+
# or
58+
# 2f60: 48 81 ec e8 05 00 00 sub $0x5e8,%rsp
59+
$re = qr/^.*[as][du][db] \$(0x$x{1,8}),\%(e|r)sp$/o;
60+
$dre = qr/^.*[as][du][db] (%.*),\%(e|r)sp$/o;
6361
} elsif ($arch eq 'ia64') {
6462
#e0000000044011fc: 01 0f fc 8c adds r12=-384,r12
6563
$re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o;

0 commit comments

Comments
 (0)