aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/tools/Makefile4
-rw-r--r--arch/x86/tools/insn_decoder_test.c6
-rw-r--r--arch/x86/tools/objdump_reformat.awk (renamed from arch/x86/tools/distill.awk)4
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index b0d75684d313..09af7ff53044 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -13,11 +13,11 @@ else
13 posttest_64bit = -n 13 posttest_64bit = -n
14endif 14endif
15 15
16distill_awk = $(srctree)/arch/x86/tools/distill.awk 16reformatter = $(srctree)/arch/x86/tools/objdump_reformat.awk
17chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk 17chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk
18 18
19quiet_cmd_posttest = TEST $@ 19quiet_cmd_posttest = TEST $@
20 cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(distill_awk) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose) 20 cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(reformatter) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose)
21 21
22quiet_cmd_sanitytest = TEST $@ 22quiet_cmd_sanitytest = TEST $@
23 cmd_sanitytest = $(obj)/insn_sanity $(posttest_64bit) -m 1000000 23 cmd_sanitytest = $(obj)/insn_sanity $(posttest_64bit) -m 1000000
diff --git a/arch/x86/tools/insn_decoder_test.c b/arch/x86/tools/insn_decoder_test.c
index 8be7264cb723..286d2e3b9d57 100644
--- a/arch/x86/tools/insn_decoder_test.c
+++ b/arch/x86/tools/insn_decoder_test.c
@@ -29,7 +29,7 @@
29 * particular. See if insn_get_length() and the disassembler agree 29 * particular. See if insn_get_length() and the disassembler agree
30 * on the length of each instruction in an elf disassembly. 30 * on the length of each instruction in an elf disassembly.
31 * 31 *
32 * Usage: objdump -d a.out | awk -f distill.awk | ./insn_decoder_test 32 * Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test
33 */ 33 */
34 34
35const char *prog; 35const char *prog;
@@ -38,8 +38,8 @@ static int x86_64;
38 38
39static void usage(void) 39static void usage(void)
40{ 40{
41 fprintf(stderr, "Usage: objdump -d a.out | awk -f distill.awk |" 41 fprintf(stderr, "Usage: objdump -d a.out | awk -f objdump_reformat.awk"
42 " %s [-y|-n] [-v]\n", prog); 42 " | %s [-y|-n] [-v]\n", prog);
43 fprintf(stderr, "\t-y 64bit mode\n"); 43 fprintf(stderr, "\t-y 64bit mode\n");
44 fprintf(stderr, "\t-n 32bit mode\n"); 44 fprintf(stderr, "\t-n 32bit mode\n");
45 fprintf(stderr, "\t-v verbose mode\n"); 45 fprintf(stderr, "\t-v verbose mode\n");
diff --git a/arch/x86/tools/distill.awk b/arch/x86/tools/objdump_reformat.awk
index 80cd7d53bd07..f418c91b71f0 100644
--- a/arch/x86/tools/distill.awk
+++ b/arch/x86/tools/objdump_reformat.awk
@@ -1,7 +1,7 @@
1#!/bin/awk -f 1#!/bin/awk -f
2# SPDX-License-Identifier: GPL-2.0 2# SPDX-License-Identifier: GPL-2.0
3# Usage: objdump -d a.out | awk -f distill.awk | ./insn_decoder_test 3# Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test
4# Distills the disassembly as follows: 4# Reformats the disassembly as follows:
5# - Removes all lines except the disassembled instructions. 5# - Removes all lines except the disassembled instructions.
6# - For instructions that exceed 1 line (7 bytes), crams all the hex bytes 6# - For instructions that exceed 1 line (7 bytes), crams all the hex bytes
7# into a single line. 7# into a single line.