13 files changed, 795 insertions, 30 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 0aee6a91649..e457afa04b5 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -334,6 +334,7 @@ LIB_H += util/target.h
 LIB_H += util/rblist.h
 LIB_H += util/intlist.h
 LIB_H += util/perf_regs.h
+LIB_H += util/unwind.h
 
 LIB_OBJS += $(OUTPUT)util/abspath.o
 LIB_OBJS += $(OUTPUT)util/alias.o
@@ -547,6 +548,7 @@ else
         EXTLIBS += $(LIBUNWIND_LIBS)
         BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS)
         BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS)
+        LIB_OBJS += $(OUTPUT)util/unwind.o
 endif
 
 ifdef NO_NEWT
diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile
index 744e629797b..815841c04eb 100644
--- a/tools/perf/arch/x86/Makefile
+++ b/tools/perf/arch/x86/Makefile
@@ -2,4 +2,7 @@ ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
 endif
+ifndef NO_LIBUNWIND
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o
+endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
diff --git a/tools/perf/arch/x86/util/unwind.c b/tools/perf/arch/x86/util/unwind.c
new file mode 100644
index 00000000000..78d956eff96
--- /dev/null
+++ b/tools/perf/arch/x86/util/unwind.c
@@ -0,0 +1,111 @@
+
+#include <errno.h>
+#include <libunwind.h>
+#include "perf_regs.h"
+#include "../../util/unwind.h"
+
+#ifdef ARCH_X86_64
+int unwind__arch_reg_id(int regnum)
+{
+        int id;
+
+        switch (regnum) {
+        case UNW_X86_64_RAX:
+                id = PERF_REG_X86_AX;
+                break;
+        case UNW_X86_64_RDX:
+                id = PERF_REG_X86_DX;
+                break;
+        case UNW_X86_64_RCX:
+                id = PERF_REG_X86_CX;
+                break;
+        case UNW_X86_64_RBX:
+                id = PERF_REG_X86_BX;
+                break;
+        case UNW_X86_64_RSI:
+                id = PERF_REG_X86_SI;
+                break;
+        case UNW_X86_64_RDI:
+                id = PERF_REG_X86_DI;
+                break;
+        case UNW_X86_64_RBP:
+                id = PERF_REG_X86_BP;
+                break;
+        case UNW_X86_64_RSP:
+                id = PERF_REG_X86_SP;
+                break;
+        case UNW_X86_64_R8:
+                id = PERF_REG_X86_R8;
+                break;
+        case UNW_X86_64_R9:
+                id = PERF_REG_X86_R9;
+                break;
+        case UNW_X86_64_R10:
+                id = PERF_REG_X86_R10;
+                break;
+        case UNW_X86_64_R11:
+                id = PERF_REG_X86_R11;
+                break;
+        case UNW_X86_64_R12:
+                id = PERF_REG_X86_R12;
+                break;
+        case UNW_X86_64_R13:
+                id = PERF_REG_X86_R13;
+                break;
+        case UNW_X86_64_R14:
+                id = PERF_REG_X86_R14;
+                break;
+        case UNW_X86_64_R15:
+                id = PERF_REG_X86_R15;
+                break;
+        case UNW_X86_64_RIP:
+                id = PERF_REG_X86_IP;
+                break;
+        default:
+                pr_err("unwind: invalid reg id %d\n", regnum);
+                return -EINVAL;
+        }
+
+        return id;
+}
+#else
+int unwind__arch_reg_id(int regnum)
+{
+        int id;
+
+        switch (regnum) {
+        case UNW_X86_EAX:
+                id = PERF_REG_X86_AX;
+                break;
+        case UNW_X86_EDX:
+                id = PERF_REG_X86_DX;
+                break;
+        case UNW_X86_ECX:
+                id = PERF_REG_X86_CX;
+                break;
+        case UNW_X86_EBX:
+                id = PERF_REG_X86_BX;
+                break;
+        case UNW_X86_ESI:
+                id = PERF_REG_X86_SI;
+                break;
+        case UNW_X86_EDI:
+                id = PERF_REG_X86_DI;
+                break;
+        case UNW_X86_EBP:
+                id = PERF_REG_X86_BP;
+                break;
+        case UNW_X86_ESP:
+                id = PERF_REG_X86_SP;
+                break;
+        case UNW_X86_EIP:
+                id = PERF_REG_X86_IP;
+                break;
+        default:
+                pr_err("unwind: invalid reg id %d\n", regnum);
+                return -EINVAL;
+        }
+
+        return id;
+}
+#endif /* ARCH_X86_64 */
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 7c88a243b5d..d61825371ad 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -69,8 +69,8 @@ static int perf_report__add_branch_hist_entry(struct perf_tool *tool,
 
         if ((sort__has_parent || symbol_conf.use_callchain)
             && sample->callchain) {
-                err = machine__resolve_callchain(machine, al->thread,
-                                                 sample->callchain, &parent);
+                err = machine__resolve_callchain(machine, evsel, al->thread,
+                                                 sample, &parent);
                 if (err)
                         return err;
         }
@@ -140,8 +140,8 @@ static int perf_evsel__add_hist_entry(struct perf_evsel *evsel,
         struct hist_entry *he;
 
         if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
-                err = machine__resolve_callchain(machine, al->thread,
-                                                 sample->callchain, &parent);
+                err = machine__resolve_callchain(machine, evsel, al->thread,
+                                                 sample, &parent);
                 if (err)
                         return err;
         }
@@ -397,17 +397,17 @@ static int __cmd_report(struct perf_report *rep)
                 desc);
         }
 
-        if (dump_trace) {
-                perf_session__fprintf_nr_events(session, stdout);
-                goto out_delete;
-        }
-
         if (verbose > 3)
                 perf_session__fprintf(session, stdout);
 
         if (verbose > 2)
                 perf_session__fprintf_dsos(session, stdout);
 
+        if (dump_trace) {
+                perf_session__fprintf_nr_events(session, stdout);
+                goto out_delete;
+        }
+
         nr_samples = 0;