Changeset ab08b42 in mainline
- Timestamp:
- 2005-09-03T16:40:25Z (19 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6401f79
- Parents:
- f6297e0
- Files:
-
- 4 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
arch/amd64/Makefile.inc
rf6297e0 rab08b42 6 6 AS=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-as 7 7 LD=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-ld 8 9 8 OBJCOPY=$(AMD64_BINUTILS_DIR)/$(AMD64_TARGET)-objcopy 9 BFD_NAME=elf64-x86-64 10 BFD_ARCH=i386:x86-64 10 11 11 12 DEFS=-DARCH=$(ARCH) … … 47 48 arch/cpu/cpu.c \ 48 49 arch/proc/scheduler.c \ 49 arch/userspace.c 50 arch/userspace.c \ 51 arch/acpi/acpi.c \ 52 arch/acpi/madt.c 53 54 ifdef SMP 55 arch_sources += arch/smp/apic.c \ 56 arch/smp/ipi.c \ 57 arch/smp/mps.c \ 58 arch/smp/smp.c 59 endif -
arch/amd64/_link.ld
rf6297e0 rab08b42 32 32 *(.data); /* initialized data */ 33 33 *(.rodata*); /* string literals */ 34 *(COMMON); /* global variables */35 34 hardcoded_load_address = .; 36 35 QUAD(0xffffffff80008000); … … 39 38 hardcoded_kdata_size = .; 40 39 QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start)); 40 *(COMMON); /* global variables */ 41 42 43 41 44 *(.eh_frame); 42 45 *(.bss); /* uninitialized static variables */ 43 46 *(K_DATA_END); 47 48 symbol_table = .; 49 *(symtab.*); /* Symbol table, must be LAST symbol!*/ 50 44 51 kdata_end = .; 45 52 } -
arch/amd64/include/asm.h
rf6297e0 rab08b42 166 166 167 167 168 /** Enable local APIC 169 * 170 * Enable local APIC in MSR. 171 */ 172 static inline void enable_l_apic_in_msr() 173 { 174 __asm__ volatile ( 175 "movl $0x1b, %%ecx;" 176 "rdmsr;" 177 "orl $(1<<11),%%eax;" 178 "orl $(0xfee00000),%%eax;" 179 "wrmsr;" 180 : 181 : 182 :"%eax","%ecx","%edx" 183 ); 184 } 185 168 186 extern size_t interrupt_handler_size; 169 187 extern void interrupt_handlers(void); -
arch/amd64/src/dummy.s
rf6297e0 rab08b42 29 29 .text 30 30 31 0: 31 .global ap_boot 32 33 ap_boot: 32 34 ret -
arch/amd64/src/interrupt.c
rf6297e0 rab08b42 37 37 #include <mm/tlb.h> 38 38 #include <arch.h> 39 #include <symtab.h> 40 41 #define PRINT_INFO_ERRCODE(x) { \ 42 char *symbol = get_symtab_entry(stack[1]); \ 43 if (!symbol) \ 44 symbol = ""; \ 45 printf("----------------EXCEPTION OCCURED----------------\n"); \ 46 printf("%%rip: %Q (%s)\n",x[1],symbol); \ 47 printf("ERROR_WORD=%Q\n", x[0]); \ 48 printf("%%rcs=%Q,flags=%Q\n", x[2], x[3]); \ 49 printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q\n",x[-1],x[-2],x[-3]); \ 50 printf("%%rdx=%Q, %%rsi=%Q, %%rdi=%Q\n",x[-4],x[-5],x[-6]); \ 51 printf("%%r8 =%Q, %%r9 =%Q, %%r10=%Q\n",x[-7],x[-8],x[-9]); \ 52 printf("%%r11=%Q, %%r12=%Q, %%r13=%Q\n",x[-10],x[-11],x[-12]); \ 53 printf("%%r14=%Q, %%r15=%Q, %%rsp=%Q\n",x[-13],x[-14],x); \ 54 printf("stack: %Q, %Q, %Q\n", x[5], x[6], x[7]); \ 55 printf(" %Q, %Q, %Q\n", x[8], x[9], x[10]); \ 56 } 39 57 40 58 /* … … 73 91 void null_interrupt(__u8 n, __native stack[]) 74 92 { 93 printf("----------------EXCEPTION OCCURED----------------\n"); 75 94 printf("int %d: null_interrupt\n", n); 76 95 printf("stack: %L, %L, %L, %L\n", stack[0], stack[1], stack[2], stack[3]); … … 80 99 void gp_fault(__u8 n, __native stack[]) 81 100 { 82 printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]); 83 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); 84 printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]); 101 PRINT_INFO_ERRCODE(stack); 85 102 panic("general protection fault\n"); 86 103 } … … 88 105 void ss_fault(__u8 n, __native stack[]) 89 106 { 90 printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]); 91 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); 92 printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]); 107 PRINT_INFO_ERRCODE(stack); 93 108 panic("stack fault\n"); 94 109 } … … 111 126 void page_fault(__u8 n, __native stack[]) 112 127 { 113 printf("page fault address: %Q\n", read_cr2()); 114 printf("ERROR_WORD=%Q, %%rip=%Q, %%rcs=%Q, flags=%Q\n", stack[0], stack[1], stack[2], stack[3]); 115 printf("%%rax=%Q, %%rbx=%Q, %%rcx=%Q, %%rdx=%Q,\n%%rsi=%Q, %%rdi=%Q\n", 116 stack[-1], stack[-2], stack[-3], stack[-4], stack[-5], stack[-6]); 117 118 printf("stack: %X, %X, %X, %X\n", stack[5], stack[6], stack[7], stack[8]); 128 PRINT_INFO_ERRCODE(stack); 129 printf("Page fault address: %Q\n", read_cr2()); 119 130 panic("page fault\n"); 120 131 } -
arch/ia32/Makefile.inc
rf6297e0 rab08b42 2 2 AS=as 3 3 LD=ld 4 OBJCOPY=objcopy 5 BFD_NAME=elf32-i386 6 BFD_ARCH=i386 7 4 8 5 9 DEFS:=-DARCH=$(ARCH) -
arch/ia32/_link.ld
rf6297e0 rab08b42 46 46 *(.bss); /* uninitialized static variables */ 47 47 *(K_DATA_END); 48 49 symbol_table = .; 50 *(symtab.*); /* Symbol table, must be LAST symbol!*/ 51 48 52 kdata_end = .; 49 53 } -
arch/ia32/include/smp/apic.h
rf6297e0 rab08b42 122 122 123 123 extern void apic_init(void); 124 extern void apic_spurious(__u8 n, __ u32stack[]);124 extern void apic_spurious(__u8 n, __native stack[]); 125 125 126 126 extern void l_apic_init(void); … … 129 129 extern int l_apic_send_init_ipi(__u8 apicid); 130 130 extern void l_apic_debug(void); 131 extern void l_apic_timer_interrupt(__u8 n, __ u32stack[]);131 extern void l_apic_timer_interrupt(__u8 n, __native stack[]); 132 132 extern __u8 l_apic_id(void); 133 133 -
arch/ia32/src/acpi/acpi.c
rf6297e0 rab08b42 96 96 */ 97 97 98 addr[0] = (__u8 *) ebda;98 addr[0] = (__u8 *) PA2KA(ebda); 99 99 for (i = (ebda ? 0 : 1); i < 2; i++) { 100 100 for (j = 0; j < length[i]; j += 16) { … … 111 111 printf("%L: ACPI Root System Description Pointer\n", acpi_rsdp); 112 112 113 acpi_rsdt = (struct acpi_rsdt *) acpi_rsdp->rsdt_address;113 acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address; 114 114 if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((__address) acpi_rsdp->xsdt_address); 115 115 … … 137 137 for (i=0; i<cnt; i++) { 138 138 for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) { 139 struct acpi_sdt_header *h = (struct acpi_sdt_header *) acpi_rsdt->entry[i];139 struct acpi_sdt_header *h = (struct acpi_sdt_header *) (__native) acpi_rsdt->entry[i]; 140 140 141 141 map_sdt(h); -
arch/ia32/src/acpi/madt.c
rf6297e0 rab08b42 115 115 116 116 117 l_apic = (__u32 *) acpi_madt->l_apic_address;117 l_apic = (__u32 *) (__native) acpi_madt->l_apic_address; 118 118 119 119 while (h < end) { … … 177 177 if (!madt_io_apic_entry_cnt++) { 178 178 madt_io_apic_entries = ioa; 179 io_apic = (__u32 *) ioa->io_apic_address;179 io_apic = (__u32 *) (__native) ioa->io_apic_address; 180 180 } 181 181 else { -
arch/ia32/src/interrupt.c
rf6297e0 rab08b42 37 37 #include <mm/tlb.h> 38 38 #include <arch.h> 39 #include <symtab.h> 39 40 40 41 /* … … 47 48 void (* enable_irqs_function)(__u16 irqmask) = NULL; 48 49 void (* eoi_function)(void) = NULL; 50 51 #define PRINT_INFO_ERRCODE(x) { \ 52 char *symbol = get_symtab_entry(stack[1]); \ 53 if (!symbol) \ 54 symbol = ""; \ 55 printf("----------------EXCEPTION OCCURED----------------\n"); \ 56 printf("%%eip: %X (%s)\n",x[1],symbol); \ 57 printf("ERROR_WORD=%X\n", x[0]); \ 58 printf("%%cs=%X,flags=%X\n", x[2], x[3]); \ 59 printf("%%eax=%X, %%ebx=%X, %%ecx=%X, %%edx=%X\n",\ 60 x[-2],x[-5],x[-3],x[-4]); \ 61 printf("%%esi=%X, %%edi=%X, %%ebp=%X, %%esp=%X\n",\ 62 x[-8],x[-9],x[-1],x); \ 63 printf("stack: %X, %X, %X, %X\n", x[4], x[5], x[6], x[7]); \ 64 printf(" %X, %X, %X, %X\n", x[8], x[9], x[10], x[11]); \ 65 } 49 66 50 67 iroutine trap_register(__u8 n, iroutine f) … … 80 97 void gp_fault(__u8 n, __native stack[]) 81 98 { 82 printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]); 83 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); 84 printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]); 99 PRINT_INFO_ERRCODE(stack); 85 100 panic("general protection fault\n"); 86 101 } … … 88 103 void ss_fault(__u8 n, __native stack[]) 89 104 { 90 printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]); 91 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); 92 printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]); 105 PRINT_INFO_ERRCODE(stack); 93 106 panic("stack fault\n"); 94 107 } … … 111 124 void page_fault(__u8 n, __native stack[]) 112 125 { 126 PRINT_INFO_ERRCODE(stack); 113 127 printf("page fault address: %X\n", read_cr2()); 114 printf("ERROR_WORD=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);115 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);116 printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);117 128 panic("page fault\n"); 118 129 } -
arch/ia32/src/smp/apic.c
rf6297e0 rab08b42 112 112 } 113 113 114 void apic_spurious(__u8 n, __ u32stack[])114 void apic_spurious(__u8 n, __native stack[]) 115 115 { 116 116 printf("cpu%d: APIC spurious interrupt\n", CPU->id); … … 320 320 } 321 321 322 void l_apic_timer_interrupt(__u8 n, __ u32stack[])322 void l_apic_timer_interrupt(__u8 n, __native stack[]) 323 323 { 324 324 l_apic_eoi(); -
arch/mips/Makefile.inc
rf6297e0 rab08b42 7 7 AS=$(MIPS_BINUTILS_DIR)/$(MIPS_TARGET)-as 8 8 LD=$(MIPS_BINUTILS_DIR)/$(MIPS_TARGET)-ld 9 OBJCOPY=$(MIPS_BINUTILS_DIR)/$(MIPS_TARGET)-objcopy 10 BFD_NAME=elf32-tradlittlemips 11 BFD_ARCH=mips 9 12 10 13 ASFLAGS=-mips3 -
arch/mips/_link.ld
rf6297e0 rab08b42 37 37 *(.scommon); 38 38 *(COMMON); /* global variables */ 39 40 symbol_table = .; 41 *(symtab.*); /* Symbol table, must be LAST symbol!*/ 42 39 43 kdata_end = .; 40 44 -
arch/mips/src/mm/tlb.c
rf6297e0 rab08b42 34 34 #include <arch.h> 35 35 36 #include <symtab.h> 37 36 38 void main_bsp(void); 37 38 39 40 39 41 40 int bootstrap = 1; … … 53 52 void tlb_invalid(void) 54 53 { 55 panic("%X: TLB exception at %X", cp0_badvaddr_read(), THREAD ? THREAD->saved_epc : 0); 54 char *symbol = ""; 55 56 if (THREAD) { 57 char *s = get_symtab_entry(THREAD->saved_epc); 58 if (s) 59 symbol = s; 60 } 61 panic("%X: TLB exception at %X(%s)\n", cp0_badvaddr_read(), 62 THREAD ? THREAD->saved_epc : 0, symbol); 56 63 } 57 64 -
src/Makefile
rf6297e0 rab08b42 19 19 lib/the.c \ 20 20 debug/print.c \ 21 debug/symtab.c \ 21 22 time/clock.c \ 22 23 time/timeout.c \ … … 65 66 clean: 66 67 find . ../arch/$(ARCH)/src ../test -name '*.o' -exec rm \{\} \; 67 -rm *.bin kernel.map 68 -rm *.bin kernel.map kernel.map.pre debug/real_map.bin 68 69 $(MAKE) -C ../arch/$(ARCH)/boot clean 69 70 … … 74 75 75 76 kernel.bin: $(arch_objects) $(objects) $(test_objects) 76 $(LD) $(LFLAGS) $(arch_objects) $(objects) $(test_objects) -o $@ -Map kernel.map 77 $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab Makefile debug/empty_map.o 78 $(LD) $(LFLAGS) $(arch_objects) $(objects) $(test_objects) debug/empty_map.o -o $@ -Map kernel.map.pre 79 debug/genmap.py kernel.map.pre debug/real_map.bin 80 $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab debug/real_map.bin debug/real_map.o 81 $(LD) $(LFLAGS) $(arch_objects) $(objects) $(test_objects) debug/real_map.o -o $@ -Map kernel.map 77 82 78 83 %.s: %.S -
src/build.amd64
rf6297e0 rab08b42 9 9 set -e 10 10 cd ../arch 11 for a in drivers bios fpu_context.c mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S ; do11 for a in drivers bios fpu_context.c mm/frame.c mm/tlb.c mm/memory_init.c boot/memmap.S smp/apic.c smp/ipi.c smp/mps.c smp/smp.c acpi; do 12 12 if [ \! -e amd64/src/$a ]; then 13 13 echo ln -sf `pwd`/ia32/src/$a amd64/src/$a
Note:
See TracChangeset
for help on using the changeset viewer.