Changeset 280a27e in mainline for arch/ia32

Timestamp:

2006-04-16T13:16:44Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

50de918

Parents:

c624b96

Message:

Printf ported back from uspace to kernel.
Printf calls changed to match new conventions.

Location:

arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• src/interrupt.c (modified) (3 diffs)
• src/mm/frame.c (modified) (1 diff)
• src/mm/memory_init.c (modified) (1 diff)
• src/smp/apic.c (modified) (1 diff)

arch/ia32/Makefile.inc

@@ -103 +103 @@
 endif
 
+## Compile with support for software integer division.
+#
+
+CONFIG_SOFTINT = y
+
 ARCH_SOURCES = \
         arch/$(ARCH)/src/context.s \

arch/ia32/src/interrupt.c

@@ -62 +62 @@
                 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: %#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]);
 #ifdef CONFIG_DEBUG_ALLREGS
-        printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%ebx=%X\n",  istate->esi,istate->edi,istate->ebp,istate->ebx);
+        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("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]);
 }
 
@@ -101 +101 @@
                 :"=m"(mxcsr)
         );
-        printf("MXCSR: %X\n",(__native)(mxcsr));
+        printf("MXCSR: %#zX\n",(__native)(mxcsr));
         panic("SIMD FP exception(19)\n");
 }
@@ -121 +121 @@
         if (!as_page_fault(page)) {
                 PRINT_INFO_ERRCODE(istate);
-                printf("page fault address: %X\n", page);
+                printf("page fault address: %#X\n", page);
                 panic("page fault\n");
         }

arch/ia32/src/mm/frame.c

@@ -92 +92 @@
                 else
                         name = "invalid";
-                printf("%P %QB %s\n", 
+                printf("%P %#llXB %s\n", 
                        (__native) e820table[i].base_address, 
                        (__u64) e820table[i].size,

arch/ia32/src/mm/memory_init.c

@@ -46 +46 @@
         
         for (i=0;i<e820counter;i++) {
-                printf("E820 base: %Q size: %Q type: ", e820table[i].base_address, e820table[i].size);
+                printf("E820 base: %#llX size: %lld type: ", e820table[i].base_address, e820table[i].size);
                 switch (e820table[i].type) {
                         case MEMMAP_MEMORY_AVAILABLE: 

arch/ia32/src/smp/apic.c

@@ -413 +413 @@
 
         tm.value = l_apic[LVT_Tm];
-        printf("LVT Tm: vector=%B, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
+        printf("LVT Tm: vector=%hhd, %s, %s, %s\n", tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]);
         lint.value = l_apic[LVT_LINT0];
-        printf("LVT LINT0: vector=%B, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
+        printf("LVT LINT0: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);
         lint.value = l_apic[LVT_LINT1]; 
-        printf("LVT LINT1: vector=%B, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);    
+        printf("LVT LINT1: vector=%hhd, %s, %s, %s, irr=%d, %s, %s\n", tm.vector, delmod_str[lint.delmod], delivs_str[lint.delivs], intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]);  
         error.value = l_apic[LVT_Err];
-        printf("LVT Err: vector=%B, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
+        printf("LVT Err: vector=%hhd, %s, %s\n", error.vector, delivs_str[error.delivs], mask_str[error.masked]);
 #endif
 }