Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1428472

[PATCH 1/5] perf unwind: Change macro names of perf register

From He Kuang <hekuang@huawei.com>
Newsgroups linux.kernel
Subject [PATCH 1/5] perf unwind: Change macro names of perf register
Date 2016-06-22 09:00 +0200
Message-ID <rMKiK-8pY-23@gated-at.bofh.it> (permalink)
References <rMKiJ-8pY-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Use macro name prefixed with "LIBUNWIND_ARCH" for better understanding
that the regs used by callbacks of libunwind are arch specific. The
real regs used should be defined in the wrapper file of
"unwind-libunwind-local.c" for each supported arch.

Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/unwind-libunwind-local.c | 6 ++++--
 tools/perf/util/unwind.h                 | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c
index 01c2e86..97c0f8f 100644
--- a/tools/perf/util/unwind-libunwind-local.c
+++ b/tools/perf/util/unwind-libunwind-local.c
@@ -462,7 +462,8 @@ static int access_mem(unw_addr_space_t __maybe_unused as,
 		return 0;
 	}
 
-	ret = perf_reg_value(&start, &ui->sample->user_regs, PERF_REG_SP);
+	ret = perf_reg_value(&start, &ui->sample->user_regs,
+			     LIBUNWIND__ARCH_REG_SP);
 	if (ret)
 		return ret;
 
@@ -621,7 +622,8 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
 	unw_cursor_t c;
 	int ret, i = 0;
 
-	ret = perf_reg_value(&val, &ui->sample->user_regs, PERF_REG_IP);
+	ret = perf_reg_value(&val, &ui->sample->user_regs,
+			     LIBUNWIND__ARCH_REG_IP);
 	if (ret)
 		return ret;
 
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
index b074662..84c6d44 100644
--- a/tools/perf/util/unwind.h
+++ b/tools/perf/util/unwind.h
@@ -32,6 +32,15 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
 #ifndef LIBUNWIND__ARCH_REG_ID
 #define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__arch_reg_id(regnum)
 #endif
+
+#ifndef LIBUNWIND__ARCH_REG_SP
+#define LIBUNWIND__ARCH_REG_SP PERF_REG_SP
+#endif
+
+#ifndef LIBUNWIND__ARCH_REG_IP
+#define LIBUNWIND__ARCH_REG_IP PERF_REG_IP
+#endif
+
 int LIBUNWIND__ARCH_REG_ID(int regnum);
 int unwind__prepare_access(struct thread *thread, struct map *map);
 void unwind__flush_access(struct thread *thread);
-- 
1.8.5.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 0/5] Fixes on perf unwind He Kuang <hekuang@huawei.com> - 2016-06-22 09:00 +0200
  [PATCH 2/5] perf unwind: Fix wrongly used regs for x86_32 unwind He Kuang <hekuang@huawei.com> - 2016-06-22 09:00 +0200
  [PATCH 4/5] perf tools: Let python use correct gcc for build_ext He Kuang <hekuang@huawei.com> - 2016-06-22 09:00 +0200
  [PATCH 1/5] perf unwind: Change macro names of perf register He Kuang <hekuang@huawei.com> - 2016-06-22 09:00 +0200
  [PATCH 3/5] perf unwind: Fix wrongly used regs for aarch64 unwind He Kuang <hekuang@huawei.com> - 2016-06-22 09:00 +0200
  Re: [PATCH 0/5] Fixes on perf unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-23 15:40 +0200

csiph-web