diff options
author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2017-11-08 09:01:12 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-11-16 15:06:13 +0100 |
commit | a9fc2db0a8abf51c81122799c5ae4808f2324b6d (patch) | |
tree | 7327258f0fa6a4e70d87d91c3d1db04faaabcdd6 /tools/perf/arch/s390/util/unwind-libdw.c | |
parent | s390/perf: add support for perf_regs and libdw (diff) | |
download | linux-dev-a9fc2db0a8abf51c81122799c5ae4808f2324b6d.tar.xz linux-dev-a9fc2db0a8abf51c81122799c5ae4808f2324b6d.zip |
s390/perf: define common DWARF register string table
Instead of defining DWARF register to string table in dwarf-regs-table.h
and dwarf-regs.c, use a common table in dwarf-regs-table.h.
Ensure that the DWARF register table is up-to-date with
http://refspecs.linuxfoundation.org/ELF/zSeries/lzsabi0_s390/x1542.html.
For unwinding with libdw, also ensure to correctly setup the DWARF
register frame according to the register mappings. Currently, libdw
supports up to 32 registers only.
Suggested-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-and-tested-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to '')
-rw-r--r-- | tools/perf/arch/s390/util/unwind-libdw.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/perf/arch/s390/util/unwind-libdw.c b/tools/perf/arch/s390/util/unwind-libdw.c index 281bbb82402a..ba8d98b8b09e 100644 --- a/tools/perf/arch/s390/util/unwind-libdw.c +++ b/tools/perf/arch/s390/util/unwind-libdw.c @@ -1,21 +1,26 @@ +#include <linux/kernel.h> #include <elfutils/libdwfl.h> #include "../../util/unwind-libdw.h" #include "../../util/perf_regs.h" #include "../../util/event.h" +#include "dwarf-regs-table.h" bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg) { struct unwind_info *ui = arg; struct regs_dump *user_regs = &ui->sample->user_regs; - Dwarf_Word dwarf_regs[PERF_REG_S390_MAX]; + Dwarf_Word dwarf_regs[ARRAY_SIZE(s390_dwarf_regs)]; #define REG(r) ({ \ Dwarf_Word val = 0; \ perf_reg_value(&val, user_regs, PERF_REG_S390_##r); \ val; \ }) - + /* + * For DWARF register mapping details, + * see also perf/arch/s390/include/dwarf-regs-table.h + */ dwarf_regs[0] = REG(R0); dwarf_regs[1] = REG(R1); dwarf_regs[2] = REG(R2); @@ -32,9 +37,9 @@ bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg) dwarf_regs[13] = REG(R13); dwarf_regs[14] = REG(R14); dwarf_regs[15] = REG(R15); - dwarf_regs[16] = REG(MASK); - dwarf_regs[17] = REG(PC); + dwarf_regs[64] = REG(MASK); + dwarf_regs[65] = REG(PC); - dwfl_thread_state_register_pc(thread, dwarf_regs[17]); + dwfl_thread_state_register_pc(thread, dwarf_regs[65]); return dwfl_thread_state_registers(thread, 0, 16, dwarf_regs); } |