[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.100 and 1.101

version 1.100, 2012/06/16 17:30:19 version 1.101, 2012/06/27 00:37:08
Line 169  __KERNEL_RCSID(0, "$NetBSD$");
Line 169  __KERNEL_RCSID(0, "$NetBSD$");
  */   */
 .section __xen_guest  .section __xen_guest
         .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)  
         .ascii  ",VIRT_BASE=0xc0000000" /* KERNBASE */          .ascii  ",VIRT_BASE=0xc0000000" /* KERNBASE */
         .ascii  ",ELF_PADDR_OFFSET=0xc0000000" /* KERNBASE */          .ascii  ",ELF_PADDR_OFFSET=0xc0000000" /* KERNBASE */
 #else  
         .ascii  ",VIRT_BASE=0xc0100000" /* KERNTEXTOFF */  
         .ascii  ",ELF_PADDR_OFFSET=0xc0100000" /* KERNTEXTOFF */  
 #endif  
         .ascii  ",VIRT_ENTRY=0xc0100000" /* KERNTEXTOFF */          .ascii  ",VIRT_ENTRY=0xc0100000" /* KERNTEXTOFF */
 #if !defined(XEN_COMPAT_030001)  
         .ascii  ",HYPERCALL_PAGE=0x00000101"          .ascii  ",HYPERCALL_PAGE=0x00000101"
                 /* (???+HYPERCALL_PAGE_OFFSET)/PAGE_SIZE) */                  /* (???+HYPERCALL_PAGE_OFFSET)/PAGE_SIZE) */
 #endif  
 #ifdef PAE  #ifdef PAE
         .ascii  ",PAE=yes[extended-cr3]"          .ascii  ",PAE=yes[extended-cr3]"
 #endif  #endif
Line 824  start:
Line 817  start:
         addl    $PDE_SIZE,%esp          # pop paddr_t          addl    $PDE_SIZE,%esp          # pop paddr_t
         call    _C_LABEL(main)          call    _C_LABEL(main)
   
 #if defined(XEN) && !defined(XEN_COMPAT_030001)  #if defined(XEN)
 /* 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(XEN) && !defined(XEN_COMPAT_030001) */  #endif /* defined(XEN) */
   
 /*  /*
  * void lgdt_finish(void);   * void lgdt_finish(void);

Legend:
Removed from v.1.100  
changed lines
  Added in v.1.101

CVSweb <webmaster@jp.NetBSD.org>