Skip to content
Snippets Groups Projects
Commit 78bd54ff authored by psychocrypt's avatar psychocrypt
Browse files

fix naming `cryptonigh` to `cryptonight`

parent 9a2ef075
No related branches found
No related tags found
No related merge requests found
......@@ -448,18 +448,18 @@ endif()
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
# asm optimized monero v8 code
enable_language(ASM_MASM)
set_property(SOURCE "xmrstak/backend/cpu/crypto/asm/cryptonigh_v8_main_loop.asm" PROPERTY ASM_MASM)
set_property(SOURCE "xmrstak/backend/cpu/crypto/asm/cryptonight_v8_main_loop.asm" PROPERTY ASM_MASM)
add_library(xmr-stak-asm
STATIC
"xmrstak/backend/cpu/crypto/asm/cryptonigh_v8_main_loop.asm"
"xmrstak/backend/cpu/crypto/asm/cryptonight_v8_main_loop.asm"
)
else()
# asm optimized monero v8 code
enable_language(ASM)
set_property(SOURCE "xmrstak/backend/cpu/crypto/asm/cryptonigh_v8_main_loop.S" PROPERTY C)
set_property(SOURCE "xmrstak/backend/cpu/crypto/asm/cryptonight_v8_main_loop.S" PROPERTY C)
add_library(xmr-stak-asm
STATIC
"xmrstak/backend/cpu/crypto/asm/cryptonigh_v8_main_loop.S"
"xmrstak/backend/cpu/crypto/asm/cryptonight_v8_main_loop.S"
)
endif()
......
_TEXT_CNV8_MAINLOOP SEGMENT PAGE READ EXECUTE
PUBLIC cryptonigh_v8_mainloop_ivybridge_asm
PUBLIC cryptonigh_v8_mainloop_ryzen_asm
ALIGN 8
cryptonigh_v8_mainloop_ivybridge_asm PROC
INCLUDE cryptonigh_v8_main_loop_ivybridge_win64.inc
ret 0
cryptonigh_v8_mainloop_ivybridge_asm ENDP
ALIGN 8
cryptonigh_v8_mainloop_ryzen_asm PROC
INCLUDE cryptonigh_v8_main_loop_ryzen_win64.inc
ret 0
cryptonigh_v8_mainloop_ryzen_asm ENDP
_TEXT_CNV8_MAINLOOP ENDS
END
......@@ -7,21 +7,21 @@
# define FN_PREFIX(fn) fn
.section .text
#endif
.global FN_PREFIX(cryptonigh_v8_mainloop_ivybridge_asm)
.global FN_PREFIX(cryptonigh_v8_mainloop_ryzen_asm)
.global FN_PREFIX(cryptonight_v8_mainloop_ivybridge_asm)
.global FN_PREFIX(cryptonight_v8_mainloop_ryzen_asm)
ALIGN 8
FN_PREFIX(cryptonigh_v8_mainloop_ivybridge_asm):
FN_PREFIX(cryptonight_v8_mainloop_ivybridge_asm):
sub rsp, 48
mov rcx, rdi
#include "cryptonigh_v8_main_loop_ivybridge_linux.inc"
#include "cryptonight_v8_main_loop_ivybridge_linux.inc"
add rsp, 48
ret 0
ALIGN 8
FN_PREFIX(cryptonigh_v8_mainloop_ryzen_asm):
FN_PREFIX(cryptonight_v8_mainloop_ryzen_asm):
sub rsp, 48
mov rcx, rdi
#include "cryptonigh_v8_main_loop_ryzen_linux.inc"
#include "cryptonight_v8_main_loop_ryzen_linux.inc"
add rsp, 48
ret 0
_TEXT_CNV8_MAINLOOP SEGMENT PAGE READ EXECUTE
PUBLIC cryptonight_v8_mainloop_ivybridge_asm
PUBLIC cryptonight_v8_mainloop_ryzen_asm
ALIGN 8
cryptonight_v8_mainloop_ivybridge_asm PROC
INCLUDE cryptonight_v8_main_loop_ivybridge_win64.inc
ret 0
cryptonight_v8_mainloop_ivybridge_asm ENDP
ALIGN 8
cryptonight_v8_mainloop_ryzen_asm PROC
INCLUDE cryptonight_v8_main_loop_ryzen_win64.inc
ret 0
cryptonight_v8_mainloop_ryzen_asm ENDP
_TEXT_CNV8_MAINLOOP ENDS
END
......@@ -923,8 +923,8 @@ struct Cryptonight_hash<5>
}
};
extern "C" void cryptonigh_v8_mainloop_ivybridge_asm(cryptonight_ctx* ctx0);
extern "C" void cryptonigh_v8_mainloop_ryzen_asm(cryptonight_ctx* ctx0);
extern "C" void cryptonight_v8_mainloop_ivybridge_asm(cryptonight_ctx* ctx0);
extern "C" void cryptonight_v8_mainloop_ryzen_asm(cryptonight_ctx* ctx0);
template<xmrstak_algo ALGO, int asm_version>
void cryptonight_hash_v2_asm(const void* input, size_t len, void* output, cryptonight_ctx** ctx)
......@@ -935,9 +935,9 @@ void cryptonight_hash_v2_asm(const void* input, size_t len, void* output, crypto
cn_explode_scratchpad<MEM, false, false, ALGO>((__m128i*)ctx[0]->hash_state, (__m128i*)ctx[0]->long_state);
if (asm_version == 1)
cryptonigh_v8_mainloop_ivybridge_asm(ctx[0]);
cryptonight_v8_mainloop_ivybridge_asm(ctx[0]);
else
cryptonigh_v8_mainloop_ryzen_asm(ctx[0]);
cryptonight_v8_mainloop_ryzen_asm(ctx[0]);
cn_implode_scratchpad<MEM, false, false, ALGO>((__m128i*)ctx[0]->long_state, (__m128i*)ctx[0]->hash_state);
keccakf((uint64_t*)ctx[0]->hash_state, 24);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment