diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 04:22:02 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 04:22:02 +0300 |
commit | 42c371f8ec4296cee49b10d8e6be50aae90f2d70 (patch) | |
tree | ed6ef90323c430ed77063b9f9c622a8a550ee85d /arch/x86/tools/objdump_reformat.awk | |
parent | f73857ece4d85d2ee36571df9c13a733f3ba2732 (diff) | |
parent | bcf7ef56daca2eacf836d22eee23c66f7cd96a65 (diff) | |
download | linux-42c371f8ec4296cee49b10d8e6be50aae90f2d70.tar.xz |
Merge tag 'x86-build-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build updates from Ingo Molnar:
- Update the objdump & instruction decoder self-test code for better
LLVM toolchain compatibility
- Rework CONFIG_X86_PAE dependencies, for better readability and higher
robustness.
- Misc cleanups
* tag 'x86-build-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tools: objdump_reformat.awk: Skip bad instructions from llvm-objdump
x86/Kconfig: Rework CONFIG_X86_PAE dependency
x86/tools: Remove chkobjdump.awk
x86/tools: objdump_reformat.awk: Allow for spaces
x86/tools: objdump_reformat.awk: Ensure regex matches fwait
Diffstat (limited to 'arch/x86/tools/objdump_reformat.awk')
-rw-r--r-- | arch/x86/tools/objdump_reformat.awk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/tools/objdump_reformat.awk b/arch/x86/tools/objdump_reformat.awk index f418c91b71f0..20b08a6c4d33 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -11,8 +11,8 @@ BEGIN { prev_addr = "" prev_hex = "" prev_mnemonic = "" - bad_expr = "(\\(bad\\)|^rex|^.byte|^rep(z|nz)$|^lock$|^es$|^cs$|^ss$|^ds$|^fs$|^gs$|^data(16|32)$|^addr(16|32|64))" - fwait_expr = "^9b " + bad_expr = "(\\(bad\\)|<unknown>|^rex|^.byte|^rep(z|nz)$|^lock$|^es$|^cs$|^ss$|^ds$|^fs$|^gs$|^data(16|32)$|^addr(16|32|64))" + fwait_expr = "^9b[ \t]*fwait" fwait_str="9b\tfwait" } @@ -22,7 +22,7 @@ BEGIN { } /^ *[0-9a-f]+:/ { - if (split($0, field, "\t") < 3) { + if (split($0, field, /: |\t/) < 3) { # This is a continuation of the same insn. prev_hex = prev_hex field[2] } else { |