[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.106 and 1.106.2.1

version 1.106, 2013/06/23 09:00:36 version 1.106.2.1, 2014/05/18 17:45:12
Line 139  __KERNEL_RCSID(0, "$NetBSD$");
Line 139  __KERNEL_RCSID(0, "$NetBSD$");
 #include "opt_vm86.h"  #include "opt_vm86.h"
 #include "opt_xen.h"  #include "opt_xen.h"
   
 #include "npx.h"  
 #include "assym.h"  #include "assym.h"
 #include "lapic.h"  #include "lapic.h"
 #include "ioapic.h"  #include "ioapic.h"
Line 698  try586: /* Use the `cpuid' instruction. 
Line 697  try586: /* Use the `cpuid' instruction. 
          * 2. Enable paging and the rest of it.           * 2. Enable paging and the rest of it.
          */           */
         movl    %cr0,%eax               # get control word          movl    %cr0,%eax               # get control word
                                         # enable paging & NPX emulation                                          # enable paging & NPX
         orl     $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP|CR0_AM),%eax          orl     $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
         movl    %eax,%cr0               # and page NOW!          movl    %eax,%cr0               # and page NOW!
   
         pushl   $begin                  # jump to high mem          pushl   $begin                  # jump to high mem
Line 728  begin:
Line 727  begin:
         /* Set up bootstrap stack. */          /* Set up bootstrap stack. */
         leal    (PROC0_STK_OFF+KERNBASE)(%esi),%eax          leal    (PROC0_STK_OFF+KERNBASE)(%esi),%eax
         movl    %eax,_C_LABEL(lwp0uarea)          movl    %eax,_C_LABEL(lwp0uarea)
         leal    (KSTACK_SIZE-FRAMESIZE)(%eax),%esp          leal    (USPACE-FRAMESIZE)(%eax),%esp
         movl    %esi,(KSTACK_SIZE+PCB_CR3)(%eax)        # pcb->pcb_cr3          movl    %esi,PCB_CR3(%eax)      # pcb->pcb_cr3
         xorl    %ebp,%ebp               # mark end of frames          xorl    %ebp,%ebp               # mark end of frames
   
 #if defined(MULTIBOOT)  #if defined(MULTIBOOT)
Line 826  begin:
Line 825  begin:
         movl    %esi, _C_LABEL(lwp0uarea)          movl    %esi, _C_LABEL(lwp0uarea)
   
         /* Set up bootstrap stack. */          /* Set up bootstrap stack. */
         leal    (KSTACK_SIZE-FRAMESIZE)(%eax),%esp          leal    (USPACE-FRAMESIZE)(%eax),%esp
         xorl    %ebp,%ebp               # mark end of frames          xorl    %ebp,%ebp               # mark end of frames
   
         addl    $USPACE, %esi          addl    $USPACE, %esi
Line 881  END(lgdt_finish)
Line 880  END(lgdt_finish)
  *   *
  * This is a trampoline function pushed onto the stack of a newly created   * This is a trampoline function pushed onto the stack of a newly created
  * process in order to do some additional setup.  The trampoline is entered by   * process in order to do some additional setup.  The trampoline is entered by
  * cpu_switch()ing to the process, so we abuse the callee-saved registers used   * cpu_switchto()ing to the process, so we abuse the callee-saved
  * by cpu_switch() to store the information about the stub to call.   * registers used by cpu_switchto() to store the information about the
    * stub to call.
  * NOTE: This function does not have a normal calling sequence!   * NOTE: This function does not have a normal calling sequence!
  */   */
 NENTRY(lwp_trampoline)  NENTRY(lwp_trampoline)
Line 1287  IDTVEC(svr4_fasttrap)
Line 1287  IDTVEC(svr4_fasttrap)
         cli          cli
         jmp     2b          jmp     2b
   
 #if NNPX > 0  
 /*  
  * Special interrupt handlers.  Someday intr0-intr15 will be used to count  
  * interrupts.  We'll still need a special exception 16 handler.  The busy  
  * latch stuff in probintr() can be moved to npxprobe().  
  */  
   
 /*  
  * void probeintr(void)  
  */  
 NENTRY(probeintr)  
         ss  
         incl    _C_LABEL(npx_intrs_while_probing)  
         pushl   %eax  
         movb    $0x20,%al       # EOI (asm in strings loses cpp features)  
         outb    %al,$0xa0       # IO_ICU2  
         outb    %al,$0x20       # IO_ICU1  
         movb    $0,%al  
         outb    %al,$0xf0       # clear BUSY# latch  
         popl    %eax  
         iret  
 END(probeintr)  
   
 /*  
  * void probetrap(void)  
  */  
 NENTRY(probetrap)  
         ss  
         incl    _C_LABEL(npx_traps_while_probing)  
         fnclex  
         iret  
 END(probetrap)  
   
 /*  /*
  * int npx586bug1(int a, int b)   * int npx586bug1(int a, int b)
    * Used when checking for the FDIV bug on first generations pentiums.
    * Anything 120MHz or above is fine.
  */   */
 NENTRY(npx586bug1)  NENTRY(npx586bug1)
         fildl   4(%esp)         # x          fildl   4(%esp)         # x
Line 1335  NENTRY(npx586bug1)
Line 1304  NENTRY(npx586bug1)
         popl    %eax          popl    %eax
         ret          ret
 END(npx586bug1)  END(npx586bug1)
 #endif /* NNPX > 0 */  
   
 /*  /*
  * void sse2_idlezero_page(void *pg)   * void sse2_idlezero_page(void *pg)

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.106.2.1

CVSweb <webmaster@jp.NetBSD.org>