Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9f8dfa9 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate s390: Implement jump types for perf annotate 



Implement simple detection for all kind of jumps and branches.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Cc: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-s390 <linux-s390@vger.kernel.org>
Cc: stable@kernel.org # v4.10+
Link: http://lkml.kernel.org/r/1491465112-45819-3-git-send-email-borntraeger@de.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e77852b3

tools/perf/arch/s390/annotate/instructions.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)

{

	struct ins_ops *ops = NULL;



	/* catch all kind of jumps */

	if (strchr(name, 'j') ||

	    !strncmp(name, "bct", 3) ||

	    !strncmp(name, "br", 2))

		ops = &jump_ops;

	/* override call/returns */

	if (!strcmp(name, "bras") ||

	    !strcmp(name, "brasl") ||

	    !strcmp(name, "basr"))

		ops = &call_ops;

	if (!strcmp(name, "br"))

		ops = &ret_ops;



	arch__associate_ins_ops(arch, name, ops);

	return ops;

}



static int s390__annotate_init(struct arch *arch)

{

	if (!arch->initialized) {

		arch->initialized = true;

		arch->associate_instruction_ops = s390__associate_ins_ops;

	}



	return 0;

}

tools/perf/util/annotate.c

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i 
#include "arch/arm64/annotate/instructions.c"

#include "arch/x86/annotate/instructions.c"

#include "arch/powerpc/annotate/instructions.c"

#include "arch/s390/annotate/instructions.c"



static struct arch architectures[] = {

	{
@@ -132,6 +133,7 @@ static struct arch architectures[] = { 
	},

	{

		.name = "s390",

		.init = s390__annotate_init,

		.objdump =  {

			.comment_char = '#',

		},