Merge branch 'develop' into sandybridge

2012-05-25 23:16:44 +08:00
parent 910338f071 5199809bba
commit a53c6e2440
31 changed files with 5810 additions and 189 deletions
--- a/kernel/x86/amax_sse.S
+++ b/kernel/x86/amax_sse.S
@@ -495,7 +495,6 @@
 	ALIGN_4
 	
 .L999:
-	RESTOREREGISTERS

 	subl	$8, %esp
 	movss	%xmm0, (%esp)
--- a/kernel/x86/scal_sse2.S
+++ b/kernel/x86/scal_sse2.S
@@ -76,7 +76,8 @@
 	xorps	%xmm1, %xmm1
 	comisd	%xmm0, %xmm1
 	jne	.L100		# Alpha != ZERO
-
+        jp      .L100           # For Alpha = NaN
+	
 /* Alpha == ZERO */
 	cmpl	$SIZE, INCX
 	jne	.L50
--- a/kernel/x86_64/scal_sse2.S
+++ b/kernel/x86_64/scal_sse2.S
@@ -74,7 +74,8 @@
 	xorps	%xmm1, %xmm1
 	comisd	%xmm0, %xmm1
 	jne	.L100		# Alpha != ZERO
-
+	jp	.L100		# For Alpha = NaN
+	
 /* Alpha == ZERO */
 	cmpq	$SIZE, INCX
 	jne	.L50