[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.113.2.2 and 1.113.2.3

version 1.113.2.2, 2016/05/29 08:44:17 version 1.113.2.3, 2016/07/09 20:24:52
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(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 273  __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 302  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
   _C_LABEL(tablesize):    .long   0
   END(tablesize)
         .type   _C_LABEL(nox_flag), @object          .type   _C_LABEL(nox_flag), @object
 LABEL(nox_flag)         .long   0       /* 32bit NOX flag, set if supported */  LABEL(nox_flag)         .long   0       /* 32bit NOX flag, set if supported */
 END(nox_flag)  END(nox_flag)
Line 309  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 320  END(lwp0uarea)
Line 342  END(lwp0uarea)
         .type   _C_LABEL(PDPpaddr), @object          .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)  END(PDPpaddr)
         .type   _C_LABEL(tablesize), @object  
 _C_LABEL(tablesize):    .long   0  
 END(tablesize)  
   
         /* Space for the temporary stack */          /* Space for the temporary stack */
         .size   tmpstk, tmpstk - .          .size   tmpstk, tmpstk - .
Line 397  _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 610  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 693  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 724  no_NOX:
Line 738  no_NOX:
         orl     $(PG_V|PG_KW),%eax          orl     $(PG_V|PG_KW),%eax
         fillkpt_nox          fillkpt_nox
   
         /* Map [SYMS]+[PRELOADED MODULES] RWX. */          /* Map [SYMS]+[PRELOADED MODULES] RW. */
         movl    $RELOC(__kernel_end),%eax          movl    $RELOC(__kernel_end),%eax
         movl    %esi,%ecx               /* start of BOOTSTRAP TABLES */          movl    %esi,%ecx               /* start of BOOTSTRAP TABLES */
         subl    %eax,%ecx          subl    %eax,%ecx
         shrl    $PGSHIFT,%ecx          shrl    $PGSHIFT,%ecx
         orl     $(PG_V|PG_KW),%eax          orl     $(PG_V|PG_KW),%eax
         fillkpt          fillkpt_nox
   
         /* Map the BOOTSTRAP TABLES RW. */          /* Map the BOOTSTRAP TABLES RW. */
         movl    %esi,%eax               /* start of BOOTSTRAP TABLES */          movl    %esi,%eax               /* start of BOOTSTRAP TABLES */
Line 739  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 RW. */
         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 */
         fillkpt          shrl    $PGSHIFT,%ecx
           orl     $(PG_V|PG_KW/*|PG_N*/),%eax
           fillkpt_nox
   
         /*          /*
          * Build L2 for identity mapping. Linked to L1.           * Build L2 for identity mapping. Linked to L1.
Line 760  no_NOX:
Line 776  no_NOX:
         movl    RELOC(nkptp)+1*4,%ecx          movl    RELOC(nkptp)+1*4,%ecx
         fillkpt          fillkpt
   
         /* Install a PDE recursively mapping page directory as a page table! */          /* Install recursive top level PDE */
         leal    (PROC0_PDIR_OFF + PDIR_SLOT_PTE * PDE_SIZE)(%esi),%ebx          leal    (PROC0_PDIR_OFF + PDIR_SLOT_PTE * PDE_SIZE)(%esi),%ebx
         leal    (PROC0_PDIR_OFF)(%esi),%eax          leal    (PROC0_PDIR_OFF)(%esi),%eax
         orl     $(PG_V|PG_KW),%eax          orl     $(PG_V|PG_KW),%eax
         movl    $PDP_SIZE,%ecx          movl    $PDP_SIZE,%ecx
         fillkpt          fillkpt_nox
   
 #ifdef PAE  #ifdef PAE
         /*          /*
Line 1084  END(dumpsys)
Line 1100  END(dumpsys)
   
 /*  /*
  * struct lwp *cpu_switchto(struct lwp *oldlwp, struct lwp *newlwp,   * struct lwp *cpu_switchto(struct lwp *oldlwp, struct lwp *newlwp,
  *                          bool returning)   *     bool returning)
  *   *
  *      1. if (oldlwp != NULL), save its context.   *      1. if (oldlwp != NULL), save its context.
  *      2. then, restore context of newlwp.   *      2. then, restore context of newlwp.
Line 1112  ENTRY(cpu_switchto)
Line 1128  ENTRY(cpu_switchto)
         movl    16(%esp),%esi           /* oldlwp */          movl    16(%esp),%esi           /* oldlwp */
         movl    20(%esp),%edi           /* newlwp */          movl    20(%esp),%edi           /* newlwp */
         movl    24(%esp),%edx           /* returning */          movl    24(%esp),%edx           /* returning */
         testl   %esi,%esi  
         jz      1f          testl   %esi,%esi               /* oldlwp = NULL ? */
           jz      skip_save
   
         /* Save old context. */          /* Save old context. */
         movl    L_PCB(%esi),%eax          movl    L_PCB(%esi),%eax
         movl    %esp,PCB_ESP(%eax)          movl    %esp,PCB_ESP(%eax)
         movl    %ebp,PCB_EBP(%eax)          movl    %ebp,PCB_EBP(%eax)
   skip_save:
   
         /* Switch to newlwp's stack. */          /* Switch to newlwp's stack. */
 1:      movl    L_PCB(%edi),%ebx          movl    L_PCB(%edi),%ebx
         movl    PCB_EBP(%ebx),%ebp          movl    PCB_EBP(%ebx),%ebp
         movl    PCB_ESP(%ebx),%esp          movl    PCB_ESP(%ebx),%esp
   
Line 1134  ENTRY(cpu_switchto)
Line 1152  ENTRY(cpu_switchto)
   
         /* Skip the rest if returning to a pinned LWP. */          /* Skip the rest if returning to a pinned LWP. */
         testl   %edx,%edx          testl   %edx,%edx
         jnz     4f          jnz     switch_return
   
           /* Switch ring0 stack */
 #ifdef XEN  #ifdef XEN
         pushl   %edi          pushl   %edi
         call    _C_LABEL(i386_switch_context)          call    _C_LABEL(i386_switch_context)
         addl    $4,%esp          addl    $4,%esp
 #else /* !XEN */  #else
         /* Switch ring0 esp */  
         movl    PCB_ESP0(%ebx),%eax          movl    PCB_ESP0(%ebx),%eax
         movl    %eax,CPUVAR(ESP0)          movl    %eax,CPUVAR(ESP0)
 #endif /* !XEN */  #endif
   
         /* Don't bother with the rest if switching to a system process. */          /* Don't bother with the rest if switching to a system process. */
         testl   $LW_SYSTEM,L_FLAG(%edi)          testl   $LW_SYSTEM,L_FLAG(%edi)
         jnz     4f          jnz     switch_return
   
 #ifndef XEN  #ifndef XEN
         /* Restore thread-private %fs/%gs descriptors. */          /* Restore thread-private %fs/%gs descriptors. */
         movl    CPUVAR(GDT),%ecx          movl    CPUVAR(GDT),%ecx
         movl    PCB_FSD(%ebx), %eax          movl    PCB_FSD(%ebx),%eax
         movl    PCB_FSD+4(%ebx), %edx          movl    PCB_FSD+4(%ebx),%edx
         movl    %eax, (GUFS_SEL*8)(%ecx)          movl    %eax,(GUFS_SEL*8)(%ecx)
         movl    %edx, (GUFS_SEL*8+4)(%ecx)          movl    %edx,(GUFS_SEL*8+4)(%ecx)
         movl    PCB_GSD(%ebx), %eax          movl    PCB_GSD(%ebx),%eax
         movl    PCB_GSD+4(%ebx), %edx          movl    PCB_GSD+4(%ebx),%edx
         movl    %eax, (GUGS_SEL*8)(%ecx)          movl    %eax,(GUGS_SEL*8)(%ecx)
         movl    %edx, (GUGS_SEL*8+4)(%ecx)          movl    %edx,(GUGS_SEL*8+4)(%ecx)
 #endif /* !XEN */  #endif /* !XEN */
   
         /* Switch I/O bitmap */          /* Switch I/O bitmap */
Line 1173  ENTRY(cpu_switchto)
Line 1191  ENTRY(cpu_switchto)
         /* Is this process using RAS (restartable atomic sequences)? */          /* Is this process using RAS (restartable atomic sequences)? */
         movl    L_PROC(%edi),%eax          movl    L_PROC(%edi),%eax
         cmpl    $0,P_RASLIST(%eax)          cmpl    $0,P_RASLIST(%eax)
         jne     5f          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:
   
         /*          /*
          * Restore cr0 (including FPU state).  Raise the IPL to IPL_HIGH.           * Restore cr0 (including FPU state).  Raise the IPL to IPL_HIGH.
          * FPU IPIs can alter the LWP's saved cr0.  Dropping the priority           * FPU IPIs can alter the LWP's saved cr0.  Dropping the priority
          * is deferred until mi_switch(), when cpu_switchto() returns.           * is deferred until mi_switch(), when cpu_switchto() returns.
          */           */
 2:  
 #ifdef XEN  #ifdef XEN
         pushl   %edi          pushl   %edi
         call    _C_LABEL(i386_tls_switch)          call    _C_LABEL(i386_tls_switch)
Line 1195  ENTRY(cpu_switchto)
Line 1224  ENTRY(cpu_switchto)
          * set CR0_TS so we'll trap rather than reuse bogus state.           * set CR0_TS so we'll trap rather than reuse bogus state.
          */           */
         cmpl    CPUVAR(FPCURLWP),%edi          cmpl    CPUVAR(FPCURLWP),%edi
         je      3f          je      skip_TS
         orl     $CR0_TS,%ecx          orl     $CR0_TS,%ecx
   skip_TS:
   
         /* Reloading CR0 is very expensive - avoid if possible. */          /* Reloading CR0 is very expensive - avoid if possible. */
 3:      cmpl    %edx,%ecx          cmpl    %edx,%ecx
         je      4f          je      switch_return
         movl    %ecx,%cr0          movl    %ecx,%cr0
 #endif /* !XEN */  #endif /* !XEN */
   
   switch_return:
         /* Return to the new LWP, returning 'oldlwp' in %eax. */          /* Return to the new LWP, returning 'oldlwp' in %eax. */
 4:      movl    %esi,%eax          movl    %esi,%eax
         popl    %edi          popl    %edi
         popl    %esi          popl    %esi
         popl    %ebx          popl    %ebx
         ret          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:  .Lcopy_iobitmap:
         /* Copy I/O bitmap. */          /* Copy I/O bitmap. */
         incl    _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT          incl    _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT

Legend:
Removed from v.1.113.2.2  
changed lines
  Added in v.1.113.2.3

CVSweb <webmaster@jp.NetBSD.org>