From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756316Ab1LEMGH (ORCPT ); Mon, 5 Dec 2011 07:06:07 -0500 Received: from mail4.hitachi.co.jp ([133.145.228.5]:51339 "EHLO mail4.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756249Ab1LEMGD (ORCPT ); Mon, 5 Dec 2011 07:06:03 -0500 X-AuditID: b753bd60-95b8eba000007b1b-9b-4edcb3a8cbe1 X-AuditID: b753bd60-95b8eba000007b1b-9b-4edcb3a8cbe1 Subject: [PATCH 3/6] [RESEND][BUGFIX] x86/tools: Fix instruction decoder message output To: Ingo Molnar From: Masami Hiramatsu Cc: Thomas Gleixner , "H. Peter Anvin" , Ingo Molnar , linux-kernel@vger.kernel.org, yrl.pp-manager.tt@hitachi.com Date: Mon, 05 Dec 2011 21:05:45 +0900 Message-ID: <20111205120545.15475.7928.stgit@cloud> In-Reply-To: <20111205120520.15475.82983.stgit@cloud> References: <20111205120520.15475.82983.stgit@cloud> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix instruction decoder test (insn_sanity), so that it doesn't show both info and error messages twice on same instruction. (In that case, show only error message) Signed-off-by: Masami Hiramatsu Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" --- arch/x86/tools/insn_sanity.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/tools/insn_sanity.c b/arch/x86/tools/insn_sanity.c index 334d9de..2025603 100644 --- a/arch/x86/tools/insn_sanity.c +++ b/arch/x86/tools/insn_sanity.c @@ -257,15 +257,14 @@ int main(int argc, char **argv) insn_init(&insn, insn_buf, x86_64); insn_get_length(&insn); - if (verbose && !insn_complete(&insn)) - dump_stream(stdout, "Info: Found an undecodable input", i, insn_buf, &insn); - if (insn.next_byte <= insn.kaddr || insn.kaddr + MAX_INSN_SIZE < insn.next_byte) { /* Access out-of-range memory */ dump_stream(stdout, "Error: Found an access violation", i, insn_buf, &insn); errors++; - } + } else if (verbose && !insn_complete(&insn)) + dump_stream(stdout, "Info: Found an undecodable input", i, insn_buf, &insn); + insns++; }