[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.82.4.1 and 1.82.4.2

version 1.82.4.1, 2009/05/13 17:17:49 version 1.82.4.2, 2009/11/01 13:58:21
Line 15 
Line 15 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *      This product includes software developed by Manuel Bouyer.  
  * 4. The name of the author may not be used to endorse or promote products  
  *    derived from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR   * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 173  __KERNEL_RCSID(0, "$NetBSD$");
Line 168  __KERNEL_RCSID(0, "$NetBSD$");
  * Xen guest identifier and loader selection   * Xen guest identifier and loader selection
  */   */
 .section __xen_guest  .section __xen_guest
 #ifdef XEN3  
         .ascii  "GUEST_OS=netbsd,GUEST_VER=3.0,XEN_VER=xen-3.0"          .ascii  "GUEST_OS=netbsd,GUEST_VER=3.0,XEN_VER=xen-3.0"
 #if defined(DOM0OPS) || !defined(XEN_COMPAT_030001)  #if defined(DOM0OPS) || !defined(XEN_COMPAT_030001)
         .ascii  ",VIRT_BASE=0xc0000000" /* KERNBASE */          .ascii  ",VIRT_BASE=0xc0000000" /* KERNBASE */
Line 190  __KERNEL_RCSID(0, "$NetBSD$");
Line 184  __KERNEL_RCSID(0, "$NetBSD$");
 #ifdef PAE  #ifdef PAE
         .ascii  ",PAE=yes[extended-cr3]"          .ascii  ",PAE=yes[extended-cr3]"
 #endif  #endif
 #else /* !XEN3 */  
         .ascii  "GUEST_OS=netbsd,GUEST_VER=2.0,XEN_VER=2.0"  
 #endif /* XEN3 */  
         .ascii  ",LOADER=generic"          .ascii  ",LOADER=generic"
 #if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE)  #if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE)
         .ascii  ",BSD_SYMTAB=yes"          .ascii  ",BSD_SYMTAB=yes"
Line 727  start:
Line 718  start:
         popfl          popfl
   
         cld          cld
 #ifdef XEN3  
         movl    %esp, %ebx              # save start of available space          movl    %esp, %ebx              # save start of available space
 #else  
         movl    %esi,%ebx               # save start_info pointer  
 #endif  
         movl    $_RELOC(tmpstk),%esp    # bootstrap stack end location          movl    $_RELOC(tmpstk),%esp    # bootstrap stack end location
   
         /* Clear BSS first so that there are no surprises... */          /* Clear BSS first so that there are no surprises... */
Line 779  start:
Line 766  start:
         addl    $4,%esp          addl    $4,%esp
         call    _C_LABEL(main)          call    _C_LABEL(main)
   
 #if defined(XEN3) && !defined(XEN_COMPAT_030001)  #if defined(XEN) && !defined(XEN_COMPAT_030001)
 /* space for the hypercall call page */  /* space for the hypercall call page */
 #define HYPERCALL_PAGE_OFFSET 0x1000  #define HYPERCALL_PAGE_OFFSET 0x1000
 .org HYPERCALL_PAGE_OFFSET  .org HYPERCALL_PAGE_OFFSET
 ENTRY(hypercall_page)  ENTRY(hypercall_page)
 .skip 0x1000  .skip 0x1000
 #endif /* defined(XEN3) && !defined(XEN_COMPAT_030001) */  #endif /* defined(XEN) && !defined(XEN_COMPAT_030001) */
   
 /*  /*
  * void lgdt_finish(void);   * void lgdt_finish(void);

Legend:
Removed from v.1.82.4.1  
changed lines
  Added in v.1.82.4.2

CVSweb <webmaster@jp.NetBSD.org>