lkml.org 
[lkml]   [2012]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 11/15] perf, tool: Add interface to arch registers sets
Date
Adding header files to access unified API for arch registers.

In addition adding a way to obtain register name based on the
API ID value.

Also adding PERF_REGS_MASK macro with mask definition of
all current arch registers (will be used in unwind patches).

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/Makefile | 9 +++-
tools/perf/arch/x86/include/perf_regs.h | 101 +++++++++++++++++++++++++++++++
tools/perf/util/perf_regs.h | 10 +++
3 files changed, 119 insertions(+), 1 deletions(-)
create mode 100644 tools/perf/arch/x86/include/perf_regs.h
create mode 100644 tools/perf/util/perf_regs.h

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 1097d1d..0f53b98 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -58,6 +58,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ )
+NO_PERF_REGS_DEFS := 1

CC = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
@@ -66,7 +67,8 @@ BISON= $(CROSS_COMPILE)bison

# Additional ARCH settings for x86
ifeq ($(ARCH),i386)
- ARCH := x86
+ ARCH := x86
+ NO_PERF_REGS_DEFS := 0
endif
ifeq ($(ARCH),x86_64)
ARCH := x86
@@ -79,6 +81,7 @@ ifeq ($(ARCH),x86_64)
ARCH_CFLAGS := -DARCH_X86_64
ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
endif
+ NO_PERF_REGS_DEFS := 0
endif

# Treat warnings as errors unless directed not to
@@ -318,6 +321,7 @@ LIB_H += util/top.h
LIB_H += $(ARCH_INCLUDE)
LIB_H += util/cgroup.h
LIB_H += util/vdso.h
+LIB_H += util/perf_regs.h

LIB_OBJS += $(OUTPUT)util/abspath.o
LIB_OBJS += $(OUTPUT)util/alias.o
@@ -655,6 +659,9 @@ else
endif
endif

+ifeq ($(NO_PERF_REGS_DEFS),1)
+ BASIC_CFLAGS += -DNO_PERF_REGS_DEFS
+endif

ifdef NO_STRLCPY
BASIC_CFLAGS += -DNO_STRLCPY
diff --git a/tools/perf/arch/x86/include/perf_regs.h b/tools/perf/arch/x86/include/perf_regs.h
new file mode 100644
index 0000000..97c0a25
--- /dev/null
+++ b/tools/perf/arch/x86/include/perf_regs.h
@@ -0,0 +1,101 @@
+#ifndef PERF_REGS_H
+#define PERF_REGS_H
+
+#include <stdlib.h>
+
+#ifdef ARCH_X86_64
+#include "../../../../../arch/x86/include/asm/perf_regs_64.h"
+#define PERF_REGS_MASK ((1 << PERF_X86_64_REG_MAX) - 1)
+
+static inline const char *perf_reg_name(int id)
+{
+ switch (id) {
+ case PERF_X86_64_REG_RAX:
+ return "RAX";
+ case PERF_X86_64_REG_RBX:
+ return "RBX";
+ case PERF_X86_64_REG_RCX:
+ return "RCX";
+ case PERF_X86_64_REG_RDX:
+ return "RDX";
+ case PERF_X86_64_REG_RSI:
+ return "RSI";
+ case PERF_X86_64_REG_RDI:
+ return "RDI";
+ case PERF_X86_64_REG_R8:
+ return "R8";
+ case PERF_X86_64_REG_R9:
+ return "R9";
+ case PERF_X86_64_REG_R10:
+ return "R10";
+ case PERF_X86_64_REG_R11:
+ return "R11";
+ case PERF_X86_64_REG_R12:
+ return "R12";
+ case PERF_X86_64_REG_R13:
+ return "R13";
+ case PERF_X86_64_REG_R14:
+ return "R14";
+ case PERF_X86_64_REG_R15:
+ return "R15";
+ case PERF_X86_64_REG_RBP:
+ return "RBP";
+ case PERF_X86_64_REG_RSP:
+ return "RSP";
+ case PERF_X86_64_REG_RIP:
+ return "RIP";
+ case PERF_X86_64_REG_FLAGS:
+ return "FLAGS";
+ case PERF_X86_64_REG_CS:
+ return "CS";
+ case PERF_X86_64_REG_SS:
+ return "SS";
+ default:
+ return NULL;
+ }
+ return NULL;
+}
+#else
+#include "../../../../../arch/x86/include/asm/perf_regs_32.h"
+#define PERF_REGS_MASK ((1 << PERF_X86_32_REG_MAX) - 1)
+
+static inline const char *perf_reg_name(int id)
+{
+ switch (id) {
+ case PERF_X86_32_REG_EAX:
+ return "EAX";
+ case PERF_X86_32_REG_EBX:
+ return "EBX";
+ case PERF_X86_32_REG_ECX:
+ return "ECX";
+ case PERF_X86_32_REG_EDX:
+ return "EDX";
+ case PERF_X86_32_REG_ESI:
+ return "ESI";
+ case PERF_X86_32_REG_EDI:
+ return "EDI";
+ case PERF_X86_32_REG_EBP:
+ return "EBP";
+ case PERF_X86_32_REG_ESP:
+ return "ESP";
+ case PERF_X86_32_REG_EIP:
+ return "EIP";
+ case PERF_X86_32_REG_FLAGS:
+ return "FLAGS";
+ case PERF_X86_32_REG_CS:
+ return "CS";
+ case PERF_X86_32_REG_DS:
+ return "DS";
+ case PERF_X86_32_REG_ES:
+ return "ES";
+ case PERF_X86_32_REG_FS:
+ return "FS";
+ case PERF_X86_32_REG_GS:
+ return "GS";
+ default:
+ return NULL;
+ }
+ return NULL;
+}
+#endif /* ARCH_X86_64 */
+#endif /* PERF_REGS_H */
diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h
new file mode 100644
index 0000000..5e2a945
--- /dev/null
+++ b/tools/perf/util/perf_regs.h
@@ -0,0 +1,10 @@
+#ifndef __PERF_REGS_H
+#define __PERF_REGS_H
+
+#ifndef NO_PERF_REGS_DEFS
+#include <perf_regs.h>
+#else
+#define PERF_REGS_MASK 0
+#endif /* NO_PERF_REGS_DEFS */
+
+#endif /* __PERF_REGS_H */
--
1.7.1


\
 
 \ /
  Last update: 2012-03-28 14:41    [W:0.082 / U:0.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site