Changeset 0dee005 in mainline

Timestamp:

2010-01-08T20:03:32Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f1a2c6e

Parents:

b83ba81

Message:

Change symtab_name_lookup() to also return the offset from the matching symbol
address.

Use uintptr_t instead of unative_t for addresses.

Formatting changes.

Location:

kernel/generic

Files:

• include/symtab.h (modified) (1 diff)
• src/debug/symtab.c (modified) (4 diffs)

kernel/generic/include/symtab.h

@@ -45 +45 @@
 };
 
-extern int symtab_name_lookup(unative_t addr, char **name);
-extern char *symtab_fmt_name_lookup(unative_t addr);
-extern int symtab_addr_lookup(const char *name, uintptr_t *addr);
-extern void symtab_print_search(const char *name);
-extern int symtab_compl(char *input, size_t size);
+extern int symtab_name_lookup(uintptr_t, char **, uintptr_t *);
+extern char *symtab_fmt_name_lookup(uintptr_t);
+extern int symtab_addr_lookup(const char *, uintptr_t *);
+extern void symtab_print_search(const char *);
+extern int symtab_compl(char *, size_t);
 
 #ifdef CONFIG_SYMTAB

kernel/generic/src/debug/symtab.c

@@ -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, 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 *symtab_fmt_name_lookup(uintptr_t addr)
 {
         char *name;
-        int rc = symtab_name_lookup(addr, &name);
+        int rc = symtab_name_lookup(addr, &name, NULL);
         
         switch (rc) {