5 files changed, 162 insertions, 63 deletions

diff --git a/tools/perf/arch/sh/Makefile b/tools/perf/arch/sh/Makefile
new file mode 100644
index 000000000000..15130b50dfe3
--- /dev/null
+++ b/tools/perf/arch/sh/Makefile
@@ -0,0 +1,4 @@
+ifndef NO_DWARF
+PERF_HAVE_DWARF_REGS := 1
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
+endif
diff --git a/tools/perf/arch/sh/util/dwarf-regs.c b/tools/perf/arch/sh/util/dwarf-regs.c
new file mode 100644
index 000000000000..a11edb007a6c
--- /dev/null
+++ b/tools/perf/arch/sh/util/dwarf-regs.c
@@ -0,0 +1,55 @@
+/*
+ * Mapping of DWARF debug register numbers into register names.
+ *
+ * Copyright (C) 2010 Matt Fleming <matt@console-pimps.org>
+ *
+ * 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 SH_MAX_REGS 18
+const char *sh_regs_table[SH_MAX_REGS] = {
+        "r0",
+        "r1",
+        "r2",
+        "r3",
+        "r4",
+        "r5",
+        "r6",
+        "r7",
+        "r8",
+        "r9",
+        "r10",
+        "r11",
+        "r12",
+        "r13",
+        "r14",
+        "r15",
+        "pc",
+        "pr",
+};
+
+/* Return architecture dependent register string (for kprobe-tracer) */
+const char *get_arch_regstr(unsigned int n)
+{
+        return (n <= SH_MAX_REGS) ? sh_regs_table[n] : NULL;
+}
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 09cf5465e10a..4445a1e7052f 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -195,6 +195,65 @@ static int try_to_find_kprobe_trace_events(struct perf_probe_event *pev,
         return ntevs;
 }
 
+/*
+ * Find a src file from a DWARF tag path. Prepend optional source path prefix
+ * and chop off leading directories that do not exist. Result is passed back as
+ * a newly allocated path on success.
+ * Return 0 if file was found and readable, -errno otherwise.
+ */
+static int get_real_path(const char *raw_path, const char *comp_dir,
+                         char **new_path)
+{
+        const char *prefix = symbol_conf.source_prefix;
+
+        if (!prefix) {
+                if (raw_path[0] != '/' && comp_dir)
+                        /* If not an absolute path, try to use comp_dir */
+                        prefix = comp_dir;
+                else {
+                        if (access(raw_path, R_OK) == 0) {
+                                *new_path = strdup(raw_path);
+                                return 0;
+                        } else
+                                return -errno;
+                }
+        }
+
+        *new_path = malloc((strlen(prefix) + strlen(raw_path) + 2));
+        if (!*new_path)
+                return -ENOMEM;
+
+        for (;;) {
+                sprintf(*new_path, "%s/%s", prefix, raw_path);
+
+                if (access(*new_path, R_OK) == 0)
+                        return 0;
+
+                if (!symbol_conf.source_prefix)
+                        /* In case of searching comp_dir, don't retry */
+                        return -errno;
+
+                switch (errno) {
+                case ENAMETOOLONG:
+                case ENOENT:
+                case EROFS:
+                case EFAULT:
+                        raw_path = strchr(++raw_path, '/');
+                        if (!raw_path) {
+                                free(*new_path);
+                                *new_path = NULL;
+                                return -ENOENT;
+                        }
+                        continue;
+
+                default:
+                        free(*new_path);
+                        *new_path = NULL;
+                        return -errno;
+                }
+        }
+}
+
 #define LINEBUF_SIZE 256
 #define NR_ADDITIONAL_LINES 2
 
@@ -244,6 +303,7 @@ int show_line_range(struct line_range *lr)
         struct line_node *ln;
         FILE *fp;
         int fd, ret;
+        char *tmp;
 
         /* Search a line range */
         ret = init_vmlinux();
@@ -266,6 +326,15 @@ int show_line_range(struct line_range *lr)
                 return ret;
         }
 
+        /* Convert source file path */
+        tmp = lr->path;
+        ret = get_real_path(tmp, lr->comp_dir, &lr->path);
+        free(tmp);      /* Free old path */
+        if (ret < 0) {
+                pr_warning("Failed to find source file. (%d)\n", ret);
+                return ret;
+        }
+
         setup_pager();
 
         if (lr->function)
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index bc06d3e8bafa..ed362acff4b6 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -86,6 +86,7 @@ struct line_range {
         int                     end;            /* End line number */
         int                     offset;         /* Start line offset */
         char                    *path;          /* Real path name */
+        char                    *comp_dir;      /* Compile directory */
         struct list_head        line_list;      /* Visible lines */
 };
 
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 3e64e1fa1051..f88070ea5b90 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -58,55 +58,6 @@ static int strtailcmp(const char *s1, const char *s2)
         return 0;
 }
 
-/*
- * Find a src file from a DWARF tag path. Prepend optional source path prefix
- * and chop off leading directories that do not exist. Result is passed back as
- * a newly allocated path on success.
- * Return 0 if file was found and readable, -errno otherwise.
- */
-static int get_real_path(const char *raw_path, char **new_path)
-{
-        if (!symbol_conf.source_prefix) {
-                if (access(raw_path, R_OK) == 0) {
-                        *new_path = strdup(raw_path);
-                        return 0;
-                } else
-                        return -errno;
-        }
-
-        *new_path = malloc((strlen(symbol_conf.source_prefix) +
-                            strlen(raw_path) + 2));
-        if (!*new_path)
-                return -ENOMEM;
-
-        for (;;) {
-                sprintf(*new_path, "%s/%s", symbol_conf.source_prefix,
-                        raw_path);
-
-                if (access(*new_path, R_OK) == 0)
-                        return 0;
-
-                switch (errno) {
-                case ENAMETOOLONG:
-                case ENOENT:
-                case EROFS:
-                case EFAULT:
-                        raw_path = strchr(++raw_path, '/');
-                        if (!raw_path) {
-                                free(*new_path);
-                                *new_path = NULL;
-                                return -ENOENT;
-                        }
-                        continue;
-
-                default:
-                        free(*new_path);
-                        *new_path = NULL;
-                        return -errno;
-                }
-        }
-}
-
 /* Line number list operations */
 
 /* Add a line to line number list */
@@ -193,12 +144,21 @@ static const char *cu_find_realpath(Dwarf_Die *cu_die, const char *fname)
         return src;
 }
 
+/* Get DW_AT_comp_dir (should be NULL with older gcc) */
+static const char *cu_get_comp_dir(Dwarf_Die *cu_die)
+{
+        Dwarf_Attribute attr;
+        if (dwarf_attr(cu_die, DW_AT_comp_dir, &attr) == NULL)
+                return NULL;
+        return dwarf_formstring(&attr);
+}
+
 /* Compare diename and tname */
 static bool die_compare_name(Dwarf_Die *dw_die, const char *tname)
 {
         const char *name;
         name = dwarf_diename(dw_die);
-        return name ? strcmp(tname, name) : -1;
+        return name ? (strcmp(tname, name) == 0) : false;
 }
 
 /* Get type die, but skip qualifiers and typedef */
@@ -369,7 +329,7 @@ static int __die_find_variable_cb(Dwarf_Die *die_mem, void *data)
         tag = dwarf_tag(die_mem);
         if ((tag == DW_TAG_formal_parameter ||
              tag == DW_TAG_variable) &&
-            (die_compare_name(die_mem, name) == 0))
+            die_compare_name(die_mem, name))
                 return DIE_FIND_CB_FOUND;
 
         return DIE_FIND_CB_CONTINUE;
@@ -388,7 +348,7 @@ static int __die_find_member_cb(Dwarf_Die *die_mem, void *data)
         const char *name = data;
 
         if ((dwarf_tag(die_mem) == DW_TAG_member) &&
-            (die_compare_name(die_mem, name) == 0))
+            die_compare_name(die_mem, name))
                 return DIE_FIND_CB_FOUND;
 
         return DIE_FIND_CB_SIBLING;
@@ -546,8 +506,8 @@ static int convert_variable_type(Dwarf_Die *vr_die,
                                 return -ENOMEM;
                         }
                 }
-                if (die_compare_name(&type, "char") != 0 &&
-                    die_compare_name(&type, "unsigned char") != 0) {
+                if (!die_compare_name(&type, "char") &&
+                    !die_compare_name(&type, "unsigned char")) {
                         pr_warning("Failed to cast into string: "
                                    "%s is not (unsigned) char *.",
                                    dwarf_diename(vr_die));
@@ -1057,7 +1017,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
 
         /* Check tag and diename */
         if (dwarf_tag(sp_die) != DW_TAG_subprogram ||
-            die_compare_name(sp_die, pp->function) != 0)
+            !die_compare_name(sp_die, pp->function))
                 return DWARF_CB_OK;
 
         pf->fname = dwarf_decl_file(sp_die);
@@ -1256,13 +1216,11 @@ end:
 static int line_range_add_line(const char *src, unsigned int lineno,
                                struct line_range *lr)
 {
-        int ret;
-
-        /* Copy real path */
+        /* Copy source path */
         if (!lr->path) {
-                ret = get_real_path(src, &lr->path);
-                if (ret != 0)
-                        return ret;
+                lr->path = strdup(src);
+                if (lr->path == NULL)
+                        return -ENOMEM;
         }
         return line_list__add_line(&lr->line_list, lineno);
 }
@@ -1382,7 +1340,7 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
         struct line_range *lr = lf->lr;
 
         if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
-            die_compare_name(sp_die, lr->function) == 0) {
+            die_compare_name(sp_die, lr->function)) {
                 lf->fname = dwarf_decl_file(sp_die);
                 dwarf_decl_line(sp_die, &lr->offset);
                 pr_debug("fname: %s, lineno:%d\n", lf->fname, lr->offset);
@@ -1425,6 +1383,7 @@ int find_line_range(int fd, struct line_range *lr)
         size_t cuhl;
         Dwarf_Die *diep;
         Dwarf *dbg;
+        const char *comp_dir;
 
         dbg = dwarf_begin(fd, DWARF_C_READ);
         if (!dbg) {
@@ -1460,7 +1419,18 @@ int find_line_range(int fd, struct line_range *lr)
                 }
                 off = noff;
         }
-        pr_debug("path: %lx\n", (unsigned long)lr->path);
+
+        /* Store comp_dir */
+        if (lf.found) {
+                comp_dir = cu_get_comp_dir(&lf.cu_die);
+                if (comp_dir) {
+                        lr->comp_dir = strdup(comp_dir);
+                        if (!lr->comp_dir)
+                                ret = -ENOMEM;
+                }
+        }
+
+        pr_debug("path: %s\n", lr->path);
         dwarf_end(dbg);
 
         return (ret < 0) ? ret : lf.found;