This patch adds support for ARCH=x86 into checkstack. Commit ffee0de411fd ("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"
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -52,14 +52,12 @@ my (@stack, $re, $dre, $x, $xs, $funcre); · 51 unmodified lines | ||
| 52 | 52 | #8000008a: 20 1d sub sp,4 |
| 53 | 53 | #80000ca8: fa cd 05 b0 sub sp,sp,1456 |
| 54 | 54 | $re = qr/^.*sub.*sp.*,([0-9]{1,8})/o; |
| 55 | − } elsif ($arch =~ /^i[3456]86$/) { | |
| 55 | + } elsif ($arch =~ /^x86(_64)?$/ || $arch =~ /^i[3456]86$/) { | |
| 56 | 56 | #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; | |
| 63 | 61 | } elsif ($arch eq 'ia64') { |
| 64 | 62 | #e0000000044011fc: 01 0f fc 8c adds r12=-384,r12 |
| 65 | 63 | $re = qr/.*adds.*r12=-(([0-9]{2}|[3-9])[0-9]{2}),r12/o; |