v6.21.3

RandomX: correct memcpy size for JIT initialization

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v6.21.3
+- [#3462](https://github.com/xmrig/xmrig/pull/3462) RandomX: correct memcpy size for JIT initialization.
+
 # v6.21.2
 - The dependencies of all prebuilt releases have been updated. Support for old Ubuntu releases has been dropped.
 - [#2800](https://github.com/xmrig/xmrig/issues/2800) Fixed donation with GhostRider algorithm for builds without KawPow algorithm.

CMakeLists.txt

@@ -32,7 +32,6 @@ option(WITH_VAES            "Enable VAES instructions for Cryptonight" ON)
 option(WITH_BENCHMARK       "Enable builtin RandomX benchmark and stress test" ON)
 option(WITH_SECURE_JIT      "Enable secure access to JIT memory" OFF)
 option(WITH_DMI             "Enable DMI/SMBIOS reader" ON)
-option(WITH_BUNDLED_FMT     "Force use of bundled fmt library" ON)
 
 option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_V8               "Force ARMv8 (64 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
@@ -199,7 +198,6 @@ add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
 find_package(UV REQUIRED)
 
 include(cmake/flags.cmake)
-include(cmake/fmt.cmake)
 include(cmake/randomx.cmake)
 include(cmake/argon2.cmake)
 include(cmake/kawpow.cmake)
@@ -231,7 +229,7 @@ include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
 include_directories(src)
-include_directories(src/3rdparty/CL)
+include_directories(src/3rdparty)
 include_directories(${UV_INCLUDE_DIR})
 
 if (WITH_DEBUG_LOG)
@@ -239,7 +237,7 @@ if (WITH_DEBUG_LOG)
 endif()
 
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY} ${FMT_LIBRARY})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)

cmake/fmt.cmake

@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: © 2023 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-if(WITH_BUNDLED_FMT)
-    add_library(fmt INTERFACE)
-    target_sources(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt/format.cc)
-    target_include_directories(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt)
-else()
-    set(FMT_LIBRARY fmt)
-    find_package(fmt REQUIRED)
-    set(FMT_LIBRARY fmt::fmt)
-endif()

src/3rdparty/cl.h

@@ -29,7 +29,7 @@
 #if defined(__APPLE__)
 #   include <OpenCL/cl.h>
 #else
-#   include <CL/cl.h>
+#   include "3rdparty/CL/cl.h"
 #endif
 
 

src/3rdparty/fmt/format.cc

@@ -5,7 +5,7 @@
 //
 // For the license information refer to format.h.
 
-#include "fmt/format-inl.h"
+#include "3rdparty/fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
 namespace detail {

src/backend/cpu/platform/lscpu_arm.cpp

@@ -18,11 +18,11 @@
  */
 
 #include "base/tools/String.h"
+#include "3rdparty/fmt/core.h"
 
 
 #include <cstdio>
 #include <cctype>
-#include <fmt/core.h>
 
 
 namespace xmrig {

src/backend/opencl/wrappers/AdlLib_linux.cpp

@@ -20,6 +20,7 @@
 
 
 #include "backend/opencl/wrappers/AdlLib.h"
+#include "3rdparty/fmt/core.h"
 #include "backend/opencl/wrappers/OclDevice.h"
 
 
@@ -30,7 +31,6 @@
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fmt/core.h>
 
 
 namespace xmrig {

src/base/base.cmake

@@ -88,6 +88,7 @@ set(HEADERS_BASE
    )
 
 set(SOURCES_BASE
+    src/3rdparty/fmt/format.cc
     src/base/crypto/Algorithm.cpp
     src/base/crypto/Coin.cpp
     src/base/crypto/keccak.cpp

src/base/kernel/Process.cpp

@@ -22,10 +22,10 @@
 
 
 #include "base/kernel/Process.h"
+#include "3rdparty/fmt/core.h"
 #include "base/tools/Chrono.h"
 #include "version.h"
 
-#include <fmt/core.h>
 
 #ifdef XMRIG_OS_WIN
 #   ifdef _MSC_VER

src/base/net/stratum/BaseClient.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "base/net/stratum/BaseClient.h"
+#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/Env.h"
 #include "base/io/log/Log.h"
@@ -24,8 +25,6 @@
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/stratum/SubmitResult.h"
 
-#include <fmt/core.h>
-
 
 namespace xmrig {
 

src/base/net/stratum/benchmark/BenchClient.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "base/net/stratum/benchmark/BenchClient.h"
+#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "backend/common/benchmark/BenchState.h"
 #include "backend/common/interfaces/IBackend.h"
@@ -38,8 +39,6 @@
 #   include "hw/dmi/DmiReader.h"
 #endif
 
-#include <fmt/core.h>
-
 
 xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, IClientListener* listener) :
     m_listener(listener),

src/base/net/stratum/benchmark/BenchConfig.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "base/net/stratum/benchmark/BenchConfig.h"
+#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 
 
 #include <string>
-#include <fmt/core.h>
 
 
 #ifdef _MSC_VER

src/crypto/common/LinuxMemory.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "crypto/common/LinuxMemory.h"
+#include "3rdparty/fmt/core.h"
 #include "crypto/common/VirtualMemory.h"
 
 
 #include <algorithm>
 #include <fstream>
-#include <fmt/core.h>
 #include <mutex>
 #include <string>
 

src/crypto/randomx/jit_compiler_a64.cpp

@@ -1078,6 +1078,6 @@ void JitCompilerA64::h_NOP(Instruction& instr, uint32_t& codePos)
 {
 }
 
-InstructionGeneratorA64 JitCompilerA64::engine[257] = {};
+InstructionGeneratorA64 JitCompilerA64::engine[256] = {};
 
 }

src/crypto/randomx/jit_compiler_a64.hpp

@@ -74,7 +74,7 @@ namespace randomx {
 		void enableWriting() const;
 		void enableExecution() const;
 
-		static InstructionGeneratorA64 engine[257];
+		static InstructionGeneratorA64 engine[256];
 
 	private:
 		const bool hugePages;

src/crypto/randomx/jit_compiler_x86.cpp

@@ -1443,6 +1443,6 @@ namespace randomx {
 		emitByte(0x90, code, codePos);
 	}
 
-	alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[257] = {};
+	alignas(64) InstructionGeneratorX86 JitCompilerX86::engine[256] = {};
 
 }

src/crypto/randomx/jit_compiler_x86.hpp

@@ -81,7 +81,7 @@ namespace randomx {
 		void enableWriting() const;
 		void enableExecution() const;
 
-		alignas(64) static InstructionGeneratorX86 engine[257];
+		alignas(64) static InstructionGeneratorX86 engine[256];
 
 	private:
 		int registerUsage[RegistersCount] = {};

src/crypto/randomx/randomx.cpp

@@ -260,7 +260,7 @@ typedef void(randomx::JitCompilerX86::* InstructionGeneratorX86_2)(const randomx
 
 #define JIT_HANDLE(x, prev) do { \
 		const InstructionGeneratorX86_2 p = &randomx::JitCompilerX86::h_##x; \
-		memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(p)); \
+		memcpy(randomx::JitCompilerX86::engine + k, &p, sizeof(randomx::JitCompilerX86::engine[k])); \
 	} while (0)
 
 #elif (XMRIG_ARM == 8)

src/hw/dmi/DmiMemory.cpp

@@ -20,6 +20,7 @@
 
 
 #include "hw/dmi/DmiMemory.h"
+#include "3rdparty/fmt/format.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
@@ -27,7 +28,6 @@
 #include <algorithm>
 #include <array>
 #include <regex>
-#include <fmt/format.h>
 
 
 namespace xmrig {

src/hw/dmi/DmiReader.cpp

@@ -19,11 +19,10 @@
  */
 
 #include "hw/dmi/DmiReader.h"
+#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
-#include <fmt/core.h>
-
 
 namespace xmrig {
 

src/hw/msr/Msr_linux.cpp

@@ -18,6 +18,7 @@
 
 
 #include "hw/msr/Msr.h"
+#include "3rdparty/fmt/core.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/log/Log.h"
 
@@ -28,7 +29,6 @@
 #include <cstdio>
 #include <dirent.h>
 #include <fcntl.h>
-#include <fmt/core.h>
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>

src/version.h

@@ -22,7 +22,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.21.3-dev"
+#define APP_VERSION   "6.21.3"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"