aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <[email protected]>2012-04-25 14:18:42 -0300
committerArnaldo Carvalho de Melo <[email protected]>2012-04-25 14:18:42 -0300
commit38b31bd0cefbb0e69a182d9a94b09a7e648549dc (patch)
tree74882d00ec6bb6e60ccf936257c5644bb6617475
parentfb29fa58e36df09c807d252247d64a221fcd5bbb (diff)
perf annotate browser: Don't draw jump connectors for out of function jumps
As described in the previous patch. Next step is to properly label those jumps by using a -> arrow, i.e. not backwards/forwards, and allow the user to navigate to this other function when enter or -> is pressed. Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/ui/browsers/annotate.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 73e1ef0081d4..077380baa1c0 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -153,7 +153,8 @@ static void annotate_browser__draw_current_loop(struct ui_browser *browser)
unsigned int from, to, start_width = 2;
list_for_each_entry_from(pos, &notes->src->source, node) {
- if (!pos->ins || !ins__is_jump(pos->ins))
+ if (!pos->ins || !ins__is_jump(pos->ins) ||
+ !disasm_line__has_offset(pos))
continue;
target = ab->offsets[pos->ops.target.offset];
@@ -689,7 +690,8 @@ static void annotate_browser__mark_jump_targets(struct annotate_browser *browser
struct disasm_line *dl = browser->offsets[offset], *dlt;
struct browser_disasm_line *bdlt;
- if (!dl || !dl->ins || !ins__is_jump(dl->ins))
+ if (!dl || !dl->ins || !ins__is_jump(dl->ins) ||
+ !disasm_line__has_offset(dl))
continue;
if (dl->ops.target.offset >= size) {