Move files.

src/App.cpp

@@ -37,7 +37,6 @@
 #include "common/Platform.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "crypto/CryptoNight.h"
 #include "Mem.h"
 #include "net/Network.h"
 #include "Summary.h"

src/Mem.cpp

@@ -27,10 +27,10 @@
 #include <limits>
 
 
+#include "crypto/cn/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight.h"
 #include "crypto/common/portable/mm_malloc.h"
 #include "crypto/common/VirtualMemory.h"
-#include "crypto/CryptoNight_constants.h"
-#include "crypto/CryptoNight.h"
 #include "Mem.h"
 
 

src/Mem_unix.cpp

@@ -32,7 +32,7 @@
 #include "common/xmrig.h"
 #include "crypto/common/portable/mm_malloc.h"
 #include "crypto/common/VirtualMemory.h"
-#include "crypto/CryptoNight.h"
+#include "crypto/cn/CryptoNight.h"
 #include "Mem.h"
 
 

src/Mem_win.cpp

@@ -34,8 +34,8 @@
 #include "common/xmrig.h"
 #include "crypto/common/portable/mm_malloc.h"
 #include "crypto/common/VirtualMemory.h"
-#include "crypto/CryptoNight_constants.h"
-#include "crypto/CryptoNight.h"
+#include "crypto/cn/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight.h"
 #include "Mem.h"
 
 

src/Summary.cpp

@@ -33,7 +33,7 @@
 #include "common/cpu/Cpu.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "crypto/Asm.h"
+#include "crypto/cn/Asm.h"
 #include "Mem.h"
 #include "Summary.h"
 #include "version.h"

src/core/config/Config.cpp

@@ -32,8 +32,8 @@
 #include "base/kernel/interfaces/IJsonReader.h"
 #include "common/cpu/Cpu.h"
 #include "core/config/Config.h"
-#include "crypto/Asm.h"
-#include "crypto/CryptoNight_constants.h"
+#include "crypto/cn/Asm.h"
+#include "crypto/cn/CryptoNight_constants.h"
 #include "rapidjson/document.h"
 #include "rapidjson/filewritestream.h"
 #include "rapidjson/prettywriter.h"

src/crypto/cn/Asm.cpp

@@ -33,7 +33,7 @@
 #endif
 
 
-#include "crypto/Asm.h"
+#include "crypto/cn/Asm.h"
 #include "rapidjson/document.h"
 
 

src/crypto/cn/CryptoNight_arm.h

@@ -30,18 +30,18 @@
 
 #include "common/crypto/keccak.h"
 #include "crypto/common/portable/mm_malloc.h"
-#include "crypto/CryptoNight_constants.h"
-#include "crypto/CryptoNight_monero.h"
-#include "crypto/CryptoNight.h"
-#include "crypto/soft_aes.h"
+#include "crypto/cn/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight_monero.h"
+#include "crypto/cn/CryptoNight.h"
+#include "crypto/cn/soft_aes.h"
 
 
 extern "C"
 {
-#include "crypto/c_groestl.h"
-#include "crypto/c_blake256.h"
-#include "crypto/c_jh.h"
-#include "crypto/c_skein.h"
+#include "crypto/cn/c_groestl.h"
+#include "crypto/cn/c_blake256.h"
+#include "crypto/cn/c_jh.h"
+#include "crypto/cn/c_skein.h"
 }
 
 

src/crypto/cn/CryptoNight_monero.h

@@ -179,7 +179,7 @@
 #endif
 
 #include "common/xmrig.h"
-#include "variant4_random_math.h"
+#include "crypto/cn/r/variant4_random_math.h"
 
 #define VARIANT4_RANDOM_MATH_INIT(part) \
   uint32_t r##part[9]; \

src/crypto/cn/CryptoNight_x86.h

@@ -37,18 +37,18 @@
 
 #include "common/cpu/Cpu.h"
 #include "common/crypto/keccak.h"
-#include "crypto/CryptoNight.h"
-#include "crypto/CryptoNight_constants.h"
-#include "crypto/CryptoNight_monero.h"
-#include "crypto/soft_aes.h"
+#include "crypto/cn/CryptoNight.h"
+#include "crypto/cn/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight_monero.h"
+#include "crypto/cn/soft_aes.h"
 
 
 extern "C"
 {
-#include "crypto/c_groestl.h"
-#include "crypto/c_blake256.h"
-#include "crypto/c_jh.h"
-#include "crypto/c_skein.h"
+#include "crypto/cn/c_groestl.h"
+#include "crypto/cn/c_blake256.h"
+#include "crypto/cn/c_jh.h"
+#include "crypto/cn/c_skein.h"
 }
 
 

src/crypto/cn/gpu/cn_gpu_avx.cpp

@@ -22,7 +22,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "crypto/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight_constants.h"
 
 #ifdef __GNUC__
 #   include <x86intrin.h>

src/crypto/cn/gpu/cn_gpu_ssse3.cpp

@@ -22,7 +22,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "crypto/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight_constants.h"
 
 #ifdef __GNUC__
 #   include <x86intrin.h>

src/crypto/cn/r/CryptonightR_gen.cpp

@@ -24,11 +24,11 @@
  */
 
 #include <cstring>
-#include "crypto/CryptoNight_monero.h"
+#include "crypto/cn/CryptoNight_monero.h"
 
 typedef void(*void_func)();
 
-#include "crypto/asm/CryptonightR_template.h"
+#include "crypto/cn/asm/CryptonightR_template.h"
 #include "crypto/common/VirtualMemory.h"
 #include "Mem.h"
 

src/crypto/cn/r/variant4_random_math.h

@@ -3,7 +3,7 @@
 
 extern "C"
 {
-    #include "c_blake256.h"
+    #include "crypto/cn/c_blake256.h"
 }
 
 enum V4_Settings

src/workers/CpuThread.cpp

@@ -27,7 +27,7 @@
 
 #include "base/io/log/Log.h"
 #include "common/cpu/Cpu.h"
-#include "crypto/Asm.h"
+#include "crypto/cn/Asm.h"
 #include "crypto/common/VirtualMemory.h"
 #include "Mem.h"
 #include "rapidjson/document.h"
@@ -35,9 +35,9 @@
 
 
 #if defined(XMRIG_ARM)
-#   include "crypto/CryptoNight_arm.h"
+#   include "crypto/cn/CryptoNight_arm.h"
 #else
-#   include "crypto/CryptoNight_x86.h"
+#   include "crypto/cn/CryptoNight_x86.h"
 #endif
 
 

src/workers/MultiWorker.cpp

@@ -27,7 +27,7 @@
 #include <thread>
 
 
-#include "crypto/CryptoNight_test.h"
+#include "crypto/cn/CryptoNight_test.h"
 #include "workers/CpuThread.h"
 #include "workers/MultiWorker.h"
 #include "workers/Workers.h"

src/workers/Workers.cpp

@@ -32,7 +32,7 @@
 #include "base/tools/Handle.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "crypto/CryptoNight_constants.h"
+#include "crypto/cn/CryptoNight_constants.h"
 #include "interfaces/IJobResultListener.h"
 #include "interfaces/IThread.h"
 #include "Mem.h"