mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 13:42:54 -05:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.5.2

Browse Source
This commit is contained in:
MoneroOcean
2020-11-13 19:47:22 +00:00
parent 60c9c0c07d 5ceacbbfd0
commit 77a951a6a4
21 changed files with 197 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/common/MemoryPool.cpp
View File

@@ -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;
}

1
src/crypto/randomx/vm_compiled.hpp
View File

@@ -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*) {}

5
src/crypto/rx/RxConfig.cpp
View File

@@ -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

2
src/crypto/rx/Rx_win.cpp
View File

@@ -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);