Unified ASM functions signature

2019-03-13 22:00:44 +01:00 · 2019-03-13 22:00:44 +01:00 · 1bb8f77b52
commit 1bb8f77b52
parent 5d9ebb0b91
30 changed files with 121 additions and 55 deletions
--- a/src/crypto/asm/CryptonightR_soft_aes_template.inc
+++ b/src/crypto/asm/CryptonightR_soft_aes_template.inc
@ -6,6 +6,8 @@ PUBLIC FN_PREFIX(CryptonightR_soft_aes_template_end)

 ALIGN(64)
 FN_PREFIX(CryptonightR_soft_aes_template_part1):
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/CryptonightR_soft_aes_template_win.inc
+++ b/src/crypto/asm/CryptonightR_soft_aes_template_win.inc
@ -6,6 +6,8 @@ PUBLIC CryptonightR_soft_aes_template_end

 ALIGN(64)
 CryptonightR_soft_aes_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/CryptonightR_template.inc
+++ b/src/crypto/asm/CryptonightR_template.inc
@ -12,6 +12,8 @@ PUBLIC FN_PREFIX(CryptonightR_template_double_end)

 ALIGN(64)
 FN_PREFIX(CryptonightR_template_part1):
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -183,6 +185,9 @@ FN_PREFIX(CryptonightR_template_end):

 ALIGN(64)
 FN_PREFIX(CryptonightR_template_double_part1):
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/CryptonightR_template_win.inc
+++ b/src/crypto/asm/CryptonightR_template_win.inc
@ -12,6 +12,8 @@ PUBLIC CryptonightR_template_double_end

 ALIGN(64)
 CryptonightR_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -183,6 +185,9 @@ CryptonightR_template_end:

 ALIGN(64)
 CryptonightR_template_double_part1:
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/CryptonightWOW_soft_aes_template.inc
+++ b/src/crypto/asm/CryptonightWOW_soft_aes_template.inc
@ -6,6 +6,8 @@ PUBLIC FN_PREFIX(CryptonightWOW_soft_aes_template_end)

 ALIGN(64)
 FN_PREFIX(CryptonightWOW_soft_aes_template_part1):
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/CryptonightWOW_soft_aes_template_win.inc
+++ b/src/crypto/asm/CryptonightWOW_soft_aes_template_win.inc
@ -6,6 +6,8 @@ PUBLIC CryptonightWOW_soft_aes_template_end

 ALIGN(64)
 CryptonightWOW_soft_aes_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/CryptonightWOW_template.inc
+++ b/src/crypto/asm/CryptonightWOW_template.inc
@ -12,6 +12,8 @@ PUBLIC FN_PREFIX(CryptonightWOW_template_double_end)

 ALIGN(64)
 FN_PREFIX(CryptonightWOW_template_part1):
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -165,6 +167,9 @@ FN_PREFIX(CryptonightWOW_template_end):

 ALIGN(64)
 FN_PREFIX(CryptonightWOW_template_double_part1):
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/CryptonightWOW_template_win.inc
+++ b/src/crypto/asm/CryptonightWOW_template_win.inc
@ -12,6 +12,8 @@ PUBLIC CryptonightWOW_template_double_end

 ALIGN(64)
 CryptonightWOW_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -165,6 +167,9 @@ CryptonightWOW_template_end:

 ALIGN(64)
 CryptonightWOW_template_double_part1:
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/cn2/cnv2_double_main_loop_sandybridge.inc
+++ b/src/crypto/asm/cn2/cnv2_double_main_loop_sandybridge.inc
@ -1,3 +1,6 @@
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	rax, rsp
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/cn2/cnv2_main_loop_bulldozer.inc
+++ b/src/crypto/asm/cn2/cnv2_main_loop_bulldozer.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
--- a/src/crypto/asm/cn2/cnv2_main_loop_ivybridge.inc
+++ b/src/crypto/asm/cn2/cnv2_main_loop_ivybridge.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	 QWORD PTR [rsp+24], rbx
 	push	 rbp
 	push	 rsi
--- a/src/crypto/asm/cn2/cnv2_main_loop_ryzen.inc
+++ b/src/crypto/asm/cn2/cnv2_main_loop_ryzen.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
--- a/src/crypto/asm/cn2/cnv2_rwz_double_main_loop.inc
+++ b/src/crypto/asm/cn2/cnv2_rwz_double_main_loop.inc
@ -1,3 +1,6 @@
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	rax, rsp
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/cn2/cnv2_rwz_main_loop.inc
+++ b/src/crypto/asm/cn2/cnv2_rwz_main_loop.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	 QWORD PTR [rsp+24], rbx
 	push	 rbp
 	push	 rsi
--- a/src/crypto/asm/cn_main_loop.S
+++ b/src/crypto/asm/cn_main_loop.S
@ -49,7 +49,6 @@ ALIGN(64)
 FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
 	sub rsp, 48
 	mov rcx, rdi
-	mov rdx, rsi
 	#include "cn2/cnv2_double_main_loop_sandybridge.inc"
 	add rsp, 48
 	ret 0
@ -68,7 +67,6 @@ ALIGN(64)
 FN_PREFIX(cnv2_rwz_double_mainloop_asm):
 	sub rsp, 48
 	mov rcx, rdi
-	mov rdx, rsi
 	#include "cn2/cnv2_rwz_double_main_loop.inc"
 	add rsp, 48
 	ret 0
--- a/src/crypto/asm/win64/CryptonightR_soft_aes_template_win.inc
+++ b/src/crypto/asm/win64/CryptonightR_soft_aes_template_win.inc
@ -6,6 +6,8 @@ PUBLIC CryptonightR_soft_aes_template_end

 ALIGN(64)
 CryptonightR_soft_aes_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/win64/CryptonightR_template_win.inc
+++ b/src/crypto/asm/win64/CryptonightR_template_win.inc
@ -12,6 +12,8 @@ PUBLIC CryptonightR_template_double_end

 ALIGN(64)
 CryptonightR_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -183,6 +185,9 @@ CryptonightR_template_end:

 ALIGN(64)
 CryptonightR_template_double_part1:
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/win64/CryptonightWOW_soft_aes_template_win.inc
+++ b/src/crypto/asm/win64/CryptonightWOW_soft_aes_template_win.inc
@ -6,6 +6,8 @@ PUBLIC CryptonightWOW_soft_aes_template_end

 ALIGN(64)
 CryptonightWOW_soft_aes_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+8], rcx
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/win64/CryptonightWOW_template_win.inc
+++ b/src/crypto/asm/win64/CryptonightWOW_template_win.inc
@ -12,6 +12,8 @@ PUBLIC CryptonightWOW_template_double_end

 ALIGN(64)
 CryptonightWOW_template_part1:
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
@ -165,6 +167,9 @@ CryptonightWOW_template_end:

 ALIGN(64)
 CryptonightWOW_template_double_part1:
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+24], rbx
 	push	rbp
 	push	rsi
--- a/src/crypto/asm/win64/cn2/cnv2_double_main_loop_sandybridge.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_double_main_loop_sandybridge.inc
@ -1,3 +1,6 @@
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	rax, rsp
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/win64/cn2/cnv2_main_loop_bulldozer.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_main_loop_bulldozer.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
--- a/src/crypto/asm/win64/cn2/cnv2_main_loop_ivybridge.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_main_loop_ivybridge.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	 QWORD PTR [rsp+24], rbx
 	push	 rbp
 	push	 rsi
--- a/src/crypto/asm/win64/cn2/cnv2_main_loop_ryzen.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_main_loop_ryzen.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	QWORD PTR [rsp+16], rbx
 	mov	QWORD PTR [rsp+24], rbp
 	mov	QWORD PTR [rsp+32], rsi
--- a/src/crypto/asm/win64/cn2/cnv2_rwz_double_main_loop.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_rwz_double_main_loop.inc
@ -1,3 +1,6 @@
+	mov	rdx, [rcx+8]
+	mov	rcx, [rcx]
+
 	mov	rax, rsp
 	push	rbx
 	push	rbp
--- a/src/crypto/asm/win64/cn2/cnv2_rwz_main_loop.inc
+++ b/src/crypto/asm/win64/cn2/cnv2_rwz_main_loop.inc
@ -1,3 +1,5 @@
+	mov	rcx, [rcx]
+
 	mov	 QWORD PTR [rsp+24], rbx
 	push	 rbp
 	push	 rsi