Merge pull request #3 from JohnnyFFM/merge11

Merge 1.1 lost features
JohnnyFFM · Jun 8, 2018 · db3d2f9 · db3d2f9
2 parents 3c8df01 + a31123d
commit db3d2f9
Show file tree

Hide file tree

Showing 10 changed files with 3,156 additions and 2,598 deletions.
diff --git a/Nonce.cpp b/Nonce.cpp
diff --git a/Nonce.h b/Nonce.h
@@ -5,25 +5,22 @@
 #include <array>
 #include <thread>
 #include <string>
-#include <intrin.h>
-
-
 
 #define HASH_SIZE	32
 #define HASH_CAP	4096
 #define SCOOP_SIZE	64
 #define PLOT_SIZE	(HASH_CAP * SCOOP_SIZE) // 4096*64
 
-extern std::array <char*, HASH_CAP * sizeof(char*)> cache;
 extern std::vector<size_t> worker_status;
-
+extern std::array <char*, HASH_CAP * sizeof(char*)> cache;
 bool write_to_stream(const unsigned long long data);
 
-namespace AVX2
+
+namespace AVX1
 {
 	void work_i(const size_t local_num, const unsigned long long loc_addr, const unsigned long long local_startnonce, const unsigned long long local_nonces);
 }
-namespace AVX1
+namespace AVX2
 {
 	void work_i(const size_t local_num, const unsigned long long loc_addr, const unsigned long long local_startnonce, const unsigned long long local_nonces);
 }