[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.6 and 1.113.2.7

version 1.113.2.6, 2017/02/05 13:40:12 version 1.113.2.7, 2017/08/28 17:51:40
Line 130 
Line 130 
 #include <machine/asm.h>  #include <machine/asm.h>
 __KERNEL_RCSID(0, "$NetBSD$");  __KERNEL_RCSID(0, "$NetBSD$");
   
 #include "opt_compat_oldboot.h"  
 #include "opt_copy_symtab.h"  #include "opt_copy_symtab.h"
 #include "opt_ddb.h"  #include "opt_ddb.h"
 #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 343  _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 842  begin:
Line 842  begin:
         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 1239  ENTRY(savectx)
Line 1221  ENTRY(savectx)
 END(savectx)  END(savectx)
   
 /*  /*
  * osyscall()  
  *  
  * Old call gate entry for syscall  
  */  
 IDTVEC(osyscall)  
 #ifndef XEN  
         /* XXX we are in trouble! interrupts be off here. */  
         cli                     /* must be first instruction */  
 #endif  
         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 */  
         jmp     syscall1  
 IDTVEC_END(osyscall)  
   
 /*  
  * syscall()   * syscall()
  *   *
  * Trap gate entry for syscall   * Trap gate entry for syscall
  */   */
 IDTVEC(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          INTRENTRY
         STI(%eax)          STI(%eax)
Line 1349  syscall1:
Line 1313  syscall1:
         jmp     .Lsyscall_checkast      /* re-check ASTs */          jmp     .Lsyscall_checkast      /* re-check ASTs */
 IDTVEC_END(syscall)  IDTVEC_END(syscall)
   
 IDTVEC(svr4_fasttrap)  
         pushl   $2              /* size of instruction for restart */  
         pushl   $T_ASTFLT       /* trap # for doing ASTs */  
         INTRENTRY  
         STI(%eax)  
         pushl   $RW_READER  
         pushl   $_C_LABEL(svr4_fasttrap_lock)  
         call    _C_LABEL(rw_enter)  
         addl    $8,%esp  
         call    *_C_LABEL(svr4_fasttrap_vec)  
         pushl   $_C_LABEL(svr4_fasttrap_lock)  
         call    _C_LABEL(rw_exit)  
         addl    $4,%esp  
 2:      /* Check for ASTs on exit to user mode. */  
         cli  
         CHECK_ASTPENDING(%eax)  
         je      1f  
         /* Always returning to user mode here. */  
         CLEAR_ASTPENDING(%eax)  
         sti  
         /* Pushed T_ASTFLT into tf_trapno on entry. */  
         pushl   %esp  
         call    _C_LABEL(trap)  
         addl    $4,%esp  
         jmp     2b  
 1:      CHECK_DEFERRED_SWITCH  
         jnz     9f  
         INTRFASTEXIT  
 9:      sti  
         call    _C_LABEL(pmap_load)  
         cli  
         jmp     2b  
   
 /*  /*
  * int npx586bug1(int a, int b)   * int npx586bug1(int a, int b)
  * Used when checking for the FDIV bug on first generations pentiums.   * Used when checking for the FDIV bug on first generations pentiums.

Legend:
Removed from v.1.113.2.6  
changed lines
  Added in v.1.113.2.7

CVSweb <webmaster@jp.NetBSD.org>