d1f7b0234e
The commit0fcb1da4ab"perf annotate: AArch64 support" blindly copied the comment character from the original: https://lkml.org/lkml/2016/5/19/461 whereas that same commit shows objdump output utilizing the C++ style "//" as the comment delimeter. Since '/' doesn't occur elsewhere in objdump output, we retain the single character check, but fix it to be '/'. Signed-off-by: Kim Phillips <kim.phillips@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Chris Riyder <chris.ryder@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Fixes:0fcb1da4ab("perf annotate: AArch64 support") Link: http://lkml.kernel.org/r/20170503131356.be88f977094fb3fa0f49b99d@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
63 lines
1.3 KiB
C
63 lines
1.3 KiB
C
#include <sys/types.h>
|
|
#include <regex.h>
|
|
|
|
struct arm64_annotate {
|
|
regex_t call_insn,
|
|
jump_insn;
|
|
};
|
|
|
|
static struct ins_ops *arm64__associate_instruction_ops(struct arch *arch, const char *name)
|
|
{
|
|
struct arm64_annotate *arm = arch->priv;
|
|
struct ins_ops *ops;
|
|
regmatch_t match[2];
|
|
|
|
if (!regexec(&arm->jump_insn, name, 2, match, 0))
|
|
ops = &jump_ops;
|
|
else if (!regexec(&arm->call_insn, name, 2, match, 0))
|
|
ops = &call_ops;
|
|
else if (!strcmp(name, "ret"))
|
|
ops = &ret_ops;
|
|
else
|
|
return NULL;
|
|
|
|
arch__associate_ins_ops(arch, name, ops);
|
|
return ops;
|
|
}
|
|
|
|
static int arm64__annotate_init(struct arch *arch)
|
|
{
|
|
struct arm64_annotate *arm;
|
|
int err;
|
|
|
|
if (arch->initialized)
|
|
return 0;
|
|
|
|
arm = zalloc(sizeof(*arm));
|
|
if (!arm)
|
|
return -1;
|
|
|
|
/* bl, blr */
|
|
err = regcomp(&arm->call_insn, "^blr?$", REG_EXTENDED);
|
|
if (err)
|
|
goto out_free_arm;
|
|
/* b, b.cond, br, cbz/cbnz, tbz/tbnz */
|
|
err = regcomp(&arm->jump_insn, "^[ct]?br?\\.?(cc|cs|eq|ge|gt|hi|le|ls|lt|mi|ne|pl)?n?z?$",
|
|
REG_EXTENDED);
|
|
if (err)
|
|
goto out_free_call;
|
|
|
|
arch->initialized = true;
|
|
arch->priv = arm;
|
|
arch->associate_instruction_ops = arm64__associate_instruction_ops;
|
|
arch->objdump.comment_char = '/';
|
|
arch->objdump.skip_functions_char = '+';
|
|
return 0;
|
|
|
|
out_free_call:
|
|
regfree(&arm->call_insn);
|
|
out_free_arm:
|
|
free(arm);
|
|
return -1;
|
|
}
|