From 2abc251916182ebcfb963c77ea1b4c05c4ed4a74 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Fri, 21 Aug 2020 07:38:09 +1000
Subject: [PATCH] project: Remove gcd_22 assembly optimisation due to incorrect
 functionality.

---
 SMP/libgmp.vcxproj         |   7 +-
 SMP/libgmp.vcxproj.filters |   3 -
 SMP/mpn/x86_64/gcd_22.s    | 156 -------------------------------------
 3 files changed, 1 insertion(+), 165 deletions(-)
 delete mode 100644 SMP/mpn/x86_64/gcd_22.s

diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
index b08f64dd8c..33434b91cf 100644
--- a/SMP/libgmp.vcxproj
+++ b/SMP/libgmp.vcxproj
@@ -357,9 +357,7 @@
     <ClCompile Include="..\mpn\generic\gcdext_1.c" />
     <ClCompile Include="..\mpn\generic\gcdext_lehmer.c" />
     <ClCompile Include="..\mpn\generic\gcd_1.c" />
-    <ClCompile Include="..\mpn\generic\gcd_22.c">
-      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\mpn\generic\gcd_22.c" />
     <ClCompile Include="..\mpn\generic\gcd_subdiv_step.c" />
     <ClCompile Include="..\mpn\generic\get_d.c">
       <ObjectFileName>$(IntDir)\mpn_%(Filename).obj</ObjectFileName>
@@ -1057,9 +1055,6 @@
     <YASM Include="mpn\x86_64\gcd_11.s">
       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
     </YASM>
-    <YASM Include="mpn\x86_64\gcd_22.s">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-    </YASM>
     <YASM Include="mpn\x86_64\hamdist.s">
       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
     </YASM>
diff --git a/SMP/libgmp.vcxproj.filters b/SMP/libgmp.vcxproj.filters
index f2b7b636a5..75e7423f5e 100644
--- a/SMP/libgmp.vcxproj.filters
+++ b/SMP/libgmp.vcxproj.filters
@@ -1915,9 +1915,6 @@
     <YASM Include="mpn\x86_64\gcd_11.s">
       <Filter>Source Files\mpn\x86_64</Filter>
     </YASM>
-    <YASM Include="mpn\x86_64\gcd_22.s">
-      <Filter>Source Files\mpn\x86_64</Filter>
-    </YASM>
   </ItemGroup>
   <ItemGroup>
     <None Include="libgmp.def">
diff --git a/SMP/mpn/x86_64/gcd_22.s b/SMP/mpn/x86_64/gcd_22.s
deleted file mode 100644
index f6ec294a40..0000000000
--- a/SMP/mpn/x86_64/gcd_22.s
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	.text
-	.align	64, 0x90
-	.globl	__gmpn_gcd_22
-	
-__gmpn_gcd_22:
-
-	push	%rdi
-	push	%rsi
-	mov	%rcx, %rdi
-	mov	%rdx, %rsi
-	mov	%r8, %rdx
-	mov	%r9, %rcx
-
-	mov	%rcx, %rax
-
-	.align	16, 0x90
-Ltop:	mov	%rax, %r10
-	sub	%rsi, %r10
-	jz	Llowz		
-	mov	%rdx, %r11
-	sbb	%rdi, %r11
-
-	mov	%rsi, %r8
-	mov	%rdi, %r9
-
-	bsf	%r10, %rcx
-
-	sub	%rax, %rsi
-	sbb	%rdx, %rdi
-
-Lbck:	cmovc	%r10, %rsi		
-	cmovc	%r11, %rdi		
-	cmovc	%r8, %rax		
-	cmovc	%r9, %rdx		
-
-	shrd	%cl, %rdi, %rsi
-	shr	%cl, %rdi
-
-	mov	%rdx, %r11
-	or	%rdi, %r11
-	jnz	Ltop
-
-Lgcd_11:
-	mov	%rax, %rdi
-
-	jmp	__gmpn_gcd_11
-
-Llowz:
-	
-	
-	mov	%rdx, %r10
-	sub	%rdi, %r10
-	je	Lend
-
-	xor	%r11, %r11
-	mov	%rsi, %r8
-	mov	%rdi, %r9
-	bsf	%r10, %rcx
-	mov	%rdi, %rsi
-	xor	%rdi, %rdi
-	sub	%rdx, %rsi
-	jmp	Lbck
-
-Lend:	
-	
-	pop	%rsi
-	pop	%rdi
-	ret
-