Changeset 7715994 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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.

File:

• kernel/arch/mips32/src/debugger.c (modified) (2 diffs)

kernel/arch/mips32/src/debugger.c

@@ -253 +253 @@
 {
         unsigned int i;
-        char *symbol;
         
         printf("#  Count Address    INPROG ONESHOT FUNCCALL In symbol\n");
         printf("-- ----- ---------- ------ ------- -------- ---------\n");
         
-        for (i = 0; i < BKPOINTS_MAX; i++)
+        for (i = 0; i < BKPOINTS_MAX; i++) {
                 if (breakpoints[i].address) {
-                        symbol = symtab_fmt_name_lookup(
+                        const char *symbol = symtab_fmt_name_lookup(
                             breakpoints[i].address);
-
+                        
                         printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
@@ -270 +269 @@
                             BKPOINT_FUNCCALL) ? "true" : "false"), symbol);
                 }
+        }
+        
         return 1;
 }