[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.78.2.2 and 1.78.2.3

version 1.78.2.2, 2009/03/03 18:28:59 version 1.78.2.3, 2009/04/28 07:34:08
Line 71 
Line 71 
   
   
 /*-  /*-
  * Copyright (c) 1998, 2000, 2004, 2006, 2007 The NetBSD Foundation, Inc.   * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.   * All rights reserved.
  *   *
  * This code is derived from software contributed to The NetBSD Foundation   * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.   * by Charles M. Hannum, and by Andrew Doran.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 1047  ENTRY(cpu_switchto)
Line 1047  ENTRY(cpu_switchto)
   
 .Lcopy_iobitmap:  .Lcopy_iobitmap:
         /* Copy I/O bitmap. */          /* Copy I/O bitmap. */
           incl    _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT
         movl    $(IOMAPSIZE/4),%ecx          movl    $(IOMAPSIZE/4),%ecx
         pushl   %esi          pushl   %esi
         pushl   %edi          pushl   %edi
Line 1079  END(savectx)
Line 1080  END(savectx)
  * Old call gate entry for syscall   * Old call gate entry for syscall
  */   */
 IDTVEC(osyscall)  IDTVEC(osyscall)
           cli                     # must be first instruction
         pushfl                  # set eflags in trap frame          pushfl                  # set eflags in trap frame
         popl    8(%esp)          popl    8(%esp)
           orl     $PSL_I,(%esp)   # re-enable ints on return to user
         pushl   $7              # size of instruction for restart          pushl   $7              # size of instruction for restart
         jmp     syscall1          jmp     syscall1
 IDTVEC_END(osyscall)  IDTVEC_END(osyscall)
Line 1095  IDTVEC(syscall)
Line 1098  IDTVEC(syscall)
 syscall1:  syscall1:
         pushl   $T_ASTFLT       # trap # for doing ASTs          pushl   $T_ASTFLT       # trap # for doing ASTs
         INTRENTRY          INTRENTRY
           STI(%eax)
 #ifdef DIAGNOSTIC  #ifdef DIAGNOSTIC
         movl    CPUVAR(ILEVEL),%ebx          movl    CPUVAR(ILEVEL),%ebx
         testl   %ebx,%ebx          testl   %ebx,%ebx
         jz      1f          jz      1f
         pushl   $5f          pushl   $5f
         call    _C_LABEL(printf)          call    _C_LABEL(panic)
         addl    $4,%esp          addl    $4,%esp
 #ifdef DDB  #ifdef DDB
         int     $3          int     $3
Line 1151  syscall1:
Line 1155  syscall1:
         INTRFASTEXIT          INTRFASTEXIT
 3:      STI(%eax)  3:      STI(%eax)
         pushl   $4f          pushl   $4f
         call    _C_LABEL(printf)          call    _C_LABEL(panic)
         addl    $4,%esp          addl    $4,%esp
         pushl   $IPL_NONE          pushl   $IPL_NONE
         call    _C_LABEL(spllower)          call    _C_LABEL(spllower)
         addl    $4,%esp          addl    $4,%esp
         jmp     .Lsyscall_checkast          jmp     .Lsyscall_checkast
 4:      .asciz  "WARNING: SPL NOT LOWERED ON SYSCALL EXIT\n"  4:      .asciz  "SPL NOT LOWERED ON SYSCALL EXIT\n"
 5:      .asciz  "WARNING: SPL NOT ZERO ON SYSCALL ENTRY\n"  5:      .asciz  "SPL NOT ZERO ON SYSCALL ENTRY\n"
 #endif /* DIAGNOSTIC */  #endif /* DIAGNOSTIC */
 9:  9:
         cmpl    $0, CPUVAR(WANT_PMAPLOAD)          cmpl    $0, CPUVAR(WANT_PMAPLOAD)
Line 1181  IDTVEC(svr4_fasttrap)
Line 1185  IDTVEC(svr4_fasttrap)
         pushl   $2              # size of instruction for restart          pushl   $2              # size of instruction for restart
         pushl   $T_ASTFLT       # trap # for doing ASTs          pushl   $T_ASTFLT       # trap # for doing ASTs
         INTRENTRY          INTRENTRY
           STI(%eax)
         pushl   $RW_READER          pushl   $RW_READER
         pushl   $_C_LABEL(svr4_fasttrap_lock)          pushl   $_C_LABEL(svr4_fasttrap_lock)
         call    _C_LABEL(rw_enter)          call    _C_LABEL(rw_enter)

Legend:
Removed from v.1.78.2.2  
changed lines
  Added in v.1.78.2.3

CVSweb <webmaster@jp.NetBSD.org>