[BACK]Return to locore.S CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / i386 / i386

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/i386/i386/locore.S between version 1.126 and 1.130

version 1.126, 2016/05/29 09:16:12 version 1.130, 2016/06/04 10:19:09
Line 5 
Line 5 
  */   */
   
 /*  /*
    * 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.   * Copyright (c) 2006 Manuel Bouyer.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 65 
Line 94 
  */   */
   
 /*-  /*-
  * 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.   * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.   * All rights reserved.
  *   *
Line 147  __KERNEL_RCSID(0, "$NetBSD$");
Line 147  __KERNEL_RCSID(0, "$NetBSD$");
 #include <sys/errno.h>  #include <sys/errno.h>
 #include <sys/syscall.h>  #include <sys/syscall.h>
   
 #include <machine/cputypes.h>  
 #include <machine/segments.h>  #include <machine/segments.h>
 #include <machine/specialreg.h>  #include <machine/specialreg.h>
 #include <machine/trap.h>  #include <machine/trap.h>
 #include <machine/i82489reg.h>  #include <machine/i82489reg.h>
 #include <machine/frameasm.h>  #include <machine/frameasm.h>
 #include <machine/i82489reg.h>  #include <machine/i82489reg.h>
   #include <machine/cputypes.h>
   
 #ifndef XEN  #ifndef XEN
 #include <machine/multiboot.h>  #include <machine/multiboot.h>
 #endif  #endif
Line 218  __KERNEL_RCSID(0, "$NetBSD$");
Line 219  __KERNEL_RCSID(0, "$NetBSD$");
 2:                                      ;  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   * killkpt - Destroy a kernel page table
  *      ebx = page table address   *      ebx = page table address
  *      ecx = number of pages to destroy   *      ecx = number of pages to destroy
Line 255  __KERNEL_RCSID(0, "$NetBSD$");
Line 270  __KERNEL_RCSID(0, "$NetBSD$");
  */   */
         .data          .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(lwp0uarea)  
         .globl  _C_LABEL(PDPpaddr)  
         .globl  _C_LABEL(gdt)  
         .globl  _C_LABEL(idt)  
         .globl  _C_LABEL(lapic_tpr)          .globl  _C_LABEL(lapic_tpr)
   
 #if NLAPIC > 0  #if NLAPIC > 0
Line 274  __KERNEL_RCSID(0, "$NetBSD$");
Line 278  __KERNEL_RCSID(0, "$NetBSD$");
 #else  #else
         .align  12          .align  12
 #endif  #endif
         .globl _C_LABEL(local_apic), _C_LABEL(lapic_id)          .globl  _C_LABEL(local_apic)
           .globl  _C_LABEL(lapic_id)
   
         .type   _C_LABEL(local_apic), @object          .type   _C_LABEL(local_apic), @object
 LABEL(local_apic)  LABEL(local_apic)
         .space  LAPIC_ID          .space  LAPIC_ID
Line 303  LABEL(lapic_tpr)
Line 309  LABEL(lapic_tpr)
 END(lapic_tpr)  END(lapic_tpr)
 #endif  #endif
   
           .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(gdt)
           .globl  _C_LABEL(idt)
   
         .type   _C_LABEL(tablesize), @object          .type   _C_LABEL(tablesize), @object
 _C_LABEL(tablesize):    .long   0  _C_LABEL(tablesize):    .long   0
 END(tablesize)  END(tablesize)
Line 313  END(nox_flag)
Line 331  END(nox_flag)
 LABEL(cputype)          .long   0       /* are we 80486, Pentium, or.. */  LABEL(cputype)          .long   0       /* are we 80486, Pentium, or.. */
 END(cputype)  END(cputype)
         .type   _C_LABEL(cpuid_level), @object          .type   _C_LABEL(cpuid_level), @object
 LABEL(cpuid_level)      .long   0  LABEL(cpuid_level)      .long   -1      /* max. level accepted by cpuid instr */
 END(cpuid_level)  END(cpuid_level)
         .type   _C_LABEL(atdevbase), @object          .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 virt */
Line 398  _C_LABEL(Multiboot_Header):
Line 416  _C_LABEL(Multiboot_Header):
         xorl    %eax,%eax          xorl    %eax,%eax
         movw    %ax,%fs          movw    %ax,%fs
         movw    %ax,%gs          movw    %ax,%gs
         decl    %eax  
         movl    %eax,RELOC(cpuid_level)  
   
         /* Find out our CPU type. */          /* Find out our CPU type. */
   
Line 611  no_NOX:
Line 627  no_NOX:
  * +------+--------+------+-----+--------+---------------------+-----------   * +------+--------+------+-----+--------+---------------------+-----------
  *                             (1)      (2)                   (3)   *                             (1)      (2)                   (3)
  *   *
  * -------+------------+   * -------+-------------+
  * TABLES | ISA IO MEM |   * TABLES | ISA I/O MEM |
  * -------+------------+   * -------+-------------+
  *       (4)   *       (4)
  *   *
  * PROC0 STK is obviously not linked as a page level. It just happens to be   * PROC0 STK is obviously not linked as a page level. It just happens to be
Line 694  no_NOX:
Line 710  no_NOX:
         leal    (PROC0_PTP1_OFF)(%esi),%ebx          leal    (PROC0_PTP1_OFF)(%esi),%ebx
   
         /* Skip the first MB. */          /* Skip the first MB. */
         movl    $(KERNTEXTOFF - KERNBASE),%eax          movl    $(KERNTEXTOFF - KERNBASE),%ecx
         movl    %eax,%ecx          shrl    $PGSHIFT,%ecx
         shrl    $(PGSHIFT-2),%ecx       /* ((n >> PGSHIFT) << 2) for # PDEs */          fillkpt_blank
 #ifdef PAE  
         shll    $1,%ecx                 /* PDEs are twice larger with PAE */  
 #endif  
         addl    %ecx,%ebx  
   
         /* Map the kernel text RX. */          /* Map the kernel text RX. */
           movl    $(KERNTEXTOFF - KERNBASE),%eax  /* start of TEXT */
         movl    $RELOC(__rodata_start),%ecx          movl    $RELOC(__rodata_start),%ecx
         subl    %eax,%ecx          subl    %eax,%ecx
         shrl    $PGSHIFT,%ecx          shrl    $PGSHIFT,%ecx
Line 740  no_NOX:
Line 753  no_NOX:
         orl     $(PG_V|PG_KW),%eax          orl     $(PG_V|PG_KW),%eax
         fillkpt_nox          fillkpt_nox
   
         /* We are on (4). Map ISA I/O mem (later atdevbase) RWX. */          /* We are on (4). Map ISA I/O MEM RWX. */
         movl    $(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax          movl    $IOM_BEGIN,%eax
         movl    $(IOM_SIZE>>PGSHIFT),%ecx          movl    $IOM_SIZE,%ecx  /* size of ISA I/O MEM */
           shrl    $PGSHIFT,%ecx
           orl     $(PG_V|PG_KW/*|PG_N*/),%eax
         fillkpt          fillkpt
   
         /*          /*
Legend:
Removed from v.1.126  
changed lines
  Added in v.1.130
CVSweb <webmaster@jp.NetBSD.org>