From f545fa52cb928b915fa76de69320eb1c794487c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20Gr=C3=A4f?= Date: Fri, 4 Jan 2019 19:45:16 +0100 Subject: [PATCH] Fixed windows asm files --- src/crypto/asm/win/cn_main_loop.asm | 40 +++++++++++------------ src/crypto/asm/win/cn_main_loop_win_gcc.S | 30 ++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/crypto/asm/win/cn_main_loop.asm b/src/crypto/asm/win/cn_main_loop.asm index 81ed5691..a7127590 100644 --- a/src/crypto/asm/win/cn_main_loop.asm +++ b/src/crypto/asm/win/cn_main_loop.asm @@ -6,17 +6,17 @@ PUBLIC cnv2_mainloop_ivybridge_asm PUBLIC cnv2_mainloop_ryzen_asm PUBLIC cnv2_mainloop_bulldozer_asm PUBLIC cnv2_double_mainloop_sandybridge_asm -PUBLIC cn_fast2_mainloop_ivybridge_asm -PUBLIC cn_fast2_mainloop_ryzen_asm -PUBLIC cn_fast2_mainloop_bulldozer_asm -PUBLIC cn_fast2_double_mainloop_sandybridge_asm +PUBLIC cn_fastv2mainloop_ivybridge_asm +PUBLIC cn_fastv2mainloop_ryzen_asm +PUBLIC cn_fastv2mainloop_bulldozer_asm +PUBLIC cn_fastv2double_mainloop_sandybridge_asm PUBLIC cn_liteupx_mainloop_sandybridge_asm PUBLIC cnv1_mainloop_soft_aes_sandybridge_asm PUBLIC cn_litev1_mainloop_soft_aes_sandybridge_asm PUBLIC cn_fast_mainloop_soft_aes_sandybridge_asm PUBLIC cnv2_mainloop_soft_aes_sandybridge_asm -PUBLIC cn_fast2_mainloop_soft_aes_sandybridge_asm +PUBLIC cn_fastv2mainloop_soft_aes_sandybridge_asm PUBLIC cn_liteupx_mainloop_soft_aes_sandybridge_asm ALIGN 64 @@ -62,28 +62,28 @@ cnv2_double_mainloop_sandybridge_asm PROC cnv2_double_mainloop_sandybridge_asm ENDP ALIGN 64 -cn_fast2_mainloop_ivybridge_asm PROC - INCLUDE cn_fast2_main_loop_ivybridge.inc +cn_fastv2mainloop_ivybridge_asm PROC + INCLUDE cn_fastv2main_loop_ivybridge.inc ret 0 -cn_fast2_mainloop_ivybridge_asm ENDP +cn_fastv2mainloop_ivybridge_asm ENDP ALIGN 64 -cn_fast2_mainloop_ryzen_asm PROC - INCLUDE cn_fast2_main_loop_ryzen.inc +cn_fastv2mainloop_ryzen_asm PROC + INCLUDE cn_fastv2main_loop_ryzen.inc ret 0 -cn_fast2_mainloop_ryzen_asm ENDP +cn_fastv2mainloop_ryzen_asm ENDP ALIGN 64 -cn_fast2_mainloop_bulldozer_asm PROC - INCLUDE cn_fast2_main_loop_bulldozer.inc +cn_fastv2mainloop_bulldozer_asm PROC + INCLUDE cn_fastv2main_loop_bulldozer.inc ret 0 -cn_fast2_mainloop_bulldozer_asm ENDP +cn_fastv2mainloop_bulldozer_asm ENDP ALIGN 64 -cn_fast2_double_mainloop_sandybridge_asm PROC - INCLUDE cn_fast2_double_main_loop_sandybridge.inc +cn_fastv2double_mainloop_sandybridge_asm PROC + INCLUDE cn_fastv2double_main_loop_sandybridge.inc ret 0 -cn_fast2_double_mainloop_sandybridge_asm ENDP +cn_fastv2double_mainloop_sandybridge_asm ENDP ALIGN 64 cn_liteupx_mainloop_sandybridge_asm PROC @@ -116,10 +116,10 @@ cnv2_mainloop_soft_aes_sandybridge_asm PROC cnv2_mainloop_soft_aes_sandybridge_asm ENDP ALIGN 64 -cn_fast2_mainloop_soft_aes_sandybridge_asm PROC - INCLUDE cn_fast2_mainloop_soft_aes_sandybridge.inc +cn_fastv2mainloop_soft_aes_sandybridge_asm PROC + INCLUDE cn_fastv2mainloop_soft_aes_sandybridge.inc ret 0 -cn_fast2_mainloop_soft_aes_sandybridge_asm ENDP +cn_fastv2mainloop_soft_aes_sandybridge_asm ENDP _TEXT_CN_MAINLOOP ENDS END diff --git a/src/crypto/asm/win/cn_main_loop_win_gcc.S b/src/crypto/asm/win/cn_main_loop_win_gcc.S index db3e6c30..1b815ccc 100644 --- a/src/crypto/asm/win/cn_main_loop_win_gcc.S +++ b/src/crypto/asm/win/cn_main_loop_win_gcc.S @@ -10,17 +10,17 @@ .global FN_PREFIX(cnv2_mainloop_ryzen_asm) .global FN_PREFIX(cnv2_mainloop_bulldozer_asm) .global FN_PREFIX(cnv2_double_mainloop_sandybridge_asm) -.global FN_PREFIX(cn_fast2_mainloop_ivybridge_asm) -.global FN_PREFIX(cn_fast2_mainloop_ryzen_asm) -.global FN_PREFIX(cn_fast2_mainloop_bulldozer_asm) -.global FN_PREFIX(cn_fast2_double_mainloop_sandybridge_asm) +.global FN_PREFIX(cn_fastv2_mainloop_ivybridge_asm) +.global FN_PREFIX(cn_fastv2_mainloop_ryzen_asm) +.global FN_PREFIX(cn_fastv2_mainloop_bulldozer_asm) +.global FN_PREFIX(cn_fastv2_double_mainloop_sandybridge_asm) .global FN_PREFIX(cn_liteupx_mainloop_sandybridge_asm) .global FN_PREFIX(cnv1_mainloop_soft_aes_sandybridge_asm) .global FN_PREFIX(cn_litev1_mainloop_soft_aes_sandybridge_asm) .global FN_PREFIX(cn_fast_mainloop_soft_aes_sandybridge_asm) .global FN_PREFIX(cnv2_mainloop_soft_aes_sandybridge_asm) -.global FN_PREFIX(cn_fast2_mainloop_soft_aes_sandybridge_asm) +.global FN_PREFIX(cn_fastv2_mainloop_soft_aes_sandybridge_asm) .global FN_PREFIX(cn_liteupx_mainloop_soft_aes_sandybridge_asm) ALIGN 64 @@ -59,23 +59,23 @@ FN_PREFIX(cnv2_double_mainloop_sandybridge_asm): ret 0 ALIGN 64 -FN_PREFIX(cn_fast2_mainloop_ivybridge_asm): - #include "../cn_fast2_main_loop_ivybridge.inc" +FN_PREFIX(cn_fastv2_mainloop_ivybridge_asm): + #include "../cn_fastv2_main_loop_ivybridge.inc" ret 0 ALIGN 64 -FN_PREFIX(cn_fast2_mainloop_ryzen_asm): - #include "../cn_fast2_main_loop_ryzen.inc" +FN_PREFIX(cn_fastv2_mainloop_ryzen_asm): + #include "../cn_fastv2_main_loop_ryzen.inc" ret 0 ALIGN 64 -FN_PREFIX(cn_fast2_mainloop_bulldozer_asm): - #include "../cn_fast2_main_loop_bulldozer.inc" +FN_PREFIX(cn_fastv2_mainloop_bulldozer_asm): + #include "../cn_fastv2_main_loop_bulldozer.inc" ret 0 ALIGN 64 -FN_PREFIX(cn_fast2_double_mainloop_sandybridge_asm): - #include "../cn_fast2_double_main_loop_sandybridge.inc" +FN_PREFIX(cn_fastv2_double_mainloop_sandybridge_asm): + #include "../cn_fastv2_double_main_loop_sandybridge.inc" ret 0 ALIGN 64 @@ -104,8 +104,8 @@ FN_PREFIX(cnv2_mainloop_soft_aes_sandybridge_asm): ret 0 ALIGN 64 -FN_PREFIX(cn_fast2_mainloop_soft_aes_sandybridge_asm): - #include "../cn_fast2_mainloop_soft_aes_sandybridge.inc" +FN_PREFIX(cn_fastv2_mainloop_soft_aes_sandybridge_asm): + #include "../cn_fastv2_mainloop_soft_aes_sandybridge.inc" ret 0