Changeset 371bd7d in mainline for kernel/generic/src/debug

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/generic/src/debug

Files:

• stacktrace.c (added)
• symtab.c (modified) (6 diffs)

kernel/generic/src/debug/symtab.c

@@ -38 +38 @@
 #include <symtab.h>
 #include <byteorder.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <typedefs.h>
 #include <errno.h>
@@ -46 +46 @@
 /** Get name of a symbol that seems most likely to correspond to address.
  *
- * @param addr Address.
- * @param name Place to store pointer to the symbol name.
+ * @param addr          Address.
+ * @param name          Place to store pointer to the symbol name.
+ * @param offset        Place to store offset from the symbol address.
  *
  * @return Zero on success or negative error code, ENOENT if not found,
@@ -53 +54 @@
  *
  */
-int symtab_name_lookup(unative_t addr, char **name)
+int symtab_name_lookup(uintptr_t addr, const char **name, uintptr_t *offset)
 {
 #ifdef CONFIG_SYMTAB
@@ -65 +66 @@
         if (addr >= uint64_t_le2host(symbol_table[i - 1].address_le)) {
                 *name = symbol_table[i - 1].symbol_name;
+                if (offset)
+                        *offset = addr -
+                            uint64_t_le2host(symbol_table[i - 1].address_le);
                 return EOK;
         }
@@ -88 +92 @@
  *
  */
-char *symtab_fmt_name_lookup(unative_t addr)
-{
-        char *name;
-        int rc = symtab_name_lookup(addr, &name);
+const char *symtab_fmt_name_lookup(uintptr_t addr)
+{
+        const char *name;
+        int rc = symtab_name_lookup(addr, &name, NULL);
         
         switch (rc) {
@@ -235 +239 @@
                 printf("\n");
                 pos = 0;
-                while ((hint = symtab_search_one(name, &pos))) {
+                while (symtab_search_one(name, &pos)) {
                         printf("%s\n", symbol_table[pos].symbol_name);
                         pos++;