Changes in kernel/generic/src/debug/symtab.c [98000fb:7e752b2] in mainline

File:

• kernel/generic/src/debug/symtab.c (modified) (9 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;
         }
@@ -79 +83 @@
 /** Lookup symbol by address and format for display.
  *
- * Returns name of closest corresponding symbol, "Not found" if none exists
- * or "N/A" if no symbol information is available.
+ * Returns name of closest corresponding symbol,
+ * "unknown" if none exists and "N/A" if no symbol
+ * information is available.
  *
  * @param addr Address.
@@ -88 +93 @@
  *
  */
-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) {
@@ -97 +102 @@
                 return name;
         case ENOENT:
-                return "Not found";
+                return "unknown";
         default:
                 return "N/A";
@@ -187 +192 @@
                 uintptr_t addr = uint64_t_le2host(symbol_table[pos].address_le);
                 char *realname = symbol_table[pos].symbol_name;
-                printf("%p: %s\n", addr, realname);
+                printf("%p: %s\n", (void *) addr, realname);
                 pos++;
         }
@@ -235 +240 @@
                 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++;