From patchwork Wed Oct 11 17:52:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 10000253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E936E60244 for ; Wed, 11 Oct 2017 17:55:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE77228AFD for ; Wed, 11 Oct 2017 17:55:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D35F728AFE; Wed, 11 Oct 2017 17:55:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5607728AFB for ; Wed, 11 Oct 2017 17:55:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2LBe-0000Yq-Hr; Wed, 11 Oct 2017 17:52:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2LBd-0000Y1-5T for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 17:52:53 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 9D/D1-28548-47A5ED95; Wed, 11 Oct 2017 17:52:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKIsWRWlGSWpSXmKPExsXitHRDpG5x1L1 Ig44Llhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aDX/dZCpqMK+78/s7UwPhMp4uRk0NCwF/i 1+svTCA2m4CexLzjX1m6GDk4RARUJG7vNehi5OJgFtjPKNH79QcbSFxYIFxi4fMyEJNFQFXi1 ccokE5eAVuJKQ2PmSAmyku8X3CfEcTmFLCTePP4PiuILQRUs2LpXkYIW1Vi8YOj7BC9ghInZz 5hAbGZBSQkDr54wTyBkXcWktQsJKkFjEyrGDWKU4vKUot0jQz1kooy0zNKchMzc3QNDYz1clO LixPTU3MSk4r1kvNzNzECA6eegYFxB2PPXr9DjJIcTEqivMF69yKF+JLyUyozEosz4otKc1KL DzHKcHAoSfAuiATKCRalpqdWpGXmAEMYJi3BwaMkwnscJM1bXJCYW5yZDpE6xWjMcWzT5T9MH B037/5hEmLJy89LlRLn/Q1SKgBSmlGaBzcIFluXGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKg nzWoNM4cnMK4Hb9wroFCagU0TT7oCcUpKIkJJqYIz9N/uU62qzj7+SDnwSE8vrPXj0wvaFbMt s2P8/kVm5Ydr+DVtTpvDOETB56qSzdNN3duY1kYdN5MwE7q2y3aMyJezxvvkCvZKOO4WtbHmF t2yXudzw4vHSmHLmyecOWO900th74dHnmz6Mqsfeh/jWWAl5KMhbnwzTbrC+Zv1A86ui3B/H7 sNKLMUZiYZazEXFiQDvid1sqAIAAA== X-Env-Sender: prvs=450528267=George.Dunlap@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1507744369!93041152!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30356 invoked from network); 11 Oct 2017 17:52:51 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 11 Oct 2017 17:52:51 -0000 X-IronPort-AV: E=Sophos;i="5.43,362,1503360000"; d="scan'208";a="445492262" From: George Dunlap To: Date: Wed, 11 Oct 2017 18:52:35 +0100 Message-ID: <20171011175243.19871-4-george.dunlap@citrix.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171011175243.19871-1-george.dunlap@citrix.com> References: <20171011175243.19871-1-george.dunlap@citrix.com> MIME-Version: 1.0 Cc: Ian Jackson , Wei Liu , George Dunlap , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v4 04/12] fuzz/x86_emulate: Rename the file containing the wrapper code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP When generating coverage output, by default gcov generates output filenames based only on the coverage file and the "leaf" source file, not the full path. As a result, it uses the same name for x86_emulate.c and x86_emulate/x86_emulate.c, generally overwriting the second (which we actually are about) with the first (which is just a wrapper). Rename the user-space wrapper helpers to x86-emulate.[ch], so that it generates separate files. There is actually an option to gcov, `--preserve-paths`, which will cause the full path name to be included in the filename, properly distinguishing between the two. However, given that the user-space wrapper doesn't actually do any emulation (and the poor state of gcov documentation making it difficult to find the option in the first place), it seems to make more sense to rename the file anyway. Signed-off-by: George Dunlap Acked-by: Wei Liu Acked-by: Jan Beulich --- v3: - x86-emulate.* rather than x86_emulate_user.* - Also update .gitignore to ignore the new files NB: I discovered the `-p` option to gcov after writing this patch. But I think the patch itself still makes sense. CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper CC: Jan Beulich --- .gitignore | 3 ++- tools/fuzz/x86_instruction_emulator/Makefile | 12 ++++++------ tools/fuzz/x86_instruction_emulator/fuzz-emul.c | 2 +- tools/tests/x86_emulator/Makefile | 6 +++--- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- tools/tests/x86_emulator/{x86_emulate.c => x86-emulate.c} | 2 +- tools/tests/x86_emulator/{x86_emulate.h => x86-emulate.h} | 0 7 files changed, 14 insertions(+), 13 deletions(-) rename tools/tests/x86_emulator/{x86_emulate.c => x86-emulate.c} (99%) rename tools/tests/x86_emulator/{x86_emulate.h => x86-emulate.h} (100%) diff --git a/.gitignore b/.gitignore index 95f40f19c8..b3587f3809 100644 --- a/.gitignore +++ b/.gitignore @@ -163,7 +163,8 @@ tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci tools/fuzz/libelf/afl-libelf-fuzzer tools/fuzz/x86_instruction_emulator/asm -tools/fuzz/x86_instruction_emulator/x86_emulate* +tools/fuzz/x86_instruction_emulator/x86_emulate +tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] tools/fuzz/x86_instruction_emulator/afl-harness tools/helpers/_paths.h tools/helpers/init-xenstore-domain diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile index a3f6b2c754..107bf62a21 100644 --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -18,22 +18,22 @@ asm: asm/%: asm ; -x86_emulate.c x86_emulate.h: %: +x86-emulate.c x86-emulate.h: %: [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$* CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I. x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h -x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h) +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) -x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h) +x86-emulate.o: x86-emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h) fuzz-emul.o: $(x86_emulate.h) -x86-insn-fuzzer.a: fuzz-emul.o x86_emulate.o +x86-insn-fuzzer.a: fuzz-emul.o x86-emulate.o $(AR) rc $@ $^ -afl-harness: afl-harness.o fuzz-emul.o x86_emulate.o +afl-harness: afl-harness.o fuzz-emul.o x86-emulate.o $(CC) $(CFLAGS) $^ -o $@ # Common targets @@ -42,7 +42,7 @@ all: x86-insn-fuzz-all .PHONY: distclean distclean: clean - rm -f x86_emulate x86_emulate.c x86_emulate.h asm + rm -f x86_emulate x86-emulate.c x86-emulate.h asm .PHONY: clean clean: diff --git a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c index 5fb8586955..8998f21fe1 100644 --- a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c +++ b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c @@ -15,7 +15,7 @@ #include #include -#include "x86_emulate.h" +#include "x86-emulate.h" #define MSR_INDEX_MAX 16 diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index d7be77d98a..ed0fd9710e 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -77,7 +77,7 @@ $(addsuffix .h,$(TESTCASES)): %.h: %.c testcase.mk Makefile $(addsuffix .c,$(SIMD)) $(addsuffix -avx.c,$(filter sse%,$(SIMD))): ln -sf simd.c $@ -$(TARGET): x86_emulate.o test_x86_emulator.o +$(TARGET): x86-emulate.o test_x86_emulator.o $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ .PHONY: clean @@ -105,9 +105,9 @@ $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH)) x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h -x86_emulate.h := x86_emulate.h x86_emulate/x86_emulate.h $(x86.h) +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) -x86_emulate.o: x86_emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h) +x86-emulate.o: x86-emulate.c x86_emulate/x86_emulate.c $(x86_emulate.h) $(HOSTCC) $(HOSTCFLAGS) -D__XEN_TOOLS__ -c -g -o $@ $< test_x86_emulator.o: test_x86_emulator.c $(addsuffix .h,$(TESTCASES)) $(x86_emulate.h) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 2bb4b1e04b..7a8df419cd 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -3,7 +3,7 @@ #include #include -#include "x86_emulate.h" +#include "x86-emulate.h" #include "blowfish.h" #include "sse.h" #include "sse2.h" diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86-emulate.c similarity index 99% rename from tools/tests/x86_emulator/x86_emulate.c rename to tools/tests/x86_emulator/x86-emulate.c index 79661d5c2b..975ddc7e53 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86-emulate.c @@ -1,4 +1,4 @@ -#include "x86_emulate.h" +#include "x86-emulate.h" #include diff --git a/tools/tests/x86_emulator/x86_emulate.h b/tools/tests/x86_emulator/x86-emulate.h similarity index 100% rename from tools/tests/x86_emulator/x86_emulate.h rename to tools/tests/x86_emulator/x86-emulate.h