From b43336582d87fcf6b39e8d20f66fc8abfa6210b2 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 13 Jan 2019 23:00:41 +0700
Subject: [PATCH] Rename ASM files.

---
 cmake/asm.cmake                                           | 8 ++++----
 .../asm/{ => cn2}/cnv2_double_main_loop_sandybridge.inc   | 0
 src/crypto/asm/{ => cn2}/cnv2_main_loop_bulldozer.inc     | 0
 src/crypto/asm/{ => cn2}/cnv2_main_loop_ivybridge.inc     | 0
 src/crypto/asm/{ => cn2}/cnv2_main_loop_ryzen.inc         | 0
 src/crypto/asm/{cnv2_main_loop.S => cn_main_loop.S}       | 8 ++++----
 src/crypto/asm/{cnv2_main_loop.asm => cn_main_loop.asm}   | 8 ++++----
 .../win64/{ => cn2}/cnv2_double_main_loop_sandybridge.inc | 0
 .../asm/win64/{ => cn2}/cnv2_main_loop_bulldozer.inc      | 0
 .../asm/win64/{ => cn2}/cnv2_main_loop_ivybridge.inc      | 0
 src/crypto/asm/win64/{ => cn2}/cnv2_main_loop_ryzen.inc   | 0
 src/crypto/asm/win64/{cnv2_main_loop.S => cn_main_loop.S} | 8 ++++----
 .../asm/win64/{cnv2_main_loop.asm => cn_main_loop.asm}    | 8 ++++----
 13 files changed, 20 insertions(+), 20 deletions(-)
 rename src/crypto/asm/{ => cn2}/cnv2_double_main_loop_sandybridge.inc (100%)
 rename src/crypto/asm/{ => cn2}/cnv2_main_loop_bulldozer.inc (100%)
 rename src/crypto/asm/{ => cn2}/cnv2_main_loop_ivybridge.inc (100%)
 rename src/crypto/asm/{ => cn2}/cnv2_main_loop_ryzen.inc (100%)
 rename src/crypto/asm/{cnv2_main_loop.S => cn_main_loop.S} (80%)
 rename src/crypto/asm/{cnv2_main_loop.asm => cn_main_loop.asm} (76%)
 rename src/crypto/asm/win64/{ => cn2}/cnv2_double_main_loop_sandybridge.inc (100%)
 rename src/crypto/asm/win64/{ => cn2}/cnv2_main_loop_bulldozer.inc (100%)
 rename src/crypto/asm/win64/{ => cn2}/cnv2_main_loop_ivybridge.inc (100%)
 rename src/crypto/asm/win64/{ => cn2}/cnv2_main_loop_ryzen.inc (100%)
 rename src/crypto/asm/win64/{cnv2_main_loop.S => cn_main_loop.S} (66%)
 rename src/crypto/asm/win64/{cnv2_main_loop.asm => cn_main_loop.asm} (76%)

diff --git a/cmake/asm.cmake b/cmake/asm.cmake
index 358d56667..bdb5d134f 100644
--- a/cmake/asm.cmake
+++ b/cmake/asm.cmake
@@ -5,9 +5,9 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
         enable_language(ASM_MASM)
 
         if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
-            set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop.asm")
+            set(XMRIG_ASM_FILE "src/crypto/asm/cn_main_loop.asm")
         else()
-            set(XMRIG_ASM_FILE "src/crypto/asm/win64/cnv2_main_loop.asm")
+            set(XMRIG_ASM_FILE "src/crypto/asm/win64/cn_main_loop.asm")
         endif()
 
         set_property(SOURCE ${XMRIG_ASM_FILE} PROPERTY ASM_MASM)
@@ -15,9 +15,9 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
         enable_language(ASM)
 
         if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
-            set(XMRIG_ASM_FILE "src/crypto/asm/win64/cnv2_main_loop.S")
+            set(XMRIG_ASM_FILE "src/crypto/asm/win64/cn_main_loop.S")
         else()
-            set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop.S")
+            set(XMRIG_ASM_FILE "src/crypto/asm/cn_main_loop.S")
         endif()
 
         set_property(SOURCE ${XMRIG_ASM_FILE} PROPERTY C)
diff --git a/src/crypto/asm/cnv2_double_main_loop_sandybridge.inc b/src/crypto/asm/cn2/cnv2_double_main_loop_sandybridge.inc
similarity index 100%
rename from src/crypto/asm/cnv2_double_main_loop_sandybridge.inc
rename to src/crypto/asm/cn2/cnv2_double_main_loop_sandybridge.inc
diff --git a/src/crypto/asm/cnv2_main_loop_bulldozer.inc b/src/crypto/asm/cn2/cnv2_main_loop_bulldozer.inc
similarity index 100%
rename from src/crypto/asm/cnv2_main_loop_bulldozer.inc
rename to src/crypto/asm/cn2/cnv2_main_loop_bulldozer.inc
diff --git a/src/crypto/asm/cnv2_main_loop_ivybridge.inc b/src/crypto/asm/cn2/cnv2_main_loop_ivybridge.inc
similarity index 100%
rename from src/crypto/asm/cnv2_main_loop_ivybridge.inc
rename to src/crypto/asm/cn2/cnv2_main_loop_ivybridge.inc
diff --git a/src/crypto/asm/cnv2_main_loop_ryzen.inc b/src/crypto/asm/cn2/cnv2_main_loop_ryzen.inc
similarity index 100%
rename from src/crypto/asm/cnv2_main_loop_ryzen.inc
rename to src/crypto/asm/cn2/cnv2_main_loop_ryzen.inc
diff --git a/src/crypto/asm/cnv2_main_loop.S b/src/crypto/asm/cn_main_loop.S
similarity index 80%
rename from src/crypto/asm/cnv2_main_loop.S
rename to src/crypto/asm/cn_main_loop.S
index a23f24bf6..b134a013d 100644
--- a/src/crypto/asm/cnv2_main_loop.S
+++ b/src/crypto/asm/cn_main_loop.S
@@ -16,7 +16,7 @@ ALIGN 16
 FN_PREFIX(cnv2_mainloop_ivybridge_asm):
 	sub rsp, 48
 	mov rcx, rdi
-	#include "cnv2_main_loop_ivybridge.inc"
+	#include "cn2/cnv2_main_loop_ivybridge.inc"
 	add rsp, 48
 	ret 0
 
@@ -24,7 +24,7 @@ ALIGN 16
 FN_PREFIX(cnv2_mainloop_ryzen_asm):
 	sub rsp, 48
 	mov rcx, rdi
-	#include "cnv2_main_loop_ryzen.inc"
+	#include "cn2/cnv2_main_loop_ryzen.inc"
 	add rsp, 48
 	ret 0
 
@@ -32,7 +32,7 @@ ALIGN 16
 FN_PREFIX(cnv2_mainloop_bulldozer_asm):
 	sub rsp, 48
 	mov rcx, rdi
-	#include "cnv2_main_loop_bulldozer.inc"
+	#include "cn2/cnv2_main_loop_bulldozer.inc"
 	add rsp, 48
 	ret 0
 
@@ -41,6 +41,6 @@ FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
 	sub rsp, 48
 	mov rcx, rdi
 	mov rdx, rsi
-	#include "cnv2_double_main_loop_sandybridge.inc"
+	#include "cn2/cnv2_double_main_loop_sandybridge.inc"
 	add rsp, 48
 	ret 0
diff --git a/src/crypto/asm/cnv2_main_loop.asm b/src/crypto/asm/cn_main_loop.asm
similarity index 76%
rename from src/crypto/asm/cnv2_main_loop.asm
rename to src/crypto/asm/cn_main_loop.asm
index 557f1ab68..47194f1fc 100644
--- a/src/crypto/asm/cnv2_main_loop.asm
+++ b/src/crypto/asm/cn_main_loop.asm
@@ -6,25 +6,25 @@ PUBLIC cnv2_double_mainloop_sandybridge_asm
 
 ALIGN 64
 cnv2_mainloop_ivybridge_asm PROC
-	INCLUDE cnv2_main_loop_ivybridge.inc
+	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_ryzen_asm PROC
-	INCLUDE cnv2_main_loop_ryzen.inc
+	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_bulldozer_asm PROC
-	INCLUDE cnv2_main_loop_bulldozer.inc
+	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN 64
 cnv2_double_mainloop_sandybridge_asm PROC
-	INCLUDE cnv2_double_main_loop_sandybridge.inc
+	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
 cnv2_double_mainloop_sandybridge_asm ENDP
 
diff --git a/src/crypto/asm/win64/cnv2_double_main_loop_sandybridge.inc b/src/crypto/asm/win64/cn2/cnv2_double_main_loop_sandybridge.inc
similarity index 100%
rename from src/crypto/asm/win64/cnv2_double_main_loop_sandybridge.inc
rename to src/crypto/asm/win64/cn2/cnv2_double_main_loop_sandybridge.inc
diff --git a/src/crypto/asm/win64/cnv2_main_loop_bulldozer.inc b/src/crypto/asm/win64/cn2/cnv2_main_loop_bulldozer.inc
similarity index 100%
rename from src/crypto/asm/win64/cnv2_main_loop_bulldozer.inc
rename to src/crypto/asm/win64/cn2/cnv2_main_loop_bulldozer.inc
diff --git a/src/crypto/asm/win64/cnv2_main_loop_ivybridge.inc b/src/crypto/asm/win64/cn2/cnv2_main_loop_ivybridge.inc
similarity index 100%
rename from src/crypto/asm/win64/cnv2_main_loop_ivybridge.inc
rename to src/crypto/asm/win64/cn2/cnv2_main_loop_ivybridge.inc
diff --git a/src/crypto/asm/win64/cnv2_main_loop_ryzen.inc b/src/crypto/asm/win64/cn2/cnv2_main_loop_ryzen.inc
similarity index 100%
rename from src/crypto/asm/win64/cnv2_main_loop_ryzen.inc
rename to src/crypto/asm/win64/cn2/cnv2_main_loop_ryzen.inc
diff --git a/src/crypto/asm/win64/cnv2_main_loop.S b/src/crypto/asm/win64/cn_main_loop.S
similarity index 66%
rename from src/crypto/asm/win64/cnv2_main_loop.S
rename to src/crypto/asm/win64/cn_main_loop.S
index 1be27c64c..1793cd169 100644
--- a/src/crypto/asm/win64/cnv2_main_loop.S
+++ b/src/crypto/asm/win64/cn_main_loop.S
@@ -8,20 +8,20 @@
 
 ALIGN 16
 cnv2_mainloop_ivybridge_asm:
-	#include "../cnv2_main_loop_ivybridge.inc"
+	#include "../cn2/cnv2_main_loop_ivybridge.inc"
 	ret 0
 
 ALIGN 16
 cnv2_mainloop_ryzen_asm:
-	#include "../cnv2_main_loop_ryzen.inc"
+	#include "../cn2/cnv2_main_loop_ryzen.inc"
 	ret 0
 
 ALIGN 16
 cnv2_mainloop_bulldozer_asm:
-    #include "../cnv2_main_loop_bulldozer.inc"
+    #include "../cn2/cnv2_main_loop_bulldozer.inc"
 	ret 0
 
 ALIGN 16
 cnv2_double_mainloop_sandybridge_asm:
-	#include "../cnv2_double_main_loop_sandybridge.inc"
+	#include "../cn2/cnv2_double_main_loop_sandybridge.inc"
 	ret 0
diff --git a/src/crypto/asm/win64/cnv2_main_loop.asm b/src/crypto/asm/win64/cn_main_loop.asm
similarity index 76%
rename from src/crypto/asm/win64/cnv2_main_loop.asm
rename to src/crypto/asm/win64/cn_main_loop.asm
index 557f1ab68..47194f1fc 100644
--- a/src/crypto/asm/win64/cnv2_main_loop.asm
+++ b/src/crypto/asm/win64/cn_main_loop.asm
@@ -6,25 +6,25 @@ PUBLIC cnv2_double_mainloop_sandybridge_asm
 
 ALIGN 64
 cnv2_mainloop_ivybridge_asm PROC
-	INCLUDE cnv2_main_loop_ivybridge.inc
+	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_ryzen_asm PROC
-	INCLUDE cnv2_main_loop_ryzen.inc
+	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_bulldozer_asm PROC
-	INCLUDE cnv2_main_loop_bulldozer.inc
+	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN 64
 cnv2_double_mainloop_sandybridge_asm PROC
-	INCLUDE cnv2_double_main_loop_sandybridge.inc
+	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
 cnv2_double_mainloop_sandybridge_asm ENDP