Merge commit

MoneroOcean · Jan 16, 2019 · 5b5f97d · 5b5f97d
2 parents 35a6110 + b11e772
commit 5b5f97d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v2.9.2
+- [#907](https://github.com/xmrig/xmrig/pull/907) Fixed crash on Linux.
+
 # v2.9.1
 - Restored compatibility with https://stellite.hashvault.pro.
 

diff --git a/src/crypto/asm/cn_main_loop.S b/src/crypto/asm/cn_main_loop.S
@@ -23,7 +23,7 @@ FN_PREFIX(cnv2_mainloop_ivybridge_asm):
 	#include "cn2/cnv2_main_loop_ivybridge.inc"
 	add rsp, 48
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_mainloop_ryzen_asm):
@@ -32,7 +32,7 @@ FN_PREFIX(cnv2_mainloop_ryzen_asm):
 	#include "cn2/cnv2_main_loop_ryzen.inc"
 	add rsp, 48
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_mainloop_bulldozer_asm):
@@ -41,7 +41,7 @@ FN_PREFIX(cnv2_mainloop_bulldozer_asm):
 	#include "cn2/cnv2_main_loop_bulldozer.inc"
 	add rsp, 48
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
@@ -51,4 +51,4 @@ FN_PREFIX(cnv2_double_mainloop_sandybridge_asm):
 	#include "cn2/cnv2_double_main_loop_sandybridge.inc"
 	add rsp, 48
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
diff --git a/src/crypto/asm/cn_main_loop.asm b/src/crypto/asm/cn_main_loop.asm
@@ -8,28 +8,28 @@ ALIGN(64)
 cnv2_mainloop_ivybridge_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN(64)
 cnv2_mainloop_ryzen_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN(64)
 cnv2_mainloop_bulldozer_asm PROC
 	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN(64)
 cnv2_double_mainloop_sandybridge_asm PROC
 	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_double_mainloop_sandybridge_asm ENDP
 
 _TEXT_CNV2_MAINLOOP ENDS

diff --git a/src/crypto/asm/win64/cn_main_loop.S b/src/crypto/asm/win64/cn_main_loop.S
@@ -10,22 +10,22 @@ ALIGN(64)
 cnv2_mainloop_ivybridge_asm:
 	#include "../cn2/cnv2_main_loop_ivybridge.inc"
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_mainloop_ryzen_asm:
 	#include "../cn2/cnv2_main_loop_ryzen.inc"
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_mainloop_bulldozer_asm:
 	#include "../cn2/cnv2_main_loop_bulldozer.inc"
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 
 ALIGN(64)
 cnv2_double_mainloop_sandybridge_asm:
 	#include "../cn2/cnv2_double_main_loop_sandybridge.inc"
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
diff --git a/src/crypto/asm/win64/cn_main_loop.asm b/src/crypto/asm/win64/cn_main_loop.asm
@@ -8,28 +8,28 @@ ALIGN 64
 cnv2_mainloop_ivybridge_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ivybridge.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_ivybridge_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_ryzen_asm PROC
 	INCLUDE cn2/cnv2_main_loop_ryzen.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_ryzen_asm ENDP
 
 ALIGN 64
 cnv2_mainloop_bulldozer_asm PROC
 	INCLUDE cn2/cnv2_main_loop_bulldozer.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_mainloop_bulldozer_asm ENDP
 
 ALIGN 64
 cnv2_double_mainloop_sandybridge_asm PROC
 	INCLUDE cn2/cnv2_double_main_loop_sandybridge.inc
 	ret 0
-	mov eax, 0xDEADC0DE
+	mov eax, 3735929054
 cnv2_double_mainloop_sandybridge_asm ENDP
 
 _TEXT_CNV2_MAINLOOP ENDS

diff --git a/src/version.h b/src/version.h
@@ -28,15 +28,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CPU miner"
-#define APP_VERSION   "2.9.1-mo1"
+#define APP_VERSION   "2.9.2-mo1"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
 #define APP_KIND      "cpu"
 
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  9
-#define APP_VER_PATCH  1
+#define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1910)