Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf into perf/core

uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')

uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')

ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \

				  -e s/arm.*/arm/ -e s/sa110/arm/ \

				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

				  -e s/sh[234].*/sh/ )

# Additional ARCH settings for x86

ifeq ($(ARCH),i386)

        ARCH := x86

endif

ifeq ($(ARCH),x86_64)

        ARCH := x86

endif

# CFLAGS and LDFLAGS are for the users to override from the command line.

#

# Those must not be GNU-specific; they are shared with perl/ which may

# be built by a different compiler. (Note that this is an artifact now

# but it still might be nice to keep that distinction.)

BASIC_CFLAGS = -Iutil/include

BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include

BASIC_LDFLAGS =

# Guard against environment variables

LIB_H += util/include/asm/swab.h

LIB_H += util/include/asm/system.h

LIB_H += util/include/asm/uaccess.h

LIB_H += util/include/dwarf-regs.h

LIB_H += perf.h

LIB_H += util/cache.h

LIB_H += util/callchain.h

-include config.mak.autogen

-include config.mak

ifndef NO_DWARF

ifneq ($(shell sh -c "(echo '\#include <dwarf.h>'; echo '\#include <libdw.h>'; echo 'int main(void) { Dwarf *dbg; dbg = dwarf_begin(0, DWARF_C_READ); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

	msg := $(warning No libdw.h found or old libdw.h found, disables dwarf support. Please install elfutils-devel/elfutils-dev);

	NO_DWARF := 1

endif # Dwarf support

endif # NO_DWARF

-include arch/$(ARCH)/Makefile

ifeq ($(uname_S),Darwin)

	ifndef NO_FINK

		ifeq ($(shell test -d /sw/lib && echo y),y)

	msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]);

endif

ifneq ($(shell sh -c "(echo '\#include <dwarf.h>'; echo '\#include <libdw.h>'; echo 'int main(void) { Dwarf *dbg; dbg = dwarf_begin(0, DWARF_C_READ); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

	msg := $(warning No libdw.h found or old libdw.h found, disables dwarf support. Please install elfutils-devel/elfutils-dev);

else

ifndef NO_DWARF

ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)

	msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);

else

	BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT

	EXTLIBS += -lelf -ldw

	LIB_OBJS += $(OUTPUT)util/probe-finder.o

endif

endif

endif # PERF_HAVE_DWARF_REGS

endif # NO_DWARF

ifneq ($(shell sh -c "(echo '\#include <newt.h>'; echo 'int main(void) { newtInit(); newtCls(); return newtFinished(); }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -lnewt -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y)

	msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev);

ifndef NO_DWARF

PERF_HAVE_DWARF_REGS := 1

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o

endif

/*

 * Mapping of DWARF debug register numbers into register names.

 *

 * Copyright (C) 2010 Ian Munsie, IBM Corporation.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#include <libio.h>

#include <dwarf-regs.h>

struct pt_regs_dwarfnum {

	const char *name;

	unsigned int dwarfnum;

};

#define STR(s) #s

#define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}

#define GPR_DWARFNUM_NAME(num)	\

	{.name = STR(%gpr##num), .dwarfnum = num}

#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}

/*

 * Reference:

 * http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html

 */

static const struct pt_regs_dwarfnum regdwarfnum_table[] = {

	GPR_DWARFNUM_NAME(0),

	GPR_DWARFNUM_NAME(1),

	GPR_DWARFNUM_NAME(2),

	GPR_DWARFNUM_NAME(3),

	GPR_DWARFNUM_NAME(4),

	GPR_DWARFNUM_NAME(5),

	GPR_DWARFNUM_NAME(6),

	GPR_DWARFNUM_NAME(7),

	GPR_DWARFNUM_NAME(8),

	GPR_DWARFNUM_NAME(9),

	GPR_DWARFNUM_NAME(10),

	GPR_DWARFNUM_NAME(11),

	GPR_DWARFNUM_NAME(12),

	GPR_DWARFNUM_NAME(13),

	GPR_DWARFNUM_NAME(14),

	GPR_DWARFNUM_NAME(15),

	GPR_DWARFNUM_NAME(16),

	GPR_DWARFNUM_NAME(17),

	GPR_DWARFNUM_NAME(18),

	GPR_DWARFNUM_NAME(19),

	GPR_DWARFNUM_NAME(20),

	GPR_DWARFNUM_NAME(21),

	GPR_DWARFNUM_NAME(22),

	GPR_DWARFNUM_NAME(23),

	GPR_DWARFNUM_NAME(24),

	GPR_DWARFNUM_NAME(25),

	GPR_DWARFNUM_NAME(26),

	GPR_DWARFNUM_NAME(27),

	GPR_DWARFNUM_NAME(28),

	GPR_DWARFNUM_NAME(29),

	GPR_DWARFNUM_NAME(30),

	GPR_DWARFNUM_NAME(31),

	REG_DWARFNUM_NAME("%msr",   66),

	REG_DWARFNUM_NAME("%ctr",   109),

	REG_DWARFNUM_NAME("%link",  108),

	REG_DWARFNUM_NAME("%xer",   101),

	REG_DWARFNUM_NAME("%dar",   119),

	REG_DWARFNUM_NAME("%dsisr", 118),

	REG_DWARFNUM_END,

};

/**

 * get_arch_regstr() - lookup register name from it's DWARF register number

 * @n:	the DWARF register number

 *

 * get_arch_regstr() returns the name of the register in struct

 * regdwarfnum_table from it's DWARF register number. If the register is not

 * found in the table, this returns NULL;

 */

const char *get_arch_regstr(unsigned int n)

{

	const struct pt_regs_dwarfnum *roff;

	for (roff = regdwarfnum_table; roff->name != NULL; roff++)

		if (roff->dwarfnum == n)

			return roff->name;

	return NULL;

}

ifndef NO_DWARF

PERF_HAVE_DWARF_REGS := 1

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o

endif

/*

 * dwarf-regs.c : Mapping of DWARF debug register numbers into register names.

 * Extracted from probe-finder.c

 *

 * Written by Masami Hiramatsu <mhiramat@redhat.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 *

 */

#include <libio.h>

#include <dwarf-regs.h>

/*

 * Generic dwarf analysis helpers

 */

#define X86_32_MAX_REGS 8

const char *x86_32_regs_table[X86_32_MAX_REGS] = {

	"%ax",

	"%cx",

	"%dx",

	"%bx",

	"$stack",	/* Stack address instead of %sp */

	"%bp",

	"%si",

	"%di",

};

#define X86_64_MAX_REGS 16

const char *x86_64_regs_table[X86_64_MAX_REGS] = {

	"%ax",

	"%dx",

	"%cx",

	"%bx",

	"%si",

	"%di",

	"%bp",

	"%sp",

	"%r8",

	"%r9",

	"%r10",

	"%r11",

	"%r12",

	"%r13",

	"%r14",

	"%r15",

};

/* TODO: switching by dwarf address size */

#ifdef __x86_64__

#define ARCH_MAX_REGS X86_64_MAX_REGS

#define arch_regs_table x86_64_regs_table

#else

#define ARCH_MAX_REGS X86_32_MAX_REGS

#define arch_regs_table x86_32_regs_table

#endif

/* Return architecture dependent register string (for kprobe-tracer) */

const char *get_arch_regstr(unsigned int n)

{

	return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL;

}