Changeset 2829b354 in mainline for kernel/arch/amd64/src/interrupt.c

Timestamp:

2007-11-15T16:24:20Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e686744c

Parents:

bcfd586

Message:

Fix register names in exception dump and cstyle.

File:

• kernel/arch/amd64/src/interrupt.c (modified) (3 diffs)

kernel/arch/amd64/src/interrupt.c

@@ -67 +67 @@
 /*      uint64_t *x = &istate->stack[0]; */
 
-        if (!(symbol=get_symtab_entry(istate->rip)))
+        if (!(symbol = get_symtab_entry(istate->rip)))
                 symbol = "";
 
-        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n",n, __func__);
-        printf("%%rip: %#llx (%s)\n",istate->rip, symbol);
+        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
+        printf("%%rip: %#llx (%s)\n", istate->rip, symbol);
         printf("ERROR_WORD=%#llx\n", istate->error_word);
-        printf("%%rcs=%#llx, flags=%#llx, %%cr0=%#llx\n", istate->cs, istate->rflags, read_cr0());
-        printf("%%rax=%#llx, %%rcx=%#llx, %%rdx=%#llx\n", istate->rax, istate->rcx, istate->rdx);
-        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8 =%#llx\n", istate->rsi, istate->rdi, istate->r8);
-        printf("%%r9 =%#llx, %%r10 =%#llx, %%r11=%#llx\n", istate->r9, istate->r10, istate->r11);
+        printf("%%cs=%#llx, rflags=%#llx, %%cr0=%#llx\n", istate->cs,
+            istate->rflags, read_cr0());
+        printf("%%rax=%#llx, %%rcx=%#llx, %%rdx=%#llx\n", istate->rax,
+            istate->rcx, istate->rdx);
+        printf("%%rsi=%#llx, %%rdi=%#llx, %%r8=%#llx\n", istate->rsi,
+            istate->rdi, istate->r8);
+        printf("%%r9=%#llx, %%r10=%#llx, %%r11=%#llx\n", istate->r9,
+            istate->r10, istate->r11);
 #ifdef CONFIG_DEBUG_ALLREGS     
-        printf("%%r12=%#llx, %%r13=%#llx, %%r14=%#llx\n", istate->r12, istate->r13, istate->r14);
-        printf("%%r15=%#llx, %%rbx=%#llx, %%rbp=%#llx\n", istate->r15, istate->rbx, &istate->rbp);
+        printf("%%r12=%#llx, %%r13=%#llx, %%r14=%#llx\n", istate->r12,
+            istate->r13, istate->r14);
+        printf("%%r15=%#llx, %%rbx=%#llx, %%rbp=%#llx\n", istate->r15,
+            istate->rbx, &istate->rbp);
 #endif
         printf("%%rsp=%#llx\n", &istate->stack[0]);
@@ -196 +202 @@
         for (i = 0; i < IRQ_COUNT; i++) {
                 if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
-                        exc_register(IVT_IRQBASE + i, "irq", (iroutine) irq_interrupt);
+                        exc_register(IVT_IRQBASE + i, "irq",
+                            (iroutine) irq_interrupt);
         }
         
@@ -205 +212 @@
         
 #ifdef CONFIG_SMP
-        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", (iroutine) tlb_shootdown_ipi);
+        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
+            (iroutine) tlb_shootdown_ipi);
 #endif
 }