Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.113.2.6 retrieving revision 1.114 diff -u -p -r1.113.2.6 -r1.114 --- src/sys/arch/i386/i386/locore.S 2017/02/05 13:40:12 1.113.2.6 +++ src/sys/arch/i386/i386/locore.S 2015/08/30 01:46:03 1.114 @@ -1,39 +1,10 @@ -/* $NetBSD: locore.S,v 1.113.2.6 2017/02/05 13:40:12 skrll Exp $ */ +/* $NetBSD: locore.S,v 1.114 2015/08/30 01:46:03 uebayasi Exp $ */ /* * Copyright-o-rama! */ /* - * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009, 2016 - * The NetBSD Foundation, Inc., All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum, by Andrew Doran and by Maxime Villard. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* * Copyright (c) 2006 Manuel Bouyer. * * Redistribution and use in source and binary forms, with or without @@ -93,6 +64,36 @@ * POSSIBILITY OF SUCH DAMAGE. */ + +/*- + * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Charles M. Hannum, and by Andrew Doran. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -128,7 +129,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.113.2.6 2017/02/05 13:40:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.114 2015/08/30 01:46:03 uebayasi Exp $"); #include "opt_compat_oldboot.h" #include "opt_copy_symtab.h" @@ -147,18 +148,18 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 #include #include +#include #include #include #include #include #include #include -#include - #ifndef XEN #include #endif +/* XXX temporary kluge; these should not be here */ /* Get definitions for IOM_BEGIN, IOM_END, and IOM_SIZE */ #include @@ -169,81 +170,6 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 #endif /* XEN */ #define RELOC(x) _RELOC(_C_LABEL(x)) -/* 32bit version of PG_NX */ -#define PG_NX32 0x80000000 - -#ifndef PAE -#define PROC0_PDIR_OFF 0 -#else -#define PROC0_L3_OFF 0 -#define PROC0_PDIR_OFF 1 * PAGE_SIZE -#endif - -#define PROC0_STK_OFF (PROC0_PDIR_OFF + PDP_SIZE * PAGE_SIZE) -#define PROC0_PTP1_OFF (PROC0_STK_OFF + UPAGES * PAGE_SIZE) - -/* - * fillkpt - Fill in a kernel page table - * eax = pte (page frame | control | status) - * ebx = page table address - * ecx = number of pages to map - * - * For PAE, each entry is 8 bytes long: we must set the 4 upper bytes to 0. - * This is done by the first instruction of fillkpt. In the non-PAE case, this - * instruction just clears the page table entry. - */ -#define fillkpt \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ -1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \ - movl %eax,(%ebx) ; /* store phys addr */ \ - addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ - addl $PAGE_SIZE,%eax ; /* next phys page */ \ - loop 1b ; \ -2: ; - -/* - * fillkpt_nox - Same as fillkpt, but sets the NX/XD bit. - */ -#define fillkpt_nox \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ - pushl %ebp ; \ - movl RELOC(nox_flag),%ebp ; \ -1: movl %ebp,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: NX */ \ - movl %eax,(%ebx) ; /* store phys addr */ \ - addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ - addl $PAGE_SIZE,%eax ; /* next phys page */ \ - loop 1b ; \ - popl %ebp ; \ -2: ; - -/* - * fillkpt_blank - Fill in a kernel page table with blank entries - * ebx = page table address - * ecx = number of pages to map - */ -#define fillkpt_blank \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ -1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \ - movl $0,(%ebx) ; /* lower 32 bits: 0 */ \ - addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ - loop 1b ; \ -2: ; - -/* - * killkpt - Destroy a kernel page table - * ebx = page table address - * ecx = number of pages to destroy - */ -#define killkpt \ -1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper bits (for PAE) */ \ - movl $0,(%ebx) ; \ - addl $PDE_SIZE,%ebx ; \ - loop 1b ; - - #ifdef XEN /* * Xen guest identifier and loader selection @@ -270,48 +196,76 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 */ .data - .globl _C_LABEL(tablesize) - .globl _C_LABEL(nox_flag) .globl _C_LABEL(cputype) .globl _C_LABEL(cpuid_level) .globl _C_LABEL(esym) .globl _C_LABEL(eblob) .globl _C_LABEL(atdevbase) - .globl _C_LABEL(PDPpaddr) .globl _C_LABEL(lwp0uarea) + .globl _C_LABEL(PDPpaddr) .globl _C_LABEL(gdt) .globl _C_LABEL(idt) + .globl _C_LABEL(lapic_tpr) - .type _C_LABEL(tablesize), @object -_C_LABEL(tablesize): .long 0 -END(tablesize) - .type _C_LABEL(nox_flag), @object -LABEL(nox_flag) .long 0 /* 32bit NOX flag, set if supported */ -END(nox_flag) +#if NLAPIC > 0 +#ifdef __ELF__ + .align PAGE_SIZE +#else + .align 12 +#endif + .globl _C_LABEL(local_apic), _C_LABEL(lapic_id) + .type _C_LABEL(local_apic), @object +LABEL(local_apic) + .space LAPIC_ID +END(local_apic) + .type _C_LABEL(lapic_id), @object +LABEL(lapic_id) + .long 0x00000000 + .space LAPIC_TPRI-(LAPIC_ID+4) +END(lapic_id) + .type _C_LABEL(lapic_tpr), @object +LABEL(lapic_tpr) + .space LAPIC_PPRI-LAPIC_TPRI +END(lapic_tpr) + .type _C_LABEL(lapic_ppr), @object +_C_LABEL(lapic_ppr): + .space LAPIC_ISR-LAPIC_PPRI +END(lapic_ppr) + .type _C_LABEL(lapic_isr), @object +_C_LABEL(lapic_isr): + .space PAGE_SIZE-LAPIC_ISR +END(lapic_isr) +#else + .type _C_LABEL(lapic_tpr), @object +LABEL(lapic_tpr) + .long 0 +END(lapic_tpr) +#endif .type _C_LABEL(cputype), @object -LABEL(cputype) .long 0 /* are we 80486, Pentium, or.. */ +LABEL(cputype) .long 0 # are we 80486, Pentium, or.. END(cputype) .type _C_LABEL(cpuid_level), @object -LABEL(cpuid_level) .long -1 /* max. level accepted by cpuid instr */ +LABEL(cpuid_level) .long 0 END(cpuid_level) .type _C_LABEL(atdevbase), @object -LABEL(atdevbase) .long 0 /* location of start of iomem in virt */ +LABEL(atdevbase) .long 0 # location of start of iomem in virtual END(atdevbase) .type _C_LABEL(lwp0uarea), @object LABEL(lwp0uarea) .long 0 END(lwp0uarea) .type _C_LABEL(PDPpaddr), @object -LABEL(PDPpaddr) .long 0 /* paddr of PDP, for libkvm */ +LABEL(PDPpaddr) .long 0 # paddr of PDP, for libkvm END(PDPpaddr) - - /* Space for the temporary stack */ + .type _C_LABEL(tablesize), @object +_C_LABEL(tablesize): .long 0 +END(tablesize) .size tmpstk, tmpstk - . - .space 512 + .space 512 tmpstk: #ifdef XEN - .align PAGE_SIZE, 0x0 /* Align on page boundary */ + .align PAGE_SIZE, 0x0 # Align on page boundary LABEL(tmpgdt) - .space PAGE_SIZE /* Xen expects a page */ + .space PAGE_SIZE # Xen expects a page END(tmpgdt) #endif /* XEN */ @@ -321,10 +275,7 @@ END(tmpgdt) ENTRY(start) #ifndef XEN - - /* Warm boot */ - movw $0x1234,0x472 - + movw $0x1234,0x472 # warm boot #if defined(MULTIBOOT) jmp 1f @@ -348,7 +299,7 @@ _C_LABEL(Multiboot_Header): * space to process it later -- after we are relocated. It will * be safer to run complex C code than doing it at this point. */ - pushl %ebx /* Address of Multiboot information */ + pushl %ebx # Address of Multiboot information call _C_LABEL(multiboot_pre_reloc) addl $4,%esp jmp 2f @@ -357,14 +308,11 @@ _C_LABEL(Multiboot_Header): 1: /* * At this point, we know that a NetBSD-specific boot loader - * booted this kernel. - * - * Load parameters from the stack (32 bits): - * boothowto, [bootdev], bootinfo, esym, biosextmem, biosbasemem - * We are not interested in 'bootdev'. + * booted this kernel. The stack carries the following parameters: + * (boothowto, [bootdev], bootinfo, esym, biosextmem, biosbasemem), + * 4 bytes each. */ - - addl $4,%esp /* Discard return address to boot loader */ + addl $4,%esp # Discard return address to boot loader call _C_LABEL(native_loader) addl $24,%esp @@ -377,6 +325,8 @@ _C_LABEL(Multiboot_Header): xorl %eax,%eax movw %ax,%fs movw %ax,%gs + decl %eax + movl %eax,RELOC(cpuid_level) /* Find out our CPU type. */ @@ -454,30 +404,30 @@ is486: movl $CPU_486,RELOC(cputype) popfl jmp 2f trycyrix486: - movl $CPU_6x86,RELOC(cputype) /* set CPU type */ + movl $CPU_6x86,RELOC(cputype) # set CPU type /* * Check for Cyrix 486 CPU by seeing if the flags change during a * divide. This is documented in the Cx486SLC/e SMM Programmer's * Guide. */ xorl %edx,%edx - cmpl %edx,%edx /* set flags to known state */ + cmpl %edx,%edx # set flags to known state pushfl - popl %ecx /* store flags in ecx */ + popl %ecx # store flags in ecx movl $-1,%eax movl $4,%ebx - divl %ebx /* do a long division */ + divl %ebx # do a long division pushfl popl %eax - xorl %ecx,%eax /* are the flags different? */ - testl $0x8d5,%eax /* only check C|PF|AF|Z|N|V */ - jne 2f /* yes; must be Cyrix 6x86 CPU */ - movl $CPU_486DLC,RELOC(cputype) /* set CPU type */ + xorl %ecx,%eax # are the flags different? + testl $0x8d5,%eax # only check C|PF|AF|Z|N|V + jne 2f # yes; must be Cyrix 6x86 CPU + movl $CPU_486DLC,RELOC(cputype) # set CPU type #ifndef CYRIX_CACHE_WORKS /* Disable caching of the ISA hole only. */ invd - movb $CCR0,%al /* Configuration Register index (CCR0) */ + movb $CCR0,%al # Configuration Register index (CCR0) outb %al,$0x22 inb $0x23,%al orb $(CCR0_NC1|CCR0_BARB),%al @@ -489,8 +439,8 @@ trycyrix486: invd #else /* CYRIX_CACHE_WORKS */ /* Set cache parameters */ - invd /* Start with guaranteed clean cache */ - movb $CCR0,%al /* Configuration Register index (CCR0) */ + invd # Start with guaranteed clean cache + movb $CCR0,%al # Configuration Register index (CCR0) outb %al,$0x22 inb $0x23,%al andb $~CCR0_NC0,%al @@ -538,16 +488,6 @@ try586: /* Use the `cpuid' instruction. cpuid movl %eax,RELOC(cpuid_level) - /* - * Retrieve the NX/XD flag. We use the 32bit version of PG_NX. - */ - movl $0x80000001,%eax - cpuid - andl $CPUID_NOX,%edx - jz no_NOX - movl $PG_NX32,RELOC(nox_flag) -no_NOX: - 2: /* * Finished with old stack; load new %esp now instead of later so we @@ -558,53 +498,55 @@ no_NOX: * The boot program should check: * text+data <= &stack_variable - more_space_for_stack * text+data+bss+pad+space_for_page_tables <= end_of_memory - * - * XXX: the gdt is in the carcass of the boot program so clearing + * Oops, the gdt is in the carcass of the boot program so clearing * the rest of memory is still not possible. */ - movl $_RELOC(tmpstk),%esp + movl $_RELOC(tmpstk),%esp # bootstrap stack end location /* - * There are two different layouts possible, depending on whether PAE is - * enabled or not. + * Virtual address space of kernel, without PAE. The page dir is 1 page long. * - * If PAE is not enabled, there are two levels of pages: PD -> PT. They will - * be referred to as: L2 -> L1. L2 is 1 page long. The BOOTSTRAP TABLES have - * the following layout: - * +-----+------------+----+ - * | L2 -> PROC0 STK -> L1 | - * +-----+------------+----+ - * - * If PAE is enabled, there are three levels of pages: PDP -> PD -> PT. They - * will be referred to as: L3 -> L2 -> L1. L3 is 1 page long, L2 is 4 page - * long. The BOOTSTRAP TABLES have the following layout: - * +-----+-----+------------+----+ - * | L3 -> L2 -> PROC0 STK -> L1 | - * +-----+-----+------------+----+ - * - * Virtual address space of the kernel in both cases: - * +------+--------+------+-----+--------+---------------------+----------- - * | TEXT | RODATA | DATA | BSS | [SYMS] | [PRELOADED MODULES] | BOOTSTRAP - * +------+--------+------+-----+--------+---------------------+----------- - * (1) (2) (3) - * - * -------+-------------+ - * TABLES | ISA I/O MEM | - * -------+-------------+ - * (4) - * - * PROC0 STK is obviously not linked as a page level. It just happens to be - * caught between L2 and L1. + * text | data | bss | [syms] | [blobs] | page dir | proc0 kstack | L1 ptp + * 0 1 2 3 + * + * Virtual address space of kernel, with PAE. We need 4 pages for the page dir + * and 1 page for the L3. + * text | data | bss | [syms] | [blobs] | L3 | page dir | proc0 kstack | L1 ptp + * 0 1 5 6 7 + */ +#ifndef PAE +#define PROC0_PDIR_OFF 0 +#else +#define PROC0_L3_OFF 0 +#define PROC0_PDIR_OFF 1 * PAGE_SIZE +#endif + +#define PROC0_STK_OFF (PROC0_PDIR_OFF + PDP_SIZE * PAGE_SIZE) +#define PROC0_PTP1_OFF (PROC0_STK_OFF + UPAGES * PAGE_SIZE) + +/* + * fillkpt - Fill in a kernel page table + * eax = pte (page frame | control | status) + * ebx = page table address + * ecx = number of pages to map * - * Important note: the kernel segments are properly 4k-aligned - * (see kern.ldscript), so there's no need to enforce alignment. + * For PAE, each entry is 8 bytes long: we must set the 4 upper bytes to 0. + * This is done by the first instruction of fillkpt. In the non-PAE case, this + * instruction just clears the page table entry. */ - /* Find end of kernel image; brings us on (1). */ - movl $RELOC(__kernel_end),%edi +#define fillkpt \ +1: movl $0,(PDE_SIZE-4)(%ebx) ; /* clear bits */ \ + movl %eax,(%ebx) ; /* store phys addr */ \ + addl $PDE_SIZE,%ebx ; /* next pte/pde */ \ + addl $PAGE_SIZE,%eax ; /* next phys page */ \ + loop 1b ; + + /* Find end of kernel image. */ + movl $RELOC(end),%edi #if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB) - /* Save the symbols (if loaded); brinds us on (2). */ + /* Save the symbols (if loaded). */ movl RELOC(esym),%eax testl %eax,%eax jz 1f @@ -613,38 +555,36 @@ no_NOX: 1: #endif - /* Skip over any modules/blobs; brings us on (3). */ + /* Skip over any modules/blobs. */ movl RELOC(eblob),%eax testl %eax,%eax jz 1f subl $KERNBASE,%eax movl %eax,%edi 1: - - /* We are on (3). Align up for BOOTSTRAP TABLES. */ + /* Compute sizes */ movl %edi,%esi - addl $PGOFSET,%esi + addl $PGOFSET,%esi # page align up andl $~PGOFSET,%esi /* nkptp[1] = (esi + ~L2_FRAME) >> L2_SHIFT + 1; */ movl %esi,%eax addl $~L2_FRAME,%eax shrl $L2_SHIFT,%eax - incl %eax /* one more PTP for VAs stolen by bootstrap */ + incl %eax /* one more ptp for VAs stolen by bootstrap */ 1: movl %eax,RELOC(nkptp)+1*4 - /* tablesize = (PDP_SIZE + UPAGES + nkptp[1]) << PGSHIFT; */ + /* tablesize = (PDP_SIZE + UPAGES + nkptp) << PGSHIFT; */ addl $(PDP_SIZE+UPAGES),%eax #ifdef PAE - incl %eax /* one more page for L3 */ + incl %eax /* one more page for the L3 PD */ shll $PGSHIFT+1,%eax /* PTP tables are twice larger with PAE */ #else shll $PGSHIFT,%eax #endif movl %eax,RELOC(tablesize) - /* Ensure that nkptp[1] covers BOOTSTRAP TABLES, ie: - * (esi + tablesize) >> L2_SHIFT + 1 < nkptp[1] */ + /* ensure that nkptp covers bootstrap tables */ addl %esi,%eax addl $~L2_FRAME,%eax shrl $L2_SHIFT,%eax @@ -652,103 +592,85 @@ no_NOX: cmpl %eax,RELOC(nkptp)+1*4 jnz 1b - /* Now, zero out the BOOTSTRAP TABLES (before filling them in). */ + /* Clear tables */ movl %esi,%edi xorl %eax,%eax cld movl RELOC(tablesize),%ecx shrl $2,%ecx rep - stosl /* copy eax -> edi */ + stosl + + leal (PROC0_PTP1_OFF)(%esi), %ebx /* - * Build the page tables and levels. We go from L1 to L2/L3, and link the levels - * together. Note: RELOC computes &addr - KERNBASE in 32 bits; the value can't - * be > 4G, or we can't deal with it anyway, since we are in 32bit mode. + * Build initial page tables. */ /* - * Build L1. + * Compute &__data_start - KERNBASE. This can't be > 4G, + * or we can't deal with it anyway, since we can't load it in + * 32 bit mode. So use the bottom 32 bits. */ - leal (PROC0_PTP1_OFF)(%esi),%ebx + movl $RELOC(__data_start),%edx + andl $~PGOFSET,%edx - /* Skip the area below the kernel text. */ - movl $(KERNTEXTOFF - KERNBASE),%ecx - shrl $PGSHIFT,%ecx - fillkpt_blank + /* + * Skip the first MB. + */ + movl $_RELOC(KERNTEXTOFF),%eax + movl %eax,%ecx + shrl $(PGSHIFT-2),%ecx /* ((n >> PGSHIFT) << 2) for # pdes */ +#ifdef PAE + shll $1,%ecx /* pdes are twice larger with PAE */ +#endif + addl %ecx,%ebx - /* Map the kernel text RX. */ - movl $(KERNTEXTOFF - KERNBASE),%eax /* start of TEXT */ - movl $RELOC(__rodata_start),%ecx + /* Map the kernel text read-only. */ + movl %edx,%ecx subl %eax,%ecx shrl $PGSHIFT,%ecx orl $(PG_V|PG_KR),%eax fillkpt - /* Map the kernel rodata R. */ - movl $RELOC(__rodata_start),%eax - movl $RELOC(__data_start),%ecx - subl %eax,%ecx - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KR),%eax - fillkpt_nox - - /* Map the kernel data+bss RW. */ - movl $RELOC(__data_start),%eax - movl $RELOC(__kernel_end),%ecx - subl %eax,%ecx - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW),%eax - fillkpt_nox - - /* Map [SYMS]+[PRELOADED MODULES] RW. */ - movl $RELOC(__kernel_end),%eax - movl %esi,%ecx /* start of BOOTSTRAP TABLES */ - subl %eax,%ecx - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW),%eax - fillkpt_nox - - /* Map the BOOTSTRAP TABLES RW. */ - movl %esi,%eax /* start of BOOTSTRAP TABLES */ - movl RELOC(tablesize),%ecx /* length of BOOTSTRAP TABLES */ + /* Map the data, BSS, and bootstrap tables read-write. */ + leal (PG_V|PG_KW)(%edx),%eax + movl RELOC(tablesize),%ecx + addl %esi,%ecx # end of tables + subl %edx,%ecx # subtract end of text shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW),%eax - fillkpt_nox + fillkpt - /* We are on (4). Map ISA I/O MEM RW. */ - movl $IOM_BEGIN,%eax - movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */ - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW/*|PG_N*/),%eax - fillkpt_nox + /* Map ISA I/O mem (later atdevbase) */ + movl $(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax # having these bits set + movl $(IOM_SIZE>>PGSHIFT),%ecx # for this many pte s, + fillkpt - /* - * Build L2 for identity mapping. Linked to L1. - */ +/* + * Construct a page table directory. + */ + /* Set up top level entries for identity mapping */ leal (PROC0_PDIR_OFF)(%esi),%ebx leal (PROC0_PTP1_OFF)(%esi),%eax - orl $(PG_V|PG_KW),%eax + orl $(PG_V|PG_KW), %eax movl RELOC(nkptp)+1*4,%ecx fillkpt - /* Set up L2 entries for actual kernel mapping */ - leal (PROC0_PDIR_OFF + L2_SLOT_KERNBASE * PDE_SIZE)(%esi),%ebx + /* Set up top level entries for actual kernel mapping */ + leal (PROC0_PDIR_OFF + L2_SLOT_KERNBASE*PDE_SIZE)(%esi),%ebx leal (PROC0_PTP1_OFF)(%esi),%eax - orl $(PG_V|PG_KW),%eax + orl $(PG_V|PG_KW), %eax movl RELOC(nkptp)+1*4,%ecx fillkpt - /* Install recursive top level PDE */ - leal (PROC0_PDIR_OFF + PDIR_SLOT_PTE * PDE_SIZE)(%esi),%ebx + /* Install a PDE recursively mapping page directory as a page table! */ + leal (PROC0_PDIR_OFF + PDIR_SLOT_PTE*PDE_SIZE)(%esi),%ebx leal (PROC0_PDIR_OFF)(%esi),%eax orl $(PG_V|PG_KW),%eax movl $PDP_SIZE,%ecx - fillkpt_nox + fillkpt #ifdef PAE - /* - * Build L3. Linked to L2. - */ + /* Fill in proc0 L3 page with entries pointing to the page dirs */ leal (PROC0_L3_OFF)(%esi),%ebx leal (PROC0_PDIR_OFF)(%esi),%eax orl $(PG_V),%eax @@ -761,49 +683,41 @@ no_NOX: movl %eax,%cr4 #endif - /* Save physical address of L2. */ + /* Save phys. addr of PDP, for libkvm. */ leal (PROC0_PDIR_OFF)(%esi),%eax movl %eax,RELOC(PDPpaddr) /* * Startup checklist: - * 1. Load %cr3 with pointer to L2 (or L3 for PAE). - */ - movl %esi,%eax - movl %eax,%cr3 - - /* - * 2. Set NOX in EFER, if available. + * 1. Load %cr3 with pointer to PDIR (or L3 PD page for PAE). */ - movl RELOC(nox_flag),%ebx - cmpl $0,%ebx - je skip_NOX - movl $MSR_EFER,%ecx - rdmsr - xorl %eax,%eax - orl $(EFER_NXE),%eax - wrmsr -skip_NOX: + movl %esi,%eax # phys address of ptd in proc 0 + movl %eax,%cr3 # load ptd addr into mmu /* - * 3. Enable paging and the rest of it. + * 2. Enable paging and the rest of it. */ - movl %cr0,%eax + movl %cr0,%eax # get control word + # enable paging & NPX orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax - movl %eax,%cr0 + movl %eax,%cr0 # and page NOW! - pushl $begin /* jump to high mem */ + pushl $begin # jump to high mem ret begin: /* - * We have arrived. There's no need anymore for the identity mapping in - * low memory, remove it. + * We have arrived. + * There's no need anymore for the identity mapping in low + * memory, remove it. */ movl _C_LABEL(nkptp)+1*4,%ecx - leal (PROC0_PDIR_OFF)(%esi),%ebx /* old, phys address of PDIR */ - addl $(KERNBASE), %ebx /* new, virt address of PDIR */ - killkpt + leal (PROC0_PDIR_OFF)(%esi),%ebx # old, phys address of PDIR + addl $(KERNBASE), %ebx # new, virtual address of PDIR +1: movl $0,(PDE_SIZE-4)(%ebx) # Upper bits (for PAE) + movl $0,(%ebx) + addl $PDE_SIZE,%ebx + loop 1b /* Relocate atdevbase. */ movl $KERNBASE,%edx @@ -815,8 +729,8 @@ begin: leal (PROC0_STK_OFF+KERNBASE)(%esi),%eax movl %eax,_C_LABEL(lwp0uarea) leal (USPACE-FRAMESIZE)(%eax),%esp - movl %esi,PCB_CR3(%eax) /* pcb->pcb_cr3 */ - xorl %ebp,%ebp /* mark end of frames */ + movl %esi,PCB_CR3(%eax) # pcb->pcb_cr3 + xorl %ebp,%ebp # mark end of frames #if defined(MULTIBOOT) /* It is now safe to parse the Multiboot information structure @@ -826,21 +740,21 @@ begin: call _C_LABEL(multiboot_post_reloc) #endif - subl $NGDT*8, %esp /* space for temporary gdt */ + subl $NGDT*8, %esp # space for temporary gdt pushl %esp call _C_LABEL(initgdt) addl $4,%esp movl _C_LABEL(tablesize),%eax - addl %esi,%eax /* skip past stack and page tables */ + addl %esi,%eax # skip past stack and page tables #ifdef PAE - pushl $0 /* init386() expects a 64 bits paddr_t with PAE */ + pushl $0 # init386() expects a 64 bits paddr_t with PAE #endif pushl %eax - call _C_LABEL(init386) - addl $PDE_SIZE,%esp /* pop paddr_t */ - addl $NGDT*8,%esp /* pop temporary gdt */ + call _C_LABEL(init386) # wire 386 chip for unix operation + addl $PDE_SIZE,%esp # pop paddr_t + addl $NGDT*8,%esp # pop temporary gdt #ifdef SAFARI_FIFO_HACK movb $5,%al @@ -867,68 +781,63 @@ begin: popfl cld - - /* - * Xen info: - * - %esp -> stack, *theoretically* the last used page by Xen bootstrap - */ - movl %esp,%ebx - movl $_RELOC(tmpstk),%esp + movl %esp, %ebx # save start of available space + movl $_RELOC(tmpstk),%esp # bootstrap stack end location /* Clear BSS. */ xorl %eax,%eax movl $RELOC(__bss_start),%edi movl $RELOC(_end),%ecx subl %edi,%ecx - rep - stosb + rep stosb /* Copy the necessary stuff from start_info structure. */ /* We need to copy shared_info early, so that sti/cli work */ movl $RELOC(start_info_union),%edi movl $128,%ecx - rep - movsl + rep movsl - /* Clear segment registers. */ + /* Clear segment registers; always null in proc0. */ xorl %eax,%eax movw %ax,%fs movw %ax,%gs + decl %eax + movl %eax,RELOC(cpuid_level) xorl %eax,%eax cpuid movl %eax,RELOC(cpuid_level) /* - * Use a temporary GDT page. We'll re-add it to uvm(9) once we're done - * using it. + * Use a temp page. We'll re- add it to uvm(9) once we're + * done using it. */ - movl $RELOC(tmpgdt),%eax - pushl %eax /* start of temporary gdt */ + movl $RELOC(tmpgdt), %eax + pushl %eax # start of temporary gdt call _C_LABEL(initgdt) addl $4,%esp - call xen_locore + call xen_pmap_bootstrap /* - * The first VA available is returned by xen_locore in %eax. We - * use it as the UAREA, and set up the stack here. + * First avail returned by xen_pmap_bootstrap in %eax */ - movl %eax,%esi - movl %esi,_C_LABEL(lwp0uarea) + movl %eax, %esi; + movl %esi, _C_LABEL(lwp0uarea) + + /* Set up bootstrap stack. */ leal (USPACE-FRAMESIZE)(%eax),%esp - xorl %ebp,%ebp /* mark end of frames */ + xorl %ebp,%ebp # mark end of frames - /* Set first_avail after the DUMMY PAGE (see xen_locore). */ - addl $(USPACE+PAGE_SIZE),%esi - subl $KERNBASE,%esi /* init386 wants a physical address */ + addl $USPACE, %esi + subl $KERNBASE, %esi #init386 want a physical address #ifdef PAE - pushl $0 /* init386() expects a 64 bits paddr_t with PAE */ + pushl $0 # init386() expects a 64 bits paddr_t with PAE #endif pushl %esi - call _C_LABEL(init386) - addl $PDE_SIZE,%esp /* pop paddr_t */ + call _C_LABEL(init386) # wire 386 chip for unix operation + addl $PDE_SIZE,%esp # pop paddr_t call _C_LABEL(main) #endif /* XEN */ END(start) @@ -1002,13 +911,13 @@ NENTRY(sigcode) * Handler has returned here as if we called it. The sigcontext * is on the stack after the 3 args "we" pushed. */ - leal 12(%esp),%eax /* get pointer to sigcontext */ - movl %eax,4(%esp) /* put it in the argument slot */ - /* fake return address already there */ + leal 12(%esp),%eax # get pointer to sigcontext + movl %eax,4(%esp) # put it in the argument slot + # fake return address already there movl $SYS_compat_16___sigreturn14,%eax - int $0x80 /* enter kernel with args on stack */ + int $0x80 # enter kernel with args on stack movl $SYS_exit,%eax - int $0x80 /* exit if sigreturn fails */ + int $0x80 # exit if sigreturn fails .globl _C_LABEL(esigcode) _C_LABEL(esigcode): END(sigcode) @@ -1020,14 +929,14 @@ END(sigcode) */ ENTRY(setjmp) movl 4(%esp),%eax - movl %ebx,(%eax) /* save ebx */ - movl %esp,4(%eax) /* save esp */ - movl %ebp,8(%eax) /* save ebp */ - movl %esi,12(%eax) /* save esi */ - movl %edi,16(%eax) /* save edi */ - movl (%esp),%edx /* get rta */ - movl %edx,20(%eax) /* save eip */ - xorl %eax,%eax /* return 0 */ + movl %ebx,(%eax) # save ebx + movl %esp,4(%eax) # save esp + movl %ebp,8(%eax) # save ebp + movl %esi,12(%eax) # save esi + movl %edi,16(%eax) # save edi + movl (%esp),%edx # get rta + movl %edx,20(%eax) # save eip + xorl %eax,%eax # return 0 ret END(setjmp) @@ -1038,14 +947,14 @@ END(setjmp) */ ENTRY(longjmp) movl 4(%esp),%eax - movl (%eax),%ebx /* restore ebx */ - movl 4(%eax),%esp /* restore esp */ - movl 8(%eax),%ebp /* restore ebp */ - movl 12(%eax),%esi /* restore esi */ - movl 16(%eax),%edi /* restore edi */ - movl 20(%eax),%edx /* get rta */ - movl %edx,(%esp) /* put in return frame */ - movl $1,%eax /* return 1 */ + movl (%eax),%ebx # restore ebx + movl 4(%eax),%esp # restore esp + movl 8(%eax),%ebp # restore ebp + movl 12(%eax),%esi # restore esi + movl 16(%eax),%edi # restore edi + movl 20(%eax),%edx # get rta + movl %edx,(%esp) # put in return frame + movl $1,%eax # return 1 ret END(longjmp) @@ -1055,19 +964,19 @@ END(longjmp) * Mimic cpu_switchto() for postmortem debugging. */ ENTRY(dumpsys) - pushl %ebx /* set up fake switchframe */ - pushl %esi /* and save context */ - pushl %edi + pushl %ebx # set up fake switchframe + pushl %esi # and save context + pushl %edi movl %esp,_C_LABEL(dumppcb)+PCB_ESP movl %ebp,_C_LABEL(dumppcb)+PCB_EBP - call _C_LABEL(dodumpsys) /* dump! */ - addl $(3*4), %esp /* unwind switchframe */ + call _C_LABEL(dodumpsys) # dump! + addl $(3*4), %esp # unwind switchframe ret END(dumpsys) /* * struct lwp *cpu_switchto(struct lwp *oldlwp, struct lwp *newlwp, - * bool returning) + * bool returning) * * 1. if (oldlwp != NULL), save its context. * 2. then, restore context of newlwp. @@ -1092,21 +1001,19 @@ ENTRY(cpu_switchto) 0: #endif - movl 16(%esp),%esi /* oldlwp */ - movl 20(%esp),%edi /* newlwp */ - movl 24(%esp),%edx /* returning */ - - testl %esi,%esi /* oldlwp = NULL ? */ - jz skip_save + movl 16(%esp),%esi # oldlwp + movl 20(%esp),%edi # newlwp + movl 24(%esp),%edx # returning + testl %esi,%esi + jz 1f /* Save old context. */ movl L_PCB(%esi),%eax movl %esp,PCB_ESP(%eax) movl %ebp,PCB_EBP(%eax) -skip_save: /* Switch to newlwp's stack. */ - movl L_PCB(%edi),%ebx +1: movl L_PCB(%edi),%ebx movl PCB_EBP(%ebx),%ebp movl PCB_ESP(%ebx),%esp @@ -1119,33 +1026,33 @@ skip_save: /* Skip the rest if returning to a pinned LWP. */ testl %edx,%edx - jnz switch_return + jnz 4f - /* Switch ring0 stack */ #ifdef XEN pushl %edi call _C_LABEL(i386_switch_context) addl $4,%esp -#else +#else /* !XEN */ + /* Switch ring0 esp */ movl PCB_ESP0(%ebx),%eax movl %eax,CPUVAR(ESP0) -#endif +#endif /* !XEN */ /* Don't bother with the rest if switching to a system process. */ testl $LW_SYSTEM,L_FLAG(%edi) - jnz switch_return + jnz 4f #ifndef XEN /* Restore thread-private %fs/%gs descriptors. */ movl CPUVAR(GDT),%ecx - movl PCB_FSD(%ebx),%eax - movl PCB_FSD+4(%ebx),%edx - movl %eax,(GUFS_SEL*8)(%ecx) - movl %edx,(GUFS_SEL*8+4)(%ecx) - movl PCB_GSD(%ebx),%eax - movl PCB_GSD+4(%ebx),%edx - movl %eax,(GUGS_SEL*8)(%ecx) - movl %edx,(GUGS_SEL*8+4)(%ecx) + movl PCB_FSD(%ebx), %eax + movl PCB_FSD+4(%ebx), %edx + movl %eax, (GUFS_SEL*8)(%ecx) + movl %edx, (GUFS_SEL*8+4)(%ecx) + movl PCB_GSD(%ebx), %eax + movl PCB_GSD+4(%ebx), %edx + movl %eax, (GUGS_SEL*8)(%ecx) + movl %edx, (GUGS_SEL*8+4)(%ecx) #endif /* !XEN */ /* Switch I/O bitmap */ @@ -1158,25 +1065,14 @@ skip_save: /* Is this process using RAS (restartable atomic sequences)? */ movl L_PROC(%edi),%eax cmpl $0,P_RASLIST(%eax) - je no_RAS - - /* Handle restartable atomic sequences (RAS). */ - movl L_MD_REGS(%edi),%ecx - pushl TF_EIP(%ecx) - pushl %eax - call _C_LABEL(ras_lookup) - addl $8,%esp - cmpl $-1,%eax - je no_RAS - movl L_MD_REGS(%edi),%ecx - movl %eax,TF_EIP(%ecx) -no_RAS: + jne 5f /* * Restore cr0 (including FPU state). Raise the IPL to IPL_HIGH. * FPU IPIs can alter the LWP's saved cr0. Dropping the priority * is deferred until mi_switch(), when cpu_switchto() returns. */ +2: #ifdef XEN pushl %edi call _C_LABEL(i386_tls_switch) @@ -1191,24 +1087,34 @@ no_RAS: * set CR0_TS so we'll trap rather than reuse bogus state. */ cmpl CPUVAR(FPCURLWP),%edi - je skip_TS + je 3f orl $CR0_TS,%ecx -skip_TS: /* Reloading CR0 is very expensive - avoid if possible. */ - cmpl %edx,%ecx - je switch_return +3: cmpl %edx,%ecx + je 4f movl %ecx,%cr0 #endif /* !XEN */ -switch_return: /* Return to the new LWP, returning 'oldlwp' in %eax. */ - movl %esi,%eax +4: movl %esi,%eax popl %edi popl %esi popl %ebx ret + /* Check for restartable atomic sequences (RAS). */ +5: movl L_MD_REGS(%edi),%ecx + pushl TF_EIP(%ecx) + pushl %eax + call _C_LABEL(ras_lookup) + addl $8,%esp + cmpl $-1,%eax + je 2b + movl L_MD_REGS(%edi),%ecx + movl %eax,TF_EIP(%ecx) + jmp 2b + .Lcopy_iobitmap: /* Copy I/O bitmap. */ incl _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT @@ -1232,7 +1138,7 @@ END(cpu_switchto) * Update pcb, saving current processor state. */ ENTRY(savectx) - movl 4(%esp),%edx /* edx = pcb */ + movl 4(%esp),%edx # edx = pcb movl %esp,PCB_ESP(%edx) movl %ebp,PCB_EBP(%edx) ret @@ -1246,12 +1152,12 @@ END(savectx) IDTVEC(osyscall) #ifndef XEN /* XXX we are in trouble! interrupts be off here. */ - cli /* must be first instruction */ + cli # must be first instruction #endif - pushfl /* set eflags in trap frame */ + pushfl # set eflags in trap frame popl 8(%esp) - orl $PSL_I,8(%esp) /* re-enable ints on return to user */ - pushl $7 /* size of instruction for restart */ + orl $PSL_I,8(%esp) # re-enable ints on return to user + pushl $7 # size of instruction for restart jmp syscall1 IDTVEC_END(osyscall) @@ -1261,9 +1167,9 @@ IDTVEC_END(osyscall) * Trap gate entry for syscall */ IDTVEC(syscall) - pushl $2 /* size of instruction for restart */ + pushl $2 # size of instruction for restart syscall1: - pushl $T_ASTFLT /* trap # for doing ASTs */ + pushl $T_ASTFLT # trap # for doing ASTs INTRENTRY STI(%eax) #ifdef DIAGNOSTIC @@ -1278,13 +1184,13 @@ syscall1: #endif 1: #endif /* DIAGNOSTIC */ - addl $1,CPUVAR(NSYSCALL) /* count it atomically */ - adcl $0,CPUVAR(NSYSCALL)+4 /* count it atomically */ + addl $1,CPUVAR(NSYSCALL) # count it atomically + adcl $0,CPUVAR(NSYSCALL)+4 # count it atomically movl CPUVAR(CURLWP),%edi movl L_PROC(%edi),%edx - movl %esp,L_MD_REGS(%edi) /* save pointer to frame */ + movl %esp,L_MD_REGS(%edi) # save pointer to frame pushl %esp - call *P_MD_SYSCALL(%edx) /* get pointer to syscall() function */ + call *P_MD_SYSCALL(%edx) # get pointer to syscall() function addl $4,%esp .Lsyscall_checkast: /* Check for ASTs on exit to user mode. */ @@ -1301,17 +1207,17 @@ syscall1: /* process pending interrupts */ CLI(%eax) movl CPUVAR(ILEVEL), %ebx - movl $.Lsyscall_resume, %esi /* address to resume loop at */ + movl $.Lsyscall_resume, %esi # address to resume loop at .Lsyscall_resume: - movl %ebx,%eax /* get cpl */ + movl %ebx,%eax # get cpl movl CPUVAR(IUNMASK)(,%eax,4),%eax - andl CPUVAR(IPENDING),%eax /* any non-masked bits left? */ + andl CPUVAR(IPENDING),%eax # any non-masked bits left? jz 17f bsrl %eax,%eax btrl %eax,CPUVAR(IPENDING) movl CPUVAR(ISOURCES)(,%eax,4),%eax jmp *IS_RESUME(%eax) -17: movl %ebx, CPUVAR(ILEVEL) /* restore cpl */ +17: movl %ebx, CPUVAR(ILEVEL) #restore cpl jmp .Lsyscall_checkast 14: #endif /* XEN */ @@ -1350,8 +1256,8 @@ syscall1: IDTVEC_END(syscall) IDTVEC(svr4_fasttrap) - pushl $2 /* size of instruction for restart */ - pushl $T_ASTFLT /* trap # for doing ASTs */ + pushl $2 # size of instruction for restart + pushl $T_ASTFLT # trap # for doing ASTs INTRENTRY STI(%eax) pushl $RW_READER @@ -1364,7 +1270,7 @@ IDTVEC(svr4_fasttrap) addl $4,%esp 2: /* Check for ASTs on exit to user mode. */ cli - CHECK_ASTPENDING(%eax) + CHECK_ASTPENDING(%eax) je 1f /* Always returning to user mode here. */ CLEAR_ASTPENDING(%eax) @@ -1388,12 +1294,12 @@ IDTVEC(svr4_fasttrap) * Anything 120MHz or above is fine. */ NENTRY(npx586bug1) - fildl 4(%esp) /* x */ - fildl 8(%esp) /* y */ + fildl 4(%esp) # x + fildl 8(%esp) # y fld %st(1) - fdiv %st(1),%st /* x/y */ - fmulp %st,%st(1) /* (x/y)*y */ - fsubrp %st,%st(1) /* x-(x/y)*y */ + fdiv %st(1),%st # x/y + fmulp %st,%st(1) # (x/y)*y + fsubrp %st,%st(1) # x-(x/y)*y pushl $0 fistpl (%esp) popl %eax