Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.75
retrieving revision 1.78.4.3
diff -u -p -r1.75 -r1.78.4.3
--- src/sys/arch/i386/i386/locore.S	2008/06/01 18:37:12	1.75
+++ src/sys/arch/i386/i386/locore.S	2009/04/04 17:39:09	1.78.4.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.75 2008/06/01 18:37:12 ad Exp $	*/
+/*	$NetBSD: locore.S,v 1.78.4.3 2009/04/04 17:39:09 snj Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -134,10 +134,11 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.75 2008/06/01 18:37:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.78.4.3 2009/04/04 17:39:09 snj Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
+#include "opt_multiboot.h"
 #include "opt_realmem.h"
 #include "opt_vm86.h"
 #include "opt_xen.h"
@@ -648,7 +649,7 @@ try586:	/* Use the `cpuid' instruction. 
 	movl	%cr0,%eax		# get control word
 					# enable paging & NPX emulation
 	orl	$(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_EM|CR0_MP),%eax
-	movl	%eax,%cr0		# and let's page NOW!
+	movl	%eax,%cr0		# and page NOW!
 
 	pushl	$begin			# jump to high mem
 	ret
@@ -909,7 +910,7 @@ ENTRY(dumpsys)
 END(dumpsys)
 
 /*
- * struct lwp *cpu_switchto(struct lwp *oldlwp, struct newlwp,
+ * struct lwp *cpu_switchto(struct lwp *oldlwp, struct *newlwp,
  *			    bool returning)
  *
  *	1. if (oldlwp != NULL), save its context.
@@ -1007,15 +1008,14 @@ ENTRY(cpu_switchto)
 2:
 #ifndef XEN
 	movl	$IPL_IPI,CPUVAR(ILEVEL)
-	movl	PCB_CR0(%ebx),%ecx
+	movl	PCB_CR0(%ebx),%ecx		/* has CR0_TS clear */
 	movl	%cr0,%edx
 
 	/*
 	 * If our floating point registers are on a different CPU,
 	 * set CR0_TS so we'll trap rather than reuse bogus state.
 	 */
-	movl	PCB_FPCPU(%ebx),%eax
-	cmpl	CPUVAR(SELF),%eax
+	cmpl	CPUVAR(FPCURLWP),%edi
 	je	3f
 	orl	$CR0_TS,%ecx
 
@@ -1078,8 +1078,10 @@ END(savectx)
  * Old call gate entry for syscall
  */
 IDTVEC(osyscall)
+	cli			# must be first instruction
 	pushfl			# set eflags in trap frame
 	popl	8(%esp)
+	orl	$PSL_I,(%esp)	# re-enable ints on return to user
 	pushl	$7		# size of instruction for restart
 	jmp	syscall1
 IDTVEC_END(osyscall)
@@ -1094,6 +1096,7 @@ IDTVEC(syscall)
 syscall1:
 	pushl	$T_ASTFLT	# trap # for doing ASTs
 	INTRENTRY
+	STI(%eax)
 #ifdef DIAGNOSTIC
 	movl	CPUVAR(ILEVEL),%ebx
 	testl	%ebx,%ebx
@@ -1227,18 +1230,21 @@ END(npx586bug1)
 #endif /* NNPX > 0 */
 
 /*
- * void sse2_zero_page(void *pg)
+ * void sse2_idlezero_page(void *pg)
  *
- * Zero a page without polluting the cache.
+ * Zero a page without polluting the cache.  Preemption must be
+ * disabled by the caller. Abort if a preemption is pending.
  */
-ENTRY(sse2_zero_page)
+ENTRY(sse2_idlezero_page)
 	pushl	%ebp
 	movl	%esp,%ebp
 	movl	8(%esp), %edx
-	movl	$(PAGE_SIZE/64), %ecx
+	movl	$(PAGE_SIZE/32), %ecx
 	xorl	%eax, %eax
 	.align	16
 1:
+	testl	$RESCHED_KPREEMPT, CPUVAR(RESCHED)
+	jnz	2f
 	movnti	%eax, 0(%edx)
 	movnti	%eax, 4(%edx)
 	movnti	%eax, 8(%edx)
@@ -1247,60 +1253,15 @@ ENTRY(sse2_zero_page)
 	movnti	%eax, 20(%edx)
 	movnti	%eax, 24(%edx)
 	movnti	%eax, 28(%edx)
-	movnti	%eax, 32(%edx)
-	movnti	%eax, 36(%edx)
-	movnti	%eax, 40(%edx)
-	movnti	%eax, 44(%edx)
-	movnti	%eax, 48(%edx)
-	movnti	%eax, 52(%edx)
-	movnti	%eax, 56(%edx)
-	movnti	%eax, 60(%edx)
-	addl	$64, %edx
+	addl	$32, %edx
 	decl	%ecx
 	jnz	1b
 	sfence
+	incl	%eax
 	pop	%ebp
 	ret
-END(sse2_zero_page)
-
-/*
- * void sse2_copy_page(void *src, void *dst)
- *
- * Copy a page without polluting the cache.
- */
-ENTRY(sse2_copy_page)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp), %esi
-	movl	24(%esp), %edi
-	xorl	%ebp, %ebp
-	.align	16
-1:
-	movl	0(%esi,%ebp), %eax
-	movl	4(%esi,%ebp), %ebx
-	movl	8(%esi,%ebp), %ecx
-	movl	12(%esi,%ebp), %edx
-	movnti	%eax, 0(%edi,%ebp)
-	movnti	%ebx, 4(%edi,%ebp)
-	movnti	%ecx, 8(%edi,%ebp)
-	movnti	%edx, 12(%edi,%ebp)
-	movl	16(%esi,%ebp), %eax
-	movl	20(%esi,%ebp), %ebx
-	movl	24(%esi,%ebp), %ecx
-	movl	28(%esi,%ebp), %edx
-	movnti	%eax, 16(%edi,%ebp)
-	movnti	%ebx, 20(%edi,%ebp)
-	movnti	%ecx, 24(%edi,%ebp)
-	movnti	%edx, 28(%edi,%ebp)
-	addl	$32, %ebp
-	cmpl	$PAGE_SIZE, %ebp
-	jne	1b
+2:
 	sfence
-	popl	%edi
-	popl	%esi
-	popl	%ebx
 	popl	%ebp
 	ret
-END(sse2_copy_page)
+END(sse2_idlezero_page)