Merge pull request #1583 from martin-frbg/issue1575

martin-frbg · web-flow · commit 8562d5787ae3 · 2018-05-31T21:55:26.000+02:00
Handle INCX=0,INCY=0 case
diff --git a/kernel/x86/KERNEL.NEHALEM b/kernel/x86/KERNEL.NEHALEM
@@ -1,3 +1 @@
 include $(KERNELDIR)/KERNEL.PENRYN
-SSWAPKERNEL  = ../arm/swap.c
-DSWAPKERNEL  = ../arm/swap.c
diff --git a/kernel/x86/swap.S b/kernel/x86/swap.S
@@ -138,6 +138,14 @@
 /* INCX != 1 or INCY != 1 */
 
 .L14:
+	cmpl	$0, %ebx
+	jne	.L141
+	cmpl	$0, %ecx
+	jne	.L141
+/* INCX == 0 and INCY == 0 */	
+	jmp	.L27
+
+.L141:	
 	movl	%edx, %eax
 	sarl	$2,   %eax
 	jle	.L28

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`	`1`	`include $(KERNELDIR)/KERNEL.PENRYN`
`2`		`-SSWAPKERNEL = ../arm/swap.c`
`3`		`-DSWAPKERNEL = ../arm/swap.c`