Changeset aa85487 in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2010-03-07T15:11:56Z (15 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

File:

• kernel/arch/ia32/src/interrupt.c (modified) (2 diffs)

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 void decode_istate(istate_t *istate)
 {
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->eip);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->eip);
+        
         if (CPU)
                 printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
         else
                 printf("----------------EXCEPTION OCCURED----------------\n");
-                
+        
         printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
         printf("ERROR_WORD=%#lx\n", istate->error_word);
@@ -80 +78 @@
         printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
         printf("       %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
-
+        
         stack_trace_istate(istate);
 }