fixed immintrin bug

monkins1010 · Apr 9, 2019 · 3e67c4d · 3e67c4d
1 parent f3d5365
commit 3e67c4d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -22,8 +22,7 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  ccminer.cpp pools.cpp util.cpp bench.cpp \
 			  api.cpp hashlog.cpp stats.cpp sysinfos.cpp \
 			  equi/equi-stratum.cpp verus/verusscan.cpp verus/haraka.c verus/haraka.h \
-			  verus/haraka_portable.c verus/verus_clhash.cpp verus/clhash_portable.cpp
-
+			  verus/haraka_portable.c verus/verus_clhash.cpp
 
 
 if HAVE_WINDOWS

diff --git a/bignum.hpp b/bignum.hpp
@@ -103,13 +103,13 @@ class CBigNum
     CBigNum(signed char n)      { init(); if (n >= 0) setulong(n); else setint64(n); }
     CBigNum(short n)            { init(); if (n >= 0) setulong(n); else setint64(n); }
     CBigNum(int n)              { init(); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(long n)             { init(); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int64_t n)            { init(); setint64(n); }
+  //  CBigNum(long n)             { init(); if (n >= 0) setulong(n); else setint64(n); }
+ //   CBigNum(int64_t n)            { init(); setint64(n); }
     CBigNum(unsigned char n)    { init(); setulong(n); }
     CBigNum(unsigned short n)   { init(); setulong(n); }
     CBigNum(unsigned int n)     { init(); setulong(n); }
-    CBigNum(unsigned long n)    { init(); setulong(n); }
-    CBigNum(uint64_t n)           { init(); setuint64(n); }
+ //   CBigNum(unsigned long n)    { init(); setulong(n); }
+  //  CBigNum(uint64_t n)           { init(); setuint64(n); }
     //explicit CBigNum(uint256_t n) { init(); setuint256(n); }
 
     explicit CBigNum(const std::vector<unsigned char>& vch)

diff --git a/ccminer.cpp b/ccminer.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2010 Jeff Garzik
  * Copyright 2012-2014 pooler
  * Copyright 2014-2017 tpruvot
@@ -1763,7 +1763,7 @@ static bool wanna_mine(int thr_id)
 		float temp = gpu_temp(cgpu);
 		if (temp > opt_max_temp) {
 			if (!conditional_state[thr_id] && !opt_quiet)
-				gpulog(LOG_INFO, thr_id, "temperature too high (%.0f°c), waiting...", temp);
+				gpulog(LOG_INFO, thr_id, "temperature too high (%.0f°c), waiting...", temp);
 			state = false;
 		} else if (opt_max_temp > 0. && opt_resume_temp > 0. && conditional_state[thr_id] && temp > opt_resume_temp) {
 			if (!thr_id && opt_debug)
@@ -3668,7 +3668,7 @@ int main(int argc, char *argv[])
 	if (!opt_quiet) {
 		const char* arch = is_x64() ? "64-bits" : "32-bits";
 
-		printf("    Built with VC++ %d" , msver());
+		printf("    Built with a compiler ");
 		printf("  Originally based on Christian Buchner and Christian H. project\n");
 		printf("BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo (tpruvot)\n\n");
 		printf("Verus donation address: REoPcdGXthL5yeTCrJtrQv5xhYTknbFbec  (monkins)\n");

diff --git a/verus/verus_clhash.cpp b/verus/verus_clhash.cpp
@@ -24,7 +24,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include <intrin.h>
+#include <immintrin.h>
 //#include "cpu_verushash.hpp"
 
 #ifdef _WIN32

diff --git a/verus/verus_clhash_portable.cpp b/verus/verus_clhash_portable.cpp
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <intrin.h>
+#include <immintrin.h>
 
 
 #ifdef __APPLE__