Changeset aa85487 in mainline for kernel/generic/src/debug

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/generic/src/debug

Files:

• stacktrace.c (modified) (2 diffs)
• symtab.c (modified) (3 diffs)

kernel/generic/src/debug/stacktrace.c

@@ -44 +44 @@
 {
         int cnt = 0;
-        char *symbol;
+        const char *symbol;
         uintptr_t offset;
-
+        
         while (cnt++ < STACK_FRAMES_MAX && ops->frame_pointer_validate(fp)) {
                 if (ops->symbol_resolve &&
@@ -85 +85 @@
 }
 
-static bool kernel_symbol_resolve(uintptr_t addr, char **sp, uintptr_t *op)
+static bool kernel_symbol_resolve(uintptr_t addr, const char **sp, uintptr_t *op)
 {
         return (symtab_name_lookup(addr, sp, op) == 0);

kernel/generic/src/debug/symtab.c

@@ -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
@@ -92 +92 @@
  *
  */
-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);
         
@@ -239 +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++;