Fix compile issues

Bendr0id · Nov 18, 2018 · 8253006 · 8253006
1 parent 7167d6f
commit 8253006
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/Options.cpp b/src/Options.cpp
@@ -73,7 +73,7 @@ Options:\n"
   -k, --keepalive                       send keepalived for prevent timeout (need pool support)\n\
   -r, --retries=N                       number of times to retry before switch to backup server (default: 5)\n\
   -R, --retry-pause=N                   time to pause between retries (default: 5)\n\
-      --pow-variant=V                   specificy the PoW variat to use: -> 'auto' (default), '0' (v0), '1' (v1, aka cnv7), '2' (v2, aka cnv8), 'ipbc' (tube), 'xao', 'xtl' (including autodetect for v5)\n\
+      --pow-variant=V                   specificy the PoW variat to use: -> 'auto' (default), '0' (v0), '1' (v1, aka cnv7), '2' (v2, aka cnv8), 'ipbc' (tube), 'xao', 'xtl' (including autodetect for v5), 'rto', 'xfh'\n\
                                         for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations\n\
       --asm-optimization=V              specificy the ASM optimization to use: -> 'auto' (default), 'intel', 'ryzen', 'bulldozer', 'off' \n\
       --multihash-factor=N              number of hash blocks to process at a time (don't set or 0 enables automatic selection of optimal number of hash blocks)\n\

diff --git a/src/config.json b/src/config.json
@@ -4,7 +4,7 @@
     "threads": 0,                               // number of miner threads (not set or 0 enables automatic selection of optimal thread count)
     "multihash-factor": 0,                      // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks)
     "multihash-thread-mask" : null,             // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads)
-    "pow-variant" : "auto",                     // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), 2 (v2, aka monerov8), tube (ipbc), alloy (xao), xtl (including autodetect for v5), msr, xhv, rto
+    "pow-variant" : "auto",                     // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), 2 (v2, aka monerov8), tube (ipbc), alloy (xao), xtl (including autodetect for v5), msr, xhv, rto, xfh
                                                 // for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations
     "asm-optimization" : "auto",                // specificy the ASM optimization to use: -> auto (default), intel, ryzen, bulldozer, off
     "background": false,                        // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead)

diff --git a/src/crypto/asm/cn_fast_mainloop_sandybridge.inc b/src/crypto/asm/cn_fast_mainloop_sandybridge.inc
@@ -64,7 +64,7 @@ cn_fast_mainloop_sandybridge:
 	movdqu	xmm2, XMMWORD PTR [rdx+rsi]
 	xor	rdi, r11
 	dec	ebp
-	jne	cnv1_mainloop_sandybridge
+	jne	cn_fast_mainloop_sandybridge
 
 	mov	rbx, QWORD PTR [rsp+24]
 	mov	rbp, QWORD PTR [rsp+32]

diff --git a/src/crypto/asm/cn_fast_mainloop_soft_aes_sandybridge.inc b/src/crypto/asm/cn_fast_mainloop_soft_aes_sandybridge.inc
@@ -148,7 +148,7 @@ cn_fast_mainloop_soft_aes_sandybridge:
 	and	edx, 2097136
 	mov	QWORD PTR [rsp+64], rdx
 	sub eax, 1
-	jne	cnv1_mainloop_soft_aes_sandybridge
+	jne	cn_fast_mainloop_soft_aes_sandybridge
 
 	movaps xmm6, XMMWORD PTR [rsp]
 	movaps xmm7, XMMWORD PTR [rsp+16]

diff --git a/src/crypto/asm/win/cn_fast_mainloop_sandybridge.inc b/src/crypto/asm/win/cn_fast_mainloop_sandybridge.inc
@@ -60,7 +60,7 @@ cn_fast_mainloop_sandybridge:
 	movdqu	xmm2, XMMWORD PTR [rdx+rsi]
 	xor	rdi, r11
 	dec	ebp
-	jne	cnv1_mainloop_sandybridge
+	jne	cn_fast_mainloop_sandybridge
 
 	mov	rbx, QWORD PTR [rsp+24]
 	mov	rbp, QWORD PTR [rsp+32]

diff --git a/src/crypto/asm/win/cn_fast_mainloop_soft_aes_sandybridge.inc b/src/crypto/asm/win/cn_fast_mainloop_soft_aes_sandybridge.inc
@@ -144,7 +144,7 @@ cn_fast_mainloop_soft_aes_sandybridge:
 	and	edx, 2097136
 	mov	QWORD PTR [rsp+64], rdx
 	sub eax, 1
-	jne	cnv1_mainloop_soft_aes_sandybridge
+	jne	cn_fast_mainloop_soft_aes_sandybridge
 
 	movaps xmm6, XMMWORD PTR [rsp]
 	movaps xmm7, XMMWORD PTR [rsp+16]

diff --git a/src/default_config.json b/src/default_config.json
@@ -4,7 +4,7 @@
     "threads": 0,                               // number of miner threads (not set or 0 enables automatic selection of optimal thread count)
     "multihash-factor": 0,                      // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks)
     "multihash-thread-mask" : null,             // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads)
-    "pow-variant" : "auto",                     // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), 2 (v2, aka monerov8), tube (ipbc), alloy (xao), xtl (including autodetect for v5), msr, xhv, rto
+    "pow-variant" : "auto",                     // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), 2 (v2, aka monerov8), tube (ipbc), alloy (xao), xtl (including autodetect for v5), msr, xhv, rto, xfh
     // for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations
     "asm-optimization" : "auto",                // specificy the ASM optimization to use: -> auto (default), intel, ryzen, bulldozer, off
     "background": false,                        // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead)