Imported Upstream version 1.3.1

[platform/upstream/libunwind.git] / src / mi / Gget_proc_name.c

diff --git a/src/mi/Gget_proc_name.c b/src/mi/Gget_proc_name.c
index 7251c59..840d900 100644 (file)
--- a/src/mi/Gget_proc_name.c
+++ b/src/mi/Gget_proc_name.c
@@ -1,6 +1,6 @@
 /* libunwind - a platform-independent unwind library
    Copyright (C) 2001-2005 Hewlett-Packard Co
-       Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
 This file is part of libunwind.
 
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 
 static inline int
 intern_string (unw_addr_space_t as, unw_accessors_t *a,
-              unw_word_t addr, char *buf, size_t buf_len, void *arg)
+               unw_word_t addr, char *buf, size_t buf_len, void *arg)
 {
   size_t i;
   int ret;
@@ -36,24 +36,24 @@ intern_string (unw_addr_space_t as, unw_accessors_t *a,
   for (i = 0; i < buf_len; ++i)
     {
       if ((ret = fetch8 (as, a, &addr, (int8_t *) buf + i, arg)) < 0)
-       return ret;
+        return ret;
 
       if (buf[i] == '\0')
-       return 0;               /* copied full string; return success */
+        return 0;               /* copied full string; return success */
     }
-  buf[buf_len - 1] = '\0';     /* ensure string is NUL terminated */
+  buf[buf_len - 1] = '\0';      /* ensure string is NUL terminated */
   return -UNW_ENOMEM;
 }
 
 static inline int
 get_proc_name (unw_addr_space_t as, unw_word_t ip,
-              char *buf, size_t buf_len, unw_word_t *offp, void *arg)
+               char *buf, size_t buf_len, unw_word_t *offp, void *arg)
 {
-  unw_accessors_t *a = unw_get_accessors (as);
+  unw_accessors_t *a = unw_get_accessors_int (as);
   unw_proc_info_t pi;
   int ret;
 
-  buf[0] = '\0';       /* always return a valid string, even if it's empty */
+  buf[0] = '\0';        /* always return a valid string, even if it's empty */
 
   ret = unwi_find_dynamic_proc_info (as, ip, &pi, 1, arg);
   if (ret == 0)
@@ -61,25 +61,25 @@ get_proc_name (unw_addr_space_t as, unw_word_t ip,
       unw_dyn_info_t *di = pi.unwind_info;
 
       if (offp)
-       *offp = ip - pi.start_ip;
+        *offp = ip - pi.start_ip;
 
       switch (di->format)
-       {
-       case UNW_INFO_FORMAT_DYNAMIC:
-         ret = intern_string (as, a, di->u.pi.name_ptr, buf, buf_len, arg);
-         break;
-
-       case UNW_INFO_FORMAT_TABLE:
-       case UNW_INFO_FORMAT_REMOTE_TABLE:
-         /* XXX should we create a fake name, e.g.: "tablenameN",
-            where N is the index of the function in the table??? */
-         ret = -UNW_ENOINFO;
-         break;
-
-       default:
-         ret = -UNW_EINVAL;
-         break;
-       }
+        {
+        case UNW_INFO_FORMAT_DYNAMIC:
+          ret = intern_string (as, a, di->u.pi.name_ptr, buf, buf_len, arg);
+          break;
+
+        case UNW_INFO_FORMAT_TABLE:
+        case UNW_INFO_FORMAT_REMOTE_TABLE:
+          /* XXX should we create a fake name, e.g.: "tablenameN",
+             where N is the index of the function in the table??? */
+          ret = -UNW_ENOINFO;
+          break;
+
+        default:
+          ret = -UNW_EINVAL;
+          break;
+        }
       unwi_put_dynamic_unwind_info (as, &pi, arg);
       return ret;
     }
@@ -95,12 +95,24 @@ get_proc_name (unw_addr_space_t as, unw_word_t ip,
   return -UNW_ENOINFO;
 }
 
-PROTECTED int
+int
 unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len,
-                  unw_word_t *offp)
+                   unw_word_t *offp)
 {
   struct cursor *c = (struct cursor *) cursor;
-
-  return get_proc_name (tdep_get_as (c), tdep_get_ip (c), buf, buf_len, offp,
-                       tdep_get_as_arg (c));
+  unw_word_t ip;
+  int error;
+
+  ip = tdep_get_ip (c);
+#if !defined(__ia64__)
+  if (c->dwarf.use_prev_instr)
+    --ip;
+#endif
+  error = get_proc_name (tdep_get_as (c), ip, buf, buf_len, offp,
+                         tdep_get_as_arg (c));
+#if !defined(__ia64__)
+  if (c->dwarf.use_prev_instr && offp != NULL && error == 0)
+    *offp += 1;
+#endif
+  return error;
 }