[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.148 and 1.159

version 1.148, 2017/07/29 11:54:14 version 1.159, 2018/07/14 14:29:40
Line 135  __KERNEL_RCSID(0, "$NetBSD$");
Line 135  __KERNEL_RCSID(0, "$NetBSD$");
 #include "opt_modular.h"  #include "opt_modular.h"
 #include "opt_multiboot.h"  #include "opt_multiboot.h"
 #include "opt_realmem.h"  #include "opt_realmem.h"
 #include "opt_vm86.h"  
 #include "opt_xen.h"  #include "opt_xen.h"
   
 #include "assym.h"  #include "assym.h"
Line 342  _C_LABEL(Multiboot_Header):
Line 341  _C_LABEL(Multiboot_Header):
         jne     1f          jne     1f
   
         /*          /*
          * Indeed, a multiboot-compliant boot loader executed us.  We copy           * Indeed, a multiboot-compliant boot loader executed us. We switch
          * the received Multiboot information structure into kernel's data           * to the temporary stack, and copy the received Multiboot information
          * space to process it later -- after we are relocated.  It will           * structure into kernel's data space to process it later -- after we
          * be safer to run complex C code than doing it at this point.           * are relocated. It will be safer to run complex C code than doing it
            * at this point.
          */           */
           movl    $_RELOC(tmpstk),%esp
         pushl   %ebx            /* Address of Multiboot information */          pushl   %ebx            /* Address of Multiboot information */
         call    _C_LABEL(multiboot_pre_reloc)          call    _C_LABEL(multiboot_pre_reloc)
         addl    $4,%esp          addl    $4,%esp
Line 837  begin:
Line 838  begin:
         pushl   $0      /* init386() expects a 64 bits paddr_t with PAE */          pushl   $0      /* init386() expects a 64 bits paddr_t with PAE */
 #endif  #endif
         pushl   %eax          pushl   %eax
           call    _C_LABEL(init_bootspace)
         call    _C_LABEL(init386)          call    _C_LABEL(init386)
         addl    $PDE_SIZE,%esp          /* pop paddr_t */          addl    $PDE_SIZE,%esp          /* pop paddr_t */
         addl    $NGDT*8,%esp            /* pop temporary gdt */          addl    $NGDT*8,%esp            /* pop temporary gdt */
   
 #ifdef SAFARI_FIFO_HACK  
         movb    $5,%al  
         movw    $0x37b,%dx  
         outb    %al,%dx  
         movw    $0x37f,%dx  
         inb     %dx,%al  
         movb    %al,%cl  
   
         orb     $1,%cl  
   
         movb    $5,%al  
         movw    $0x37b,%dx  
         outb    %al,%dx  
         movw    $0x37f,%dx  
         movb    %cl,%al  
         outb    %al,%dx  
 #endif /* SAFARI_FIFO_HACK */  
   
         call    _C_LABEL(main)          call    _C_LABEL(main)
 #else /* XEN */  #else /* XEN */
         /* First, reset the PSL. */          /* First, reset the PSL. */
Line 926  begin:
Line 910  begin:
         pushl   $0      /* init386() expects a 64 bits paddr_t with PAE */          pushl   $0      /* init386() expects a 64 bits paddr_t with PAE */
 #endif  #endif
         pushl   %esi          pushl   %esi
           call    _C_LABEL(init_bootspace)
         call    _C_LABEL(init386)          call    _C_LABEL(init386)
         addl    $PDE_SIZE,%esp          /* pop paddr_t */          addl    $PDE_SIZE,%esp          /* pop paddr_t */
         call    _C_LABEL(main)          call    _C_LABEL(main)
Line 949  END(hypercall_page)
Line 934  END(hypercall_page)
  * this only happens at run time when the GDT is resized.   * this only happens at run time when the GDT is resized.
  */   */
 /* LINTSTUB: Func: void lgdt_finish(void) */  /* LINTSTUB: Func: void lgdt_finish(void) */
 NENTRY(lgdt_finish)  ENTRY(lgdt_finish)
         movl    $GSEL(GDATA_SEL, SEL_KPL),%eax          movl    $GSEL(GDATA_SEL, SEL_KPL),%eax
         movw    %ax,%ds          movw    %ax,%ds
         movw    %ax,%es          movw    %ax,%es
Line 976  END(lgdt_finish)
Line 961  END(lgdt_finish)
  * stub to call.   * 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)  ENTRY(lwp_trampoline)
         movl    %ebp,%edi       /* for .Lsyscall_checkast */          movl    %ebp,%edi       /* for .Lsyscall_checkast */
         xorl    %ebp,%ebp          xorl    %ebp,%ebp
         pushl   %edi          pushl   %edi
Line 996  END(lwp_trampoline)
Line 981  END(lwp_trampoline)
  * Signal trampoline; copied to top of user stack.  Used only for   * Signal trampoline; copied to top of user stack.  Used only for
  * compatibility with old releases of NetBSD.   * compatibility with old releases of NetBSD.
  */   */
 NENTRY(sigcode)  ENTRY(sigcode)
         /*          /*
          * Handler has returned here as if we called it.  The sigcontext           * Handler has returned here as if we called it.  The sigcontext
          * is on the stack after the 3 args "we" pushed.           * is on the stack after the 3 args "we" pushed.
Line 1127  skip_save:
Line 1112  skip_save:
         addl    $4,%esp          addl    $4,%esp
 #else  #else
         movl    PCB_ESP0(%ebx),%eax          movl    PCB_ESP0(%ebx),%eax
         movl    %eax,CPUVAR(ESP0)          movl    CPUVAR(TSS),%ecx
           movl    %eax,TSS_ESP0(%ecx)
   #endif
   
   #ifndef XEN
           pushl   %edx
           movb    _C_LABEL(x86_fpu_eager),%dl
           testb   %dl,%dl
           jz      .Lno_eagerfpu
           pushl   %edi
           pushl   %esi
           call    _C_LABEL(fpu_eagerswitch)
           addl    $8,%esp
   .Lno_eagerfpu:
           popl    %edx
 #endif  #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. */
Line 1151  skip_save:
Line 1150  skip_save:
         movl    PCB_IOMAP(%ebx),%eax          movl    PCB_IOMAP(%ebx),%eax
         orl     %eax,%eax          orl     %eax,%eax
         jnz     .Lcopy_iobitmap          jnz     .Lcopy_iobitmap
         movl    $(IOMAP_INVALOFF << 16),CPUVAR(IOBASE)          movl    CPUVAR(TSS),%eax
           movl    $(IOMAP_INVALOFF << 16),TSS_IOBASE(%eax)
 .Liobitmap_done:  .Liobitmap_done:
   
         /* Is this process using RAS (restartable atomic sequences)? */          /* Is this process using RAS (restartable atomic sequences)? */
Line 1215  switch_return:
Line 1215  switch_return:
         pushl   %esi          pushl   %esi
         pushl   %edi          pushl   %edi
         movl    %eax,%esi               /* pcb_iomap */          movl    %eax,%esi               /* pcb_iomap */
         movl    CPUVAR(SELF),%edi          movl    CPUVAR(TSS),%edi
         leal    CPU_INFO_IOMAP(%edi),%edi          leal    TSS_IOMAP(%edi),%edi
         rep          rep
         movsl          movsl
         popl    %edi          popl    %edi
         popl    %esi          popl    %esi
         movl    $((CPU_INFO_IOMAP - CPU_INFO_TSS) << 16),CPUVAR(IOBASE)          movl    CPUVAR(TSS),%eax
           movl    $(IOMAP_VALIDOFF << 16),TSS_IOBASE(%eax)
         jmp     .Liobitmap_done          jmp     .Liobitmap_done
 END(cpu_switchto)  END(cpu_switchto)
   
Line 1335  IDTVEC_END(syscall)
Line 1336  IDTVEC_END(syscall)
  * Used when checking for the FDIV bug on first generations pentiums.   * Used when checking for the FDIV bug on first generations pentiums.
  * Anything 120MHz or above is fine.   * Anything 120MHz or above is fine.
  */   */
 NENTRY(npx586bug1)  ENTRY(npx586bug1)
         fildl   4(%esp)         /* x */          fildl   4(%esp)         /* x */
         fildl   8(%esp)         /* y */          fildl   8(%esp)         /* y */
         fld     %st(1)          fld     %st(1)
Line 1384  ENTRY(sse2_idlezero_page)
Line 1385  ENTRY(sse2_idlezero_page)
         popl    %ebp          popl    %ebp
         ret          ret
 END(sse2_idlezero_page)  END(sse2_idlezero_page)
   
   ENTRY(intrfastexit)
           movw    TF_GS(%esp),%gs
           movw    TF_FS(%esp),%fs
           movw    TF_ES(%esp),%es
           movw    TF_DS(%esp),%ds
           movl    TF_EDI(%esp),%edi
           movl    TF_ESI(%esp),%esi
           movl    TF_EBP(%esp),%ebp
           movl    TF_EBX(%esp),%ebx
           movl    TF_EDX(%esp),%edx
           movl    TF_ECX(%esp),%ecx
           movl    TF_EAX(%esp),%eax
           addl    $(TF_PUSHSIZE+8),%esp
           iret
   END(intrfastexit)
   
Legend:
Removed from v.1.148  
changed lines
  Added in v.1.159
CVSweb <webmaster@jp.NetBSD.org>