aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/util/sort.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 9bcdb57076b8..0c68af83e7dd 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -471,11 +471,13 @@ struct sort_entry sort_sym_to = {
471static int64_t 471static int64_t
472sort__mispredict_cmp(struct hist_entry *left, struct hist_entry *right) 472sort__mispredict_cmp(struct hist_entry *left, struct hist_entry *right)
473{ 473{
474 const unsigned char mp = left->branch_info->flags.mispred != 474 unsigned char mp, p;
475 right->branch_info->flags.mispred;
476 const unsigned char p = left->branch_info->flags.predicted !=
477 right->branch_info->flags.predicted;
478 475
476 if (!left->branch_info || !right->branch_info)
477 return cmp_null(left->branch_info, right->branch_info);
478
479 mp = left->branch_info->flags.mispred != right->branch_info->flags.mispred;
480 p = left->branch_info->flags.predicted != right->branch_info->flags.predicted;
479 return mp || p; 481 return mp || p;
480} 482}
481 483
@@ -483,10 +485,12 @@ static int hist_entry__mispredict_snprintf(struct hist_entry *he, char *bf,
483 size_t size, unsigned int width){ 485 size_t size, unsigned int width){
484 static const char *out = "N/A"; 486 static const char *out = "N/A";
485 487
486 if (he->branch_info->flags.predicted) 488 if (he->branch_info) {
487 out = "N"; 489 if (he->branch_info->flags.predicted)
488 else if (he->branch_info->flags.mispred) 490 out = "N";
489 out = "Y"; 491 else if (he->branch_info->flags.mispred)
492 out = "Y";
493 }
490 494
491 return repsep_snprintf(bf, size, "%-*.*s", width, width, out); 495 return repsep_snprintf(bf, size, "%-*.*s", width, width, out);
492} 496}