Changeset c621f4aa in mainline for kernel/generic/src/debug/symtab.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/generic/src/debug/symtab.c (modified) (7 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 offset        Place to store offset from the symbol address.
+ * @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,
@@ -54 +54 @@
  *
  */
-int symtab_name_lookup(uintptr_t addr, char **name, uintptr_t *offset)
+int symtab_name_lookup(uintptr_t addr, const char **name, uintptr_t *offset)
 {
 #ifdef CONFIG_SYMTAB
@@ -83 +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.
@@ -92 +93 @@
  *
  */
-char *symtab_fmt_name_lookup(uintptr_t addr)
-{
-        char *name;
+const char *symtab_fmt_name_lookup(uintptr_t addr)
+{
+        const char *name;
         int rc = symtab_name_lookup(addr, &name, NULL);
         
@@ -101 +102 @@
                 return name;
         case ENOENT:
-                return "Not found";
+                return "unknown";
         default:
                 return "N/A";
@@ -239 +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++;