 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.71 2013/06/22 15:13:56 uebayasi Exp $	*/
+/*	$NetBSD: locore.S,v 1.72 2013/06/23 03:16:46 uebayasi Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 2007 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -415,27 +415,27 @@ ENTRY(start)
 	popl	%esi
 	popl	%edi
 	subl	$1, %ebx
 	jmp	2b
 :	/* cleanup for overflow case */
 	popl	%eax
 	popl	%esi
 	popl	%edi
 	movl	$RELOC(bootinfo),%ebp
 	movl	%ebp, %edx
 	subl	%ebx, (%edx)		/* correct number of entries */
 :
- 	movl	16(%esp),%eax
+	movl	16(%esp),%eax
 	testl	%eax,%eax
 	jz	1f
 	addl	$KERNBASE_LO,%eax
 : 	movl	$RELOC(esym),%ebp
 	movl	%eax,(%ebp)
 	movl	$KERNBASE_HI,4(%ebp)
 	movl	$RELOC(biosextmem),%ebp
 	movl	(%ebp),%eax
 	testl	%eax,%eax
 	jnz	1f
 	movl	20(%esp),%eax
 	movl	%eax,(%ebp)
 @@ -544,27 +544,27 @@ ENTRY(start)
 	andl	$~PGOFSET,%esi
 	movl	%esi,%edi
 	xorl	%eax,%eax
 	cld
 	movl	$TABLESIZE,%ecx
 	shrl	$2,%ecx
 	rep
 	stosl
 	leal	(PROC0_PTP1_OFF)(%esi), %ebx
 	/*
- 	 * Compute &__data_start - KERNBASE. This can't be > 4G,
+	 * Compute &__data_start - KERNBASE. This can't be > 4G,
 	 * or we can't deal with it anyway, since we can't load it in
 	 * 32 bit mode. So use the bottom 32 bits.
 	 */
 	movl	$RELOC(__data_start),%edx
 	andl	$~PGOFSET,%edx
 	/*
 	 * Skip the first MB.
 	 */
 	movl	$(KERNTEXTOFF_LO - KERNBASE_LO),%eax
 	movl	%eax,%ecx
 	shrl	$(PGSHIFT-3),%ecx	/* ((n >> PGSHIFT) << 3) for # pdes */
 	addl	%ecx,%ebx

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.104 2013/06/22 15:13:55 uebayasi Exp $	*/
+/*	$NetBSD: locore.S,v 1.105 2013/06/23 03:16:46 uebayasi Exp $	*/
 /*
  * Copyright-o-rama!
  */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -119,27 +119,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)locore.s	7.3 (Berkeley) 5/13/91
  */
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.104 2013/06/22 15:13:55 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.105 2013/06/23 03:16:46 uebayasi Exp $");
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiboot.h"
 #include "opt_realmem.h"
 #include "opt_vm86.h"
 #include "opt_xen.h"
 #include "npx.h"
 #include "assym.h"
 #include "lapic.h"
 #include "ioapic.h"
 @@ -582,100 +582,100 @@ try586:	/* Use the `cpuid' instruction.
 #else
 	shll	$PGSHIFT,%eax
 #endif
 	movl	%eax,RELOC(tablesize)
 	/* ensure that nkptp covers bootstrap tables */
 	addl	%esi,%eax
 	addl	$~L2_FRAME,%eax
 	shrl	$L2_SHIFT,%eax
 	incl	%eax
 	cmpl	%eax,RELOC(nkptp)+1*4
 	jnz	1b
- 	/* Clear tables */
+	/* Clear tables */
- 	movl	%esi,%edi
+	movl	%esi,%edi
 	xorl	%eax,%eax
 	cld
- 	movl	RELOC(tablesize),%ecx
+	movl	RELOC(tablesize),%ecx
- 	shrl	$2,%ecx
+	shrl	$2,%ecx
 	rep
 	stosl
- 	leal	(PROC0_PTP1_OFF)(%esi), %ebx
+	leal	(PROC0_PTP1_OFF)(%esi), %ebx
 /*
  * Build initial page tables.
  */
- 	/*
+	/*
- 	 * Compute &__data_start - KERNBASE. This can't be > 4G,
+	 * Compute &__data_start - KERNBASE. This can't be > 4G,
 	 * or we can't deal with it anyway, since we can't load it in
 	 * 32 bit mode. So use the bottom 32 bits.
- 	 */
+	 */
- 	movl	$RELOC(__data_start),%edx
+	movl	$RELOC(__data_start),%edx
 	andl	$~PGOFSET,%edx
- 	/*
+	/*
- 	 * Skip the first MB.
+	 * Skip the first MB.
- 	 */
+	 */
 	movl	$_RELOC(KERNTEXTOFF),%eax
 	movl	%eax,%ecx
 	shrl	$(PGSHIFT-2),%ecx	/* ((n >> PGSHIFT) << 2) for # pdes */
 #ifdef PAE
- 	shll	$1,%ecx			/* pdes are twice larger with PAE */
+	shll	$1,%ecx			/* pdes are twice larger with PAE */
 #endif
- 	addl	%ecx,%ebx
+	addl	%ecx,%ebx
 	/* Map the kernel text read-only. */
 	movl	%edx,%ecx
 	subl	%eax,%ecx
 	shrl	$PGSHIFT,%ecx
 	orl	$(PG_V|PG_KR),%eax
 	fillkpt
 	/* Map the data, BSS, and bootstrap tables read-write. */
 	leal	(PG_V|PG_KW)(%edx),%eax
 	movl	RELOC(tablesize),%ecx
 	addl	%esi,%ecx				# end of tables
 	subl	%edx,%ecx				# subtract end of text
 	shrl	$PGSHIFT,%ecx
 	fillkpt
 	/* Map ISA I/O mem (later atdevbase) */
 	movl	$(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax	# having these bits set
 	movl	$(IOM_SIZE>>PGSHIFT),%ecx		# for this many pte s,
 	fillkpt
 /*
  * Construct a page table directory.
  */
- 	/* Set up top level entries for identity mapping */
+	/* Set up top level entries for identity mapping */
- 	leal	(PROC0_PDIR_OFF)(%esi),%ebx
+	leal	(PROC0_PDIR_OFF)(%esi),%ebx
- 	leal	(PROC0_PTP1_OFF)(%esi),%eax
+	leal	(PROC0_PTP1_OFF)(%esi),%eax
- 	orl	$(PG_V|PG_KW), %eax
+	orl	$(PG_V|PG_KW), %eax
- 	movl	RELOC(nkptp)+1*4,%ecx
+	movl	RELOC(nkptp)+1*4,%ecx
 	fillkpt
- 	/* Set up top level entries for actual kernel mapping */
+	/* Set up top level entries for actual kernel mapping */
- 	leal	(PROC0_PDIR_OFF + L2_SLOT_KERNBASE*PDE_SIZE)(%esi),%ebx
+	leal	(PROC0_PDIR_OFF + L2_SLOT_KERNBASE*PDE_SIZE)(%esi),%ebx
- 	leal	(PROC0_PTP1_OFF)(%esi),%eax
+	leal	(PROC0_PTP1_OFF)(%esi),%eax
- 	orl	$(PG_V|PG_KW), %eax
+	orl	$(PG_V|PG_KW), %eax
- 	movl	RELOC(nkptp)+1*4,%ecx
+	movl	RELOC(nkptp)+1*4,%ecx
 	fillkpt
 	/* Install a PDE recursively mapping page directory as a page table! */
- 	leal	(PROC0_PDIR_OFF + PDIR_SLOT_PTE*PDE_SIZE)(%esi),%ebx
+	leal	(PROC0_PDIR_OFF + PDIR_SLOT_PTE*PDE_SIZE)(%esi),%ebx
- 	leal	(PROC0_PDIR_OFF)(%esi),%eax
+	leal	(PROC0_PDIR_OFF)(%esi),%eax
- 	orl	$(PG_V|PG_KW),%eax
+	orl	$(PG_V|PG_KW),%eax
 	movl	$PDP_SIZE,%ecx
 	fillkpt
 #ifdef PAE
 	/* Fill in proc0 L3 page with entries pointing to the page dirs */
 	leal	(PROC0_L3_OFF)(%esi),%ebx
 	leal	(PROC0_PDIR_OFF)(%esi),%eax
 	orl	$(PG_V),%eax
 	movl	$PDP_SIZE,%ecx
 	fillkpt
 	/* Enable PAE mode */
 	movl	%cr4,%eax
 @@ -684,78 +684,78 @@ try586:	/* Use the `cpuid' instruction.
 #endif
 	/* Save phys. addr of PDP, for libkvm. */
 	leal	(PROC0_PDIR_OFF)(%esi),%eax
 	movl	%eax,RELOC(PDPpaddr)
 	/*
 	 * Startup checklist:
 	 * 1. Load %cr3 with pointer to PDIR (or L3 PD page for PAE).
 	 */
 	movl	%esi,%eax		# phys address of ptd in proc 0
 	movl	%eax,%cr3		# load ptd addr into mmu
- 	/*
+	/*
- 	 * 2. Enable paging and the rest of it.
+	 * 2. Enable paging and the rest of it.
- 	 */
+	 */
 	movl	%cr0,%eax		# get control word
 					# enable paging & NPX emulation
 	orl	$(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP|CR0_WP|CR0_AM),%eax
 	movl	%eax,%cr0		# and page NOW!
 	pushl	$begin			# jump to high mem
 	ret
 begin:
- 	/*
+	/*
- 	 * We have arrived.
+	 * We have arrived.
- 	 * There's no need anymore for the identity mapping in low
+	 * There's no need anymore for the identity mapping in low
- 	 * memory, remove it.
+	 * memory, remove it.
- 	 */
+	 */
- 	movl	_C_LABEL(nkptp)+1*4,%ecx
+	movl	_C_LABEL(nkptp)+1*4,%ecx
- 	leal	(PROC0_PDIR_OFF)(%esi),%ebx	# old, phys address of PDIR
+	leal	(PROC0_PDIR_OFF)(%esi),%ebx	# old, phys address of PDIR
- 	addl	$(KERNBASE), %ebx		# new, virtual address of PDIR
+	addl	$(KERNBASE), %ebx		# new, virtual address of PDIR
 :	movl	$0,(PDE_SIZE-4)(%ebx)		# Upper bits (for PAE)
 	movl	$0,(%ebx)
- 	addl	$PDE_SIZE,%ebx
+	addl	$PDE_SIZE,%ebx
 	loop	1b
 	/* Relocate atdevbase. */
 	movl	$KERNBASE,%edx
 	addl	_C_LABEL(tablesize),%edx
 	addl	%esi,%edx
 	movl	%edx,_C_LABEL(atdevbase)
 	/* Set up bootstrap stack. */
- 	leal	(PROC0_STK_OFF+KERNBASE)(%esi),%eax
+	leal	(PROC0_STK_OFF+KERNBASE)(%esi),%eax
 	movl	%eax,_C_LABEL(lwp0uarea)
 	leal	(KSTACK_SIZE-FRAMESIZE)(%eax),%esp
 	movl	%esi,(KSTACK_SIZE+PCB_CR3)(%eax)	# pcb->pcb_cr3
 	xorl	%ebp,%ebp               # mark end of frames
 #if defined(MULTIBOOT)
 	/* It is now safe to parse the Multiboot information structure
 	 * we saved before from C code.  Note that we cannot delay its
 	 * parsing any more because initgdt (called below) needs to make
 	 * use of this information. */
 	call	_C_LABEL(multiboot_post_reloc)
 #endif
 	subl	$NGDT*8, %esp		# space for temporary gdt
 	pushl	%esp
 	call	_C_LABEL(initgdt)
 	addl	$4,%esp
- 	movl	_C_LABEL(tablesize),%eax
+	movl	_C_LABEL(tablesize),%eax
 	addl	%esi,%eax		# skip past stack and page tables
 #ifdef PAE
 	pushl	$0	# init386() expects a 64 bits paddr_t with PAE
 #endif
 	pushl	%eax
 	call	_C_LABEL(init386)	# wire 386 chip for unix operation
 	addl	$PDE_SIZE,%esp		# pop paddr_t
 	addl	$NGDT*8,%esp		# pop temporary gdt
 #ifdef SAFARI_FIFO_HACK
 	movb	$5,%al
 	movw	$0x37b,%dx
 @@ -774,35 +774,35 @@ begin:
 	outb	%al,%dx
 #endif /* SAFARI_FIFO_HACK */
 	call 	_C_LABEL(main)
 #else /* XEN */
 	/* First, reset the PSL. */
 	pushl	$PSL_MBO
 	popfl
 	cld
 	movl	%esp, %ebx		# save start of available space
 	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... */
 	xorl	%eax,%eax
 	movl	$RELOC(__bss_start),%edi
 	movl	$RELOC(_end),%ecx
 	subl	%edi,%ecx
 	rep stosb
 	/* Copy the necessary stuff from start_info structure. */
-        /* We need to copy shared_info early, so that sti/cli work */
+	/* We need to copy shared_info early, so that sti/cli work */
 	movl	$RELOC(start_info_union),%edi
 	movl	$128,%ecx
 	rep movsl
 	/* Clear segment registers; always null in proc0. */
 	xorl	%eax,%eax
 	movw	%ax,%fs
 	movw	%ax,%gs
 	decl	%eax
 	movl	%eax,RELOC(cpuid_level)
 	xorl	%eax,%eax
 	cpuid