Changeset ab08b42 in mainline for arch/ia32/src

Timestamp:

2005-09-03T16:40:25Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

6401f79

Parents:

f6297e0

Message:

Added symbol table lookup in exceptions.
This breaks ia64 & ppc architecture compiles.

Location:

arch/ia32/src

Files:

• acpi/acpi.c (modified) (3 diffs)
• acpi/madt.c (modified) (2 diffs)
• interrupt.c (modified) (5 diffs)
• smp/apic.c (modified) (2 diffs)

arch/ia32/src/acpi/acpi.c

@@ -96 +96 @@
          */
 
-        addr[0] = (__u8 *) ebda;
+        addr[0] = (__u8 *) PA2KA(ebda);
         for (i = (ebda ? 0 : 1); i < 2; i++) {
                 for (j = 0; j < length[i]; j += 16) {
@@ -111 +111 @@
         printf("%L: ACPI Root System Description Pointer\n", acpi_rsdp);
 
-        acpi_rsdt = (struct acpi_rsdt *) acpi_rsdp->rsdt_address;
+        acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;
         if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((__address) acpi_rsdp->xsdt_address);
 
@@ -137 +137 @@
         for (i=0; i<cnt; i++) {
                 for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
-                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) acpi_rsdt->entry[i];
+                        struct acpi_sdt_header *h = (struct acpi_sdt_header *) (__native) acpi_rsdt->entry[i];
                 
                         map_sdt(h);     

arch/ia32/src/acpi/madt.c

@@ -115 +115 @@
 
 
-        l_apic = (__u32 *) acpi_madt->l_apic_address;
+        l_apic = (__u32 *) (__native) acpi_madt->l_apic_address;
 
         while (h < end) {
@@ -177 +177 @@
         if (!madt_io_apic_entry_cnt++) {
                 madt_io_apic_entries = ioa;
-                io_apic = (__u32 *) ioa->io_apic_address;
+                io_apic = (__u32 *) (__native) ioa->io_apic_address;
         }
         else {

arch/ia32/src/interrupt.c

@@ -37 +37 @@
 #include <mm/tlb.h>
 #include <arch.h>
+#include <symtab.h>
 
 /*
@@ -47 +48 @@
 void (* enable_irqs_function)(__u16 irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
+
+#define PRINT_INFO_ERRCODE(x) { \
+        char *symbol = get_symtab_entry(stack[1]); \
+        if (!symbol) \
+                symbol = ""; \
+        printf("----------------EXCEPTION OCCURED----------------\n"); \
+        printf("%%eip: %X (%s)\n",x[1],symbol); \
+        printf("ERROR_WORD=%X\n", x[0]); \
+        printf("%%cs=%X,flags=%X\n", x[2], x[3]); \
+        printf("%%eax=%X, %%ebx=%X, %%ecx=%X, %%edx=%X\n",\
+               x[-2],x[-5],x[-3],x[-4]); \
+        printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%esp=%X\n",\
+               x[-8],x[-9],x[-1],x); \
+        printf("stack: %X, %X, %X, %X\n", x[4], x[5], x[6], x[7]); \
+        printf("       %X, %X, %X, %X\n", x[8], x[9], x[10], x[11]); \
+        }
 
 iroutine trap_register(__u8 n, iroutine f)
@@ -80 +97 @@
 void gp_fault(__u8 n, __native stack[])
 {
-        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
-        printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
-        printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
+        PRINT_INFO_ERRCODE(stack);
         panic("general protection fault\n");
 }
@@ -88 +103 @@
 void ss_fault(__u8 n, __native stack[])
 {
-        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
-        printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
-        printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
+        PRINT_INFO_ERRCODE(stack);
         panic("stack fault\n");
 }
@@ -111 +124 @@
 void page_fault(__u8 n, __native stack[])
 {
+        PRINT_INFO_ERRCODE(stack);
         printf("page fault address: %X\n", read_cr2());
-        printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
-        printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
-        printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
         panic("page fault\n");
 }

arch/ia32/src/smp/apic.c

@@ -112 +112 @@
 }
 
-void apic_spurious(__u8 n, __u32 stack[])
+void apic_spurious(__u8 n, __native stack[])
 {
         printf("cpu%d: APIC spurious interrupt\n", CPU->id);
@@ -320 +320 @@
 }
 
-void l_apic_timer_interrupt(__u8 n, __u32 stack[])
+void l_apic_timer_interrupt(__u8 n, __native stack[])
 {
         l_apic_eoi();