From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbdF1DOo (ORCPT ); Tue, 27 Jun 2017 23:14:44 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33807 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753808AbdF1DO3 (ORCPT ); Tue, 27 Jun 2017 23:14:29 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Jiri Olsa Subject: [PATCH/RFC 4/4] perf annotate: Support a 'o' key showing addresses on the new source code view Date: Wed, 28 Jun 2017 12:14:24 +0900 Message-Id: <1498619664-856-1-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cc: Namhyung Kim Cc: Jiri Olsa Signed-off-by: Taeung Song --- tools/perf/ui/browsers/annotate.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 200ee0c..bb5a933 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -402,7 +402,17 @@ static int annotate_code_browser__show_matched_dl(struct ui_browser *browser, } else ui_browser__set_color(browser, HE_COLORSET_NORMAL); - ui_browser__printf(browser, " %*s - ", ab->addr_width + 4, " "); + if (!annotate_browser__opts.use_offset) { + u64 addr = dl->offset + ab->start; + + ui_browser__printf(browser, " - "); + + if (!current_entry) + ui_browser__set_color(browser, HE_COLORSET_ADDR); + ui_browser__printf(browser, "%" PRIx64 ": ", addr); + } else + ui_browser__printf(browser, " %*s - ", + ab->addr_width + 4, " "); disasm_line__scnprintf(dl, line, sizeof(line), !annotate_browser__opts.use_offset); @@ -938,6 +948,7 @@ static int annotate_code_browser__run(struct annotate_browser *browser, "PGDN/SPACE Navigate\n" "q/ESC/CTRL+C Return to dissembly view\n\n" "ENTER Toggle showing partial disassembly lines\n" + "o Toggle showing addresses for disassembly lines\n" "t Toggle total period view\n"); continue; case K_ENTER: @@ -953,6 +964,10 @@ static int annotate_code_browser__run(struct annotate_browser *browser, annotate_code_browser__update_nr_entries(browser); } continue; + case 'o': + annotate_browser__opts.use_offset = + !annotate_browser__opts.use_offset; + continue; case 't': annotate_browser__opts.show_total_period = !annotate_browser__opts.show_total_period; -- 2.7.4