From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933674AbcLBKfs (ORCPT ); Fri, 2 Dec 2016 05:35:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41424 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933184AbcLBKfq (ORCPT ); Fri, 2 Dec 2016 05:35:46 -0500 Date: Fri, 2 Dec 2016 02:35:32 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com, dsahern@gmail.com, adrian.hunter@intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org Reply-To: hpa@zytor.com, jolsa@kernel.org, wangnan0@huawei.com, dsahern@gmail.com, adrian.hunter@intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Show invalid jump offset in error message Git-Commit-ID: 5252b1aeabd0ae794cfaf323c10968443f10a363 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5252b1aeabd0ae794cfaf323c10968443f10a363 Gitweb: http://git.kernel.org/tip/5252b1aeabd0ae794cfaf323c10968443f10a363 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 25 Nov 2016 15:56:34 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 25 Nov 2016 15:56:34 -0300 perf annotate: Show invalid jump offset in error message To help in debugging when the wrong offset is being used, like in: │13d98: ↓ jne 13dd1 That is the full line from objdump, and it seems what should be used is 13dd1, not 28e1. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-4nc0marsgst1ft6inmvqber7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index cee0eee..ec7a30f 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -543,14 +543,16 @@ struct disasm_line *annotate_browser__find_offset(struct annotate_browser *brows static bool annotate_browser__jump(struct annotate_browser *browser) { struct disasm_line *dl = browser->selection; + u64 offset; s64 idx; if (!ins__is_jump(&dl->ins)) return false; - dl = annotate_browser__find_offset(browser, dl->ops.target.offset, &idx); + offset = dl->ops.target.offset; + dl = annotate_browser__find_offset(browser, offset, &idx); if (dl == NULL) { - ui_helpline__puts("Invalid jump offset"); + ui_helpline__printf("Invalid jump offset: %" PRIx64, offset); return true; }