From d1b7be14aa9b57ca4df9c00cdb4611974729b3be Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 31 May 2018 12:52:04 +0200
Subject: [PATCH] Handle INCX=0,INCY=0 case

Fixes #1575 (sswap/dswap failing the swap utest on x86) as suggested by atsampson.
---
 kernel/x86/swap.S | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kernel/x86/swap.S b/kernel/x86/swap.S
index 54b00b3..d3cf049 100644
--- 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
-- 
2.7.4