Changeset ab08b42 in mainline for arch/amd64

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/amd64

Files:

• Makefile.inc (modified) (2 diffs)
• _link.ld (modified) (2 diffs)
• include/asm.h (modified) (1 diff)
• include/boot/boot.h (added)
• src/dummy.s (modified) (1 diff)
• src/interrupt.c (modified) (5 diffs)

arch/amd64/Makefile.inc

@@ -6 +6 @@
 AS=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-as
 LD=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-ld
-
-
+OBJCOPY=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-objcopy
+BFD_NAME=elf64-x86-64
+BFD_ARCH=i386:x86-64
 
 DEFS=-DARCH=$(ARCH)
@@ -47 +48 @@
         arch/cpu/cpu.c \
         arch/proc/scheduler.c \
-        arch/userspace.c
+        arch/userspace.c \
+        arch/acpi/acpi.c \
+        arch/acpi/madt.c
+
+ifdef SMP
+arch_sources += arch/smp/apic.c \
+                arch/smp/ipi.c \
+                arch/smp/mps.c \
+                arch/smp/smp.c
+endif

arch/amd64/_link.ld

@@ -32 +32 @@
                 *(.data);               /* initialized data */
                 *(.rodata*);            /* string literals */
-                *(COMMON);              /* global variables */
                 hardcoded_load_address = .;
                 QUAD(0xffffffff80008000);
@@ -39 +38 @@
                 hardcoded_kdata_size = .;
                 QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
+                *(COMMON);              /* global variables */
+
+
+
                 *(.eh_frame);
                 *(.bss);                /* uninitialized static variables */
                 *(K_DATA_END);
+
+                symbol_table = .;
+                *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+
                 kdata_end = .;
         }

arch/amd64/include/asm.h

@@ -166 +166 @@
 
 
+/** Enable local APIC
+ *
+ * Enable local APIC in MSR.
+ */
+static inline void enable_l_apic_in_msr()
+{
+        __asm__ volatile (
+                "movl $0x1b, %%ecx;"
+                "rdmsr;"
+                "orl $(1<<11),%%eax;"
+                "orl $(0xfee00000),%%eax;"
+                "wrmsr;"
+                :
+                :
+                :"%eax","%ecx","%edx"
+                );
+}
+
 extern size_t interrupt_handler_size;
 extern void interrupt_handlers(void);

arch/amd64/src/dummy.s

@@ -29 +29 @@
 .text
 
-0:
+.global ap_boot
+        
+ap_boot:        
         ret

arch/amd64/src/interrupt.c

@@ -37 +37 @@
 #include <mm/tlb.h>
 #include <arch.h>
+#include <symtab.h>
+
+#define PRINT_INFO_ERRCODE(x) { \
+        char *symbol = get_symtab_entry(stack[1]); \
+        if (!symbol) \
+                symbol = ""; \
+        printf("----------------EXCEPTION OCCURED----------------\n"); \
+        printf("%%rip: %Q (%s)\n",x[1],symbol); \
+        printf("ERROR_WORD=%Q\n", x[0]); \
+        printf("%%rcs=%Q,flags=%Q\n", x[2], x[3]); \
+        printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q\n",x[-1],x[-2],x[-3]); \
+        printf("%%rdx=%Q, %%rsi=%Q, %%rdi=%Q\n",x[-4],x[-5],x[-6]); \
+        printf("%%r8 =%Q, %%r9 =%Q, %%r10=%Q\n",x[-7],x[-8],x[-9]); \
+        printf("%%r11=%Q, %%r12=%Q, %%r13=%Q\n",x[-10],x[-11],x[-12]); \
+        printf("%%r14=%Q, %%r15=%Q, %%rsp=%Q\n",x[-13],x[-14],x); \
+        printf("stack: %Q, %Q, %Q\n", x[5], x[6], x[7]); \
+        printf("       %Q, %Q, %Q\n", x[8], x[9], x[10]); \
+        }
 
 /*
@@ -73 +91 @@
 void null_interrupt(__u8 n, __native stack[])
 {
+        printf("----------------EXCEPTION OCCURED----------------\n");
         printf("int %d: null_interrupt\n", n);
         printf("stack: %L, %L, %L, %L\n", stack[0], stack[1], stack[2], stack[3]);
@@ -80 +99 @@
 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 +105 @@
 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 +126 @@
 void page_fault(__u8 n, __native stack[])
 {
-        printf("page fault address: %Q\n", read_cr2());
-        printf("ERROR_WORD=%Q, %%rip=%Q, %%rcs=%Q, flags=%Q\n", stack[0], stack[1], stack[2], stack[3]);
-        printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q, %%rdx=%Q,\n%%rsi=%Q, %%rdi=%Q\n",
-               stack[-1], stack[-2], stack[-3], stack[-4], stack[-5], stack[-6]);
-
-        printf("stack: %X, %X, %X, %X\n", stack[5], stack[6], stack[7], stack[8]);
+        PRINT_INFO_ERRCODE(stack);
+        printf("Page fault address: %Q\n", read_cr2());
         panic("page fault\n");
 }