Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98fe07fc authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

x86/tools: Rename distill.awk to objdump_reformat.awk 



Rename distill.awk to objdump_reformat.awk because it more
clearly expresses its purpose of re-formatting the output
of objdump so that insn_decoder_test can read it.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/151153625409.22827.10470603625519700259.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6b63dd11

arch/x86/tools/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ else 
  posttest_64bit = -n

endif



distill_awk = $(srctree)/arch/x86/tools/distill.awk

reformatter = $(srctree)/arch/x86/tools/objdump_reformat.awk

chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk



quiet_cmd_posttest = TEST    $@

      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)

      cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(reformatter) | $(obj)/insn_decoder_test $(posttest_64bit) $(posttest_verbose)



quiet_cmd_sanitytest = TEST    $@

      cmd_sanitytest = $(obj)/insn_sanity $(posttest_64bit) -m 1000000

arch/x86/tools/insn_decoder_test.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * particular.  See if insn_get_length() and the disassembler agree

 * on the length of each instruction in an elf disassembly.

 *

 * Usage: objdump -d a.out | awk -f distill.awk | ./insn_decoder_test

 * Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test

 */



const char *prog;
@@ -38,8 +38,8 @@ static int x86_64; 


static void usage(void)

{

	fprintf(stderr, "Usage: objdump -d a.out | awk -f distill.awk |"

		" %s [-y|-n] [-v]\n", prog);

	fprintf(stderr, "Usage: objdump -d a.out | awk -f objdump_reformat.awk"

		" | %s [-y|-n] [-v]\n", prog);

	fprintf(stderr, "\t-y	64bit mode\n");

	fprintf(stderr, "\t-n	32bit mode\n");

	fprintf(stderr, "\t-v	verbose mode\n");

arch/x86/tools/distill.awk→arch/x86/tools/objdump_reformat.awk

+2 −2
Original line number Diff line number Diff line 
#!/bin/awk -f

# SPDX-License-Identifier: GPL-2.0

# Usage: objdump -d a.out | awk -f distill.awk | ./insn_decoder_test

# Distills the disassembly as follows:

# Usage: objdump -d a.out | awk -f objdump_reformat.awk | ./insn_decoder_test

# Reformats the disassembly as follows:

# - Removes all lines except the disassembled instructions.

# - For instructions that exceed 1 line (7 bytes), crams all the hex bytes

# into a single line.