Changeset 7715994 in mainline for kernel/arch/mips32/src/exception.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/exception.c (modified) (3 diffs)

kernel/arch/mips32/src/exception.c

@@ -49 +49 @@
 #include <symtab.h>
 
-static char * exctable[] = {
+static const char *exctable[] = {
         "Interrupt",
         "TLB Modified",
@@ -74 +74 @@
 static void print_regdump(istate_t *istate)
 {
-        char *pcsymbol, *rasymbol;
-
-        pcsymbol = symtab_fmt_name_lookup(istate->epc);
-        rasymbol = symtab_fmt_name_lookup(istate->ra);
-
+        const char *pcsymbol = symtab_fmt_name_lookup(istate->epc);
+        const char *rasymbol = symtab_fmt_name_lookup(istate->ra);
+        
         printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol,
             istate->ra, rasymbol, istate->sp);
@@ -93 +91 @@
 static void reserved_instr_exception(int n, istate_t *istate)
 {
-        if (*((uint32_t *)istate->epc) == 0x7c03e83b) {
+        if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
                 ASSERT(THREAD);
                 istate->epc += 4;
                 istate->v1 = istate->k1;
-        } else 
+        } else
                 unhandled_exception(n, istate);
 }