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

Timestamp:

2007-05-31T21:21:02Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d8431986

Parents:

67f5fbd9

Message:

fix ICC compilation

File:

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

kernel/arch/ia32/src/interrupt.c

@@ -70 +70 @@
 
         if (CPU)
-                printf("----------------EXCEPTION OCCURED (cpu%d)----------------\n", CPU->id);
+                printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
         else
                 printf("----------------EXCEPTION OCCURED----------------\n");
                 
-        printf("%%eip: %#x (%s)\n",istate->eip,symbol);
-        printf("ERROR_WORD=%#x\n", istate->error_word);
-        printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags);
-        printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n",  istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
+        printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
+        printf("ERROR_WORD=%#lx\n", istate->error_word);
+        printf("%%cs=%#lx,flags=%#lx\n", istate->cs, istate->eflags);
+        printf("%%eax=%#lx, %%ecx=%#lx, %%edx=%#lx, %%esp=%p\n", istate->eax, istate->ecx, istate->edx, &istate->stack[0]);
 #ifdef CONFIG_DEBUG_ALLREGS
-        printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
-#endif
-        printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
-        printf("       %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
+        printf("%%esi=%#lx, %%edi=%#lx, %%ebp=%#lx, %%ebx=%#lx\n", istate->esi, istate->edi, istate->ebp, istate->ebx);
+#endif
+        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]);
 }
 
@@ -103 +103 @@
 
 /** General Protection Fault. */
-static void gp_fault(int n, istate_t *istate)
+static void gp_fault(int n __attribute__((unused)), istate_t *istate)
 {
         if (TASK) {
@@ -130 +130 @@
 }
 
-static void ss_fault(int n, istate_t *istate)
+static void ss_fault(int n __attribute__((unused)), istate_t *istate)
 {
         fault_if_from_uspace(istate, "stack fault");
@@ -138 +138 @@
 }
 
-static void simd_fp_exception(int n, istate_t *istate)
+static void simd_fp_exception(int n __attribute__((unused)), istate_t *istate)
 {
         uint32_t mxcsr;
         asm (
                 "stmxcsr %0;\n"
-                :"=m"(mxcsr)
+                : "=m" (mxcsr)
         );
         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx",
-            (unative_t)mxcsr);
-
-        decode_istate(istate);
-        printf("MXCSR: %#zx\n",(unative_t)(mxcsr));
+            (unative_t) mxcsr);
+
+        decode_istate(istate);
+        printf("MXCSR: %#lx\n", mxcsr);
         panic("SIMD FP exception(19)\n");
 }
 
-static void nm_fault(int n, istate_t *istate)
+static void nm_fault(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 #ifdef CONFIG_FPU_LAZY     
@@ -164 +164 @@
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(int n, istate_t *istate)
+static void tlb_shootdown_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
         trap_virtual_eoi();
@@ -172 +172 @@
 
 /** Handler of IRQ exceptions */
-static void irq_interrupt(int n, istate_t *istate)
+static void irq_interrupt(int n, istate_t *istate __attribute__((unused)))
 {
         ASSERT(n >= IVT_IRQBASE);
@@ -199 +199 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+                printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum);
 #endif
         }