perf annotate: Pass the symbol's map/dso to the instruction parsers

So that things like:

       → callq  0xffffffff993e3230

found while disassembling /proc/kcore can be beautified by later
patches, that will resolve that address to a function, looking it up in
/proc/kallsyms.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chris Riyder <chris.ryder@arm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-p76myuke4j7gplg54amaklxk@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 88a7fcf9
...@@ -54,7 +54,7 @@ int ins__scnprintf(struct ins *ins, char *bf, size_t size, ...@@ -54,7 +54,7 @@ int ins__scnprintf(struct ins *ins, char *bf, size_t size,
return ins__raw_scnprintf(ins, bf, size, ops); return ins__raw_scnprintf(ins, bf, size, ops);
} }
static int call__parse(struct ins_operands *ops) static int call__parse(struct ins_operands *ops, struct map *map __maybe_unused)
{ {
char *endptr, *tok, *name; char *endptr, *tok, *name;
...@@ -114,7 +114,7 @@ bool ins__is_call(const struct ins *ins) ...@@ -114,7 +114,7 @@ bool ins__is_call(const struct ins *ins)
return ins->ops == &call_ops; return ins->ops == &call_ops;
} }
static int jump__parse(struct ins_operands *ops) static int jump__parse(struct ins_operands *ops, struct map *map __maybe_unused)
{ {
const char *s = strchr(ops->raw, '+'); const char *s = strchr(ops->raw, '+');
...@@ -169,7 +169,7 @@ static int comment__symbol(char *raw, char *comment, u64 *addrp, char **namep) ...@@ -169,7 +169,7 @@ static int comment__symbol(char *raw, char *comment, u64 *addrp, char **namep)
return 0; return 0;
} }
static int lock__parse(struct ins_operands *ops) static int lock__parse(struct ins_operands *ops, struct map *map)
{ {
char *name; char *name;
...@@ -190,7 +190,7 @@ static int lock__parse(struct ins_operands *ops) ...@@ -190,7 +190,7 @@ static int lock__parse(struct ins_operands *ops)
return 0; return 0;
if (ops->locked.ins->ops->parse && if (ops->locked.ins->ops->parse &&
ops->locked.ins->ops->parse(ops->locked.ops) < 0) ops->locked.ins->ops->parse(ops->locked.ops, map) < 0)
goto out_free_ops; goto out_free_ops;
return 0; return 0;
...@@ -233,7 +233,7 @@ static struct ins_ops lock_ops = { ...@@ -233,7 +233,7 @@ static struct ins_ops lock_ops = {
.scnprintf = lock__scnprintf, .scnprintf = lock__scnprintf,
}; };
static int mov__parse(struct ins_operands *ops) static int mov__parse(struct ins_operands *ops, struct map *map __maybe_unused)
{ {
char *s = strchr(ops->raw, ','), *target, *comment, prev; char *s = strchr(ops->raw, ','), *target, *comment, prev;
...@@ -300,7 +300,7 @@ static struct ins_ops mov_ops = { ...@@ -300,7 +300,7 @@ static struct ins_ops mov_ops = {
.scnprintf = mov__scnprintf, .scnprintf = mov__scnprintf,
}; };
static int dec__parse(struct ins_operands *ops) static int dec__parse(struct ins_operands *ops, struct map *map __maybe_unused)
{ {
char *target, *comment, *s, prev; char *target, *comment, *s, prev;
...@@ -705,7 +705,7 @@ int hist_entry__inc_addr_samples(struct hist_entry *he, int evidx, u64 ip) ...@@ -705,7 +705,7 @@ int hist_entry__inc_addr_samples(struct hist_entry *he, int evidx, u64 ip)
return symbol__inc_addr_samples(he->ms.sym, he->ms.map, evidx, ip); return symbol__inc_addr_samples(he->ms.sym, he->ms.map, evidx, ip);
} }
static void disasm_line__init_ins(struct disasm_line *dl) static void disasm_line__init_ins(struct disasm_line *dl, struct map *map)
{ {
dl->ins = ins__find(dl->name); dl->ins = ins__find(dl->name);
...@@ -715,7 +715,7 @@ static void disasm_line__init_ins(struct disasm_line *dl) ...@@ -715,7 +715,7 @@ static void disasm_line__init_ins(struct disasm_line *dl)
if (!dl->ins->ops) if (!dl->ins->ops)
return; return;
if (dl->ins->ops->parse && dl->ins->ops->parse(&dl->ops) < 0) if (dl->ins->ops->parse && dl->ins->ops->parse(&dl->ops, map) < 0)
dl->ins = NULL; dl->ins = NULL;
} }
...@@ -757,7 +757,8 @@ static int disasm_line__parse(char *line, char **namep, char **rawp) ...@@ -757,7 +757,8 @@ static int disasm_line__parse(char *line, char **namep, char **rawp)
} }
static struct disasm_line *disasm_line__new(s64 offset, char *line, static struct disasm_line *disasm_line__new(s64 offset, char *line,
size_t privsize, int line_nr) size_t privsize, int line_nr,
struct map *map)
{ {
struct disasm_line *dl = zalloc(sizeof(*dl) + privsize); struct disasm_line *dl = zalloc(sizeof(*dl) + privsize);
...@@ -772,7 +773,7 @@ static struct disasm_line *disasm_line__new(s64 offset, char *line, ...@@ -772,7 +773,7 @@ static struct disasm_line *disasm_line__new(s64 offset, char *line,
if (disasm_line__parse(dl->line, &dl->name, &dl->ops.raw) < 0) if (disasm_line__parse(dl->line, &dl->name, &dl->ops.raw) < 0)
goto out_free_line; goto out_free_line;
disasm_line__init_ins(dl); disasm_line__init_ins(dl, map);
} }
} }
...@@ -1144,7 +1145,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, ...@@ -1144,7 +1145,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,
parsed_line = tmp2 + 1; parsed_line = tmp2 + 1;
} }
dl = disasm_line__new(offset, parsed_line, privsize, *line_nr); dl = disasm_line__new(offset, parsed_line, privsize, *line_nr, map);
free(line); free(line);
(*line_nr)++; (*line_nr)++;
......
...@@ -36,7 +36,7 @@ struct ins_operands { ...@@ -36,7 +36,7 @@ struct ins_operands {
struct ins_ops { struct ins_ops {
void (*free)(struct ins_operands *ops); void (*free)(struct ins_operands *ops);
int (*parse)(struct ins_operands *ops); int (*parse)(struct ins_operands *ops, struct map *map);
int (*scnprintf)(struct ins *ins, char *bf, size_t size, int (*scnprintf)(struct ins *ins, char *bf, size_t size,
struct ins_operands *ops); struct ins_operands *ops);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment