Merge xmrig v6.5.2

src/crypto/common/MemoryPool.cpp

@@ -71,7 +71,7 @@ uint8_t *xmrig::MemoryPool::get(size_t size, uint32_t)
 {
     assert(!(size % pageSize));
 
-    if (!m_memory || (m_memory->size() - m_offset) < size) {
+    if (!m_memory || (m_memory->size() - m_offset - m_alignOffset) < size) {
         return nullptr;
     }
 

src/crypto/randomx/vm_compiled.hpp

@@ -41,6 +41,7 @@ namespace randomx {
 	class CompiledVm : public VmBase<softAes>
 	{
 	public:
+		inline CompiledVm() {}
 		void* operator new(size_t, void* ptr) { return ptr; }
 		void operator delete(void*) {}
 

src/crypto/rx/RxConfig.cpp

@@ -64,16 +64,17 @@ static const std::array<const char *, RxConfig::ModeMax> modeNames = { "auto", "
 
 
 #ifdef XMRIG_FEATURE_MSR
-constexpr size_t kMsrArraySize = 4;
+constexpr size_t kMsrArraySize = 5;
 
 static const std::array<MsrItems, kMsrArraySize> msrPresets = {
     MsrItems(),
+    MsrItems{{ 0xC0011020, 0ULL }, { 0xC0011021, 0x40ULL, ~0x20ULL }, { 0xC0011022, 0x1510000ULL }, { 0xC001102b, 0x2000cc16ULL }},
     MsrItems{{ 0xC0011020, 0x0004480000000000ULL }, { 0xC0011021, 0x001c000200000040ULL, ~0x20ULL }, { 0xC0011022, 0xc000000401500000ULL }, { 0xC001102b, 0x2000cc14ULL }},
     MsrItems{{ 0x1a4, 0xf }},
     MsrItems()
 };
 
-static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen", "intel", "custom" };
+static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen_17h", "ryzen_19h", "intel", "custom" };
 
 static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
 #endif

src/crypto/rx/Rx_win.cpp

@@ -135,7 +135,7 @@ static HANDLE wrmsr_install_driver()
         SERVICE_STATUS status;
         const auto rc = QueryServiceStatus(hService, &status);
 
-        if (rc && Log::isVerbose()) {
+        if (rc) {
             DWORD dwBytesNeeded;
 
             QueryServiceConfigA(hService, nullptr, 0, &dwBytesNeeded);