diff options
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index da1c4c4a0dd8..3369c7830260 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -165,7 +165,7 @@ static void ins__delete(struct ins_operands *ops) | |||
165 | static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size, | 165 | static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size, |
166 | struct ins_operands *ops) | 166 | struct ins_operands *ops) |
167 | { | 167 | { |
168 | return scnprintf(bf, size, "%-6.6s %s", ins->name, ops->raw); | 168 | return scnprintf(bf, size, "%-6s %s", ins->name, ops->raw); |
169 | } | 169 | } |
170 | 170 | ||
171 | int ins__scnprintf(struct ins *ins, char *bf, size_t size, | 171 | int ins__scnprintf(struct ins *ins, char *bf, size_t size, |
@@ -230,12 +230,12 @@ static int call__scnprintf(struct ins *ins, char *bf, size_t size, | |||
230 | struct ins_operands *ops) | 230 | struct ins_operands *ops) |
231 | { | 231 | { |
232 | if (ops->target.name) | 232 | if (ops->target.name) |
233 | return scnprintf(bf, size, "%-6.6s %s", ins->name, ops->target.name); | 233 | return scnprintf(bf, size, "%-6s %s", ins->name, ops->target.name); |
234 | 234 | ||
235 | if (ops->target.addr == 0) | 235 | if (ops->target.addr == 0) |
236 | return ins__raw_scnprintf(ins, bf, size, ops); | 236 | return ins__raw_scnprintf(ins, bf, size, ops); |
237 | 237 | ||
238 | return scnprintf(bf, size, "%-6.6s *%" PRIx64, ins->name, ops->target.addr); | 238 | return scnprintf(bf, size, "%-6s *%" PRIx64, ins->name, ops->target.addr); |
239 | } | 239 | } |
240 | 240 | ||
241 | static struct ins_ops call_ops = { | 241 | static struct ins_ops call_ops = { |
@@ -299,7 +299,7 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size, | |||
299 | c++; | 299 | c++; |
300 | } | 300 | } |
301 | 301 | ||
302 | return scnprintf(bf, size, "%-6.6s %.*s%" PRIx64, | 302 | return scnprintf(bf, size, "%-6s %.*s%" PRIx64, |
303 | ins->name, c ? c - ops->raw : 0, ops->raw, | 303 | ins->name, c ? c - ops->raw : 0, ops->raw, |
304 | ops->target.offset); | 304 | ops->target.offset); |
305 | } | 305 | } |
@@ -372,7 +372,7 @@ static int lock__scnprintf(struct ins *ins, char *bf, size_t size, | |||
372 | if (ops->locked.ins.ops == NULL) | 372 | if (ops->locked.ins.ops == NULL) |
373 | return ins__raw_scnprintf(ins, bf, size, ops); | 373 | return ins__raw_scnprintf(ins, bf, size, ops); |
374 | 374 | ||
375 | printed = scnprintf(bf, size, "%-6.6s ", ins->name); | 375 | printed = scnprintf(bf, size, "%-6s ", ins->name); |
376 | return printed + ins__scnprintf(&ops->locked.ins, bf + printed, | 376 | return printed + ins__scnprintf(&ops->locked.ins, bf + printed, |
377 | size - printed, ops->locked.ops); | 377 | size - printed, ops->locked.ops); |
378 | } | 378 | } |
@@ -448,7 +448,7 @@ out_free_source: | |||
448 | static int mov__scnprintf(struct ins *ins, char *bf, size_t size, | 448 | static int mov__scnprintf(struct ins *ins, char *bf, size_t size, |
449 | struct ins_operands *ops) | 449 | struct ins_operands *ops) |
450 | { | 450 | { |
451 | return scnprintf(bf, size, "%-6.6s %s,%s", ins->name, | 451 | return scnprintf(bf, size, "%-6s %s,%s", ins->name, |
452 | ops->source.name ?: ops->source.raw, | 452 | ops->source.name ?: ops->source.raw, |
453 | ops->target.name ?: ops->target.raw); | 453 | ops->target.name ?: ops->target.raw); |
454 | } | 454 | } |
@@ -488,7 +488,7 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *ops | |||
488 | static int dec__scnprintf(struct ins *ins, char *bf, size_t size, | 488 | static int dec__scnprintf(struct ins *ins, char *bf, size_t size, |
489 | struct ins_operands *ops) | 489 | struct ins_operands *ops) |
490 | { | 490 | { |
491 | return scnprintf(bf, size, "%-6.6s %s", ins->name, | 491 | return scnprintf(bf, size, "%-6s %s", ins->name, |
492 | ops->target.name ?: ops->target.raw); | 492 | ops->target.name ?: ops->target.raw); |
493 | } | 493 | } |
494 | 494 | ||
@@ -500,7 +500,7 @@ static struct ins_ops dec_ops = { | |||
500 | static int nop__scnprintf(struct ins *ins __maybe_unused, char *bf, size_t size, | 500 | static int nop__scnprintf(struct ins *ins __maybe_unused, char *bf, size_t size, |
501 | struct ins_operands *ops __maybe_unused) | 501 | struct ins_operands *ops __maybe_unused) |
502 | { | 502 | { |
503 | return scnprintf(bf, size, "%-6.6s", "nop"); | 503 | return scnprintf(bf, size, "%-6s", "nop"); |
504 | } | 504 | } |
505 | 505 | ||
506 | static struct ins_ops nop_ops = { | 506 | static struct ins_ops nop_ops = { |
@@ -924,7 +924,7 @@ void disasm_line__free(struct disasm_line *dl) | |||
924 | int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw) | 924 | int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw) |
925 | { | 925 | { |
926 | if (raw || !dl->ins.ops) | 926 | if (raw || !dl->ins.ops) |
927 | return scnprintf(bf, size, "%-6.6s %s", dl->ins.name, dl->ops.raw); | 927 | return scnprintf(bf, size, "%-6s %s", dl->ins.name, dl->ops.raw); |
928 | 928 | ||
929 | return ins__scnprintf(&dl->ins, bf, size, &dl->ops); | 929 | return ins__scnprintf(&dl->ins, bf, size, &dl->ops); |
930 | } | 930 | } |