v5.5.2

Merge branch 'dev'
Update year.
2025-12-08 08:23:34 -05:00 · 2020-02-02 13:30:29 +07:00 · 2020-02-02 13:29:13 +07:00 · 2020-02-01 20:24:00 +07:00 · 2020-02-01 18:47:11 +07:00 · 2020-01-29 17:48:37 +07:00
60 changed files with 712 additions and 366 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v5.5.2
+- [#1500](https://github.com/xmrig/xmrig/pull/1500) Removed unnecessary code from RandomX JIT compiler.
+- [#1502](https://github.com/xmrig/xmrig/pull/1502) Optimizations for AMD Bulldozer.
+- [#1508](https://github.com/xmrig/xmrig/pull/1508) Added support for BMI2 instructions.
+- [#1510](https://github.com/xmrig/xmrig/pull/1510) Optimized `CFROUND` instruction for RandomX.
+- [#1520](https://github.com/xmrig/xmrig/pull/1520) Fixed thread affinity.
+
+# v5.5.1
+- [#1469](https://github.com/xmrig/xmrig/issues/1469) Fixed build with gcc 4.8.
+- [#1473](https://github.com/xmrig/xmrig/pull/1473) Added RandomX auto-config for mobile Ryzen APUs.
+- [#1477](https://github.com/xmrig/xmrig/pull/1477) Fixed build with Clang.
+- [#1489](https://github.com/xmrig/xmrig/pull/1489) RandomX JIT compiler tweaks.
+- [#1493](https://github.com/xmrig/xmrig/pull/1493) Default value for Intel MSR preset changed to `15`.
+- Fixed unwanted resume after RandomX dataset change.
+
 # v5.5.0
 - [#179](https://github.com/xmrig/xmrig/issues/179) Added support for [environment variables](https://xmrig.com/docs/miner/environment-variables) in config file.
 - [#1445](https://github.com/xmrig/xmrig/pull/1445) Removed `rx/v` algorithm.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ option(WITH_DEBUG_LOG       "Enable debug log output" OFF)
 option(WITH_TLS             "Enable OpenSSL support" ON)
 option(WITH_ASM             "Enable ASM PoW implementations" ON)
 option(WITH_MSR             "Enable MSR mod & 1st-gen Ryzen fix" ON)
+option(WITH_ENV_VARS        "Enable environment variables support in config file" ON)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" ON)
 option(WITH_CUDA            "Enable CUDA backend" ON)
--- a/scripts/randomx_boost.sh
+++ b/scripts/randomx_boost.sh
@@ -13,7 +13,7 @@ if cat /proc/cpuinfo | grep "AMD Ryzen" > /dev/null;
 elif cat /proc/cpuinfo | grep "Intel" > /dev/null;
 	then
 		echo "Detected Intel"
-		wrmsr -a 0x1a4 6
+		wrmsr -a 0x1a4 0xf
 		echo "MSR register values for Intel applied"
 else
 	echo "No supported CPU detected"
--- a/src/backend/cpu/interfaces/ICpuInfo.h
+++ b/src/backend/cpu/interfaces/ICpuInfo.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@ public:
    virtual Assembly::Id assembly() const                                           = 0;
    virtual bool hasAES() const                                                     = 0;
    virtual bool hasAVX2() const                                                    = 0;
+    virtual bool hasBMI2() const                                                    = 0;
    virtual bool hasOneGbPages() const                                              = 0;
    virtual const char *backend() const                                             = 0;
    virtual const char *brand() const                                               = 0;
--- a/src/backend/cpu/platform/AdvancedCpuInfo.cpp
+++ b/src/backend/cpu/platform/AdvancedCpuInfo.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -153,6 +153,7 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
    }

    m_avx2 = data.flags[CPU_FEATURE_AVX2] && data.flags[CPU_FEATURE_OSXSAVE];
+    m_bmi2 = data.flags[CPU_FEATURE_BMI2];
 }


--- a/src/backend/cpu/platform/AdvancedCpuInfo.h
+++ b/src/backend/cpu/platform/AdvancedCpuInfo.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ protected:
    inline Assembly::Id assembly() const override   { return m_assembly; }
    inline bool hasAES() const override             { return m_aes; }
    inline bool hasAVX2() const override            { return m_avx2; }
+    inline bool hasBMI2() const override            { return m_bmi2; }
    inline bool hasOneGbPages() const override      { return m_pdpe1gb; }
    inline const char *backend() const override     { return m_backend; }
    inline const char *brand() const override       { return m_brand; }
@@ -59,6 +60,7 @@ private:
    Assembly m_assembly;
    bool m_aes            = false;
    bool m_avx2           = false;
+    bool m_bmi2           = false;
    bool m_L2_exclusive   = false;
    char m_backend[32]{};
    char m_brand[64 + 5]{};
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -45,6 +45,10 @@
 #   define bit_AVX2 (1 << 5)
 #endif

+#ifndef bit_BMI2
+#   define bit_BMI2 (1 << 8)
+#endif
+
 #ifndef bit_PDPE1GB
 #   define bit_PDPE1GB (1 << 26)
 #endif
@@ -141,6 +145,12 @@ static inline bool has_avx2()
 }


+static inline bool has_bmi2()
+{
+    return has_feature(EXTENDED_FEATURES, EBX_Reg, bit_BMI2);
+}
+
+
 static inline bool has_pdpe1gb()
 {
    return has_feature(PROCESSOR_EXT_INFO, EDX_Reg, bit_PDPE1GB);
@@ -154,6 +164,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
    m_threads(std::thread::hardware_concurrency()),
    m_aes(has_aes_ni()),
    m_avx2(has_avx2()),
+    m_bmi2(has_bmi2()),
    m_pdpe1gb(has_pdpe1gb())
 {
    cpu_brand_string(m_brand);
--- a/src/backend/cpu/platform/BasicCpuInfo.h
+++ b/src/backend/cpu/platform/BasicCpuInfo.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ protected:
    inline Assembly::Id assembly() const override   { return m_assembly; }
    inline bool hasAES() const override             { return m_aes; }
    inline bool hasAVX2() const override            { return m_avx2; }
+    inline bool hasBMI2() const override            { return m_bmi2; }
    inline bool hasOneGbPages() const override      { return m_pdpe1gb; }
    inline const char *brand() const override       { return m_brand; }
    inline MsrMod msrMod() const override           { return m_msrMod; }
@@ -63,6 +64,7 @@ private:
    Assembly m_assembly     = Assembly::NONE;
    bool m_aes              = false;
    const bool m_avx2       = false;
+    const bool m_bmi2       = false;
    const bool m_pdpe1gb    = false;
    MsrMod m_msrMod         = MSR_MOD_NONE;
    Vendor m_vendor         = VENDOR_UNKNOWN;
--- a/src/backend/opencl/generators/ocl_generic_rx_generator.cpp
+++ b/src/backend/opencl/generators/ocl_generic_rx_generator.cpp
@@ -40,6 +40,12 @@ bool ocl_generic_rx_generator(const OclDevice &device, const Algorithm &algorith
        return false;
    }

+    // Mobile Ryzen APUs
+    if (device.type() == OclDevice::Raven) {
+        threads.add(OclThread(device.index(), (device.computeUnits() > 4) ? 256 : 128, 8, 1, true, true, 6));
+        return true;
+    }
+
    const size_t mem = device.globalMemSize();
    auto config      = RxAlgo::base(algorithm);
    bool gcnAsm      = false;
--- a/src/backend/opencl/runners/OclRxBaseRunner.cpp
+++ b/src/backend/opencl/runners/OclRxBaseRunner.cpp
@@ -52,7 +52,7 @@ xmrig::OclRxBaseRunner::OclRxBaseRunner(size_t index, const OclLaunchData &data)
        m_worksize = 8;
    }

-    if (data.device.type() == OclDevice::Vega_10 || data.device.type() == OclDevice::Vega_20) {
+    if (data.device.type() == OclDevice::Vega_10 || data.device.type() == OclDevice::Vega_20 || data.device.type() == OclDevice::Raven) {
        m_gcn_version = 14;
    }

--- a/src/base/api/interfaces/IApiRequest.h
+++ b/src/base/api/interfaces/IApiRequest.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -69,21 +69,23 @@ public:

    virtual ~IApiRequest() = default;

-    virtual bool accept()                                        = 0;
-    virtual bool hasParseError() const                           = 0;
-    virtual bool isDone() const                                  = 0;
-    virtual bool isNew() const                                   = 0;
-    virtual bool isRestricted() const                            = 0;
-    virtual const rapidjson::Value &json() const                 = 0;
-    virtual const String &rpcMethod() const                      = 0;
-    virtual const String &url() const                            = 0;
-    virtual int version() const                                  = 0;
-    virtual Method method() const                                = 0;
-    virtual rapidjson::Document &doc()                           = 0;
-    virtual rapidjson::Value &reply()                            = 0;
-    virtual RequestType type() const                             = 0;
-    virtual Source source() const                                = 0;
-    virtual void done(int status)                                = 0;
+    virtual bool accept()                                               = 0;
+    virtual bool hasParseError() const                                  = 0;
+    virtual bool isDone() const                                         = 0;
+    virtual bool isNew() const                                          = 0;
+    virtual bool isRestricted() const                                   = 0;
+    virtual const rapidjson::Value &json() const                        = 0;
+    virtual const String &rpcMethod() const                             = 0;
+    virtual const String &url() const                                   = 0;
+    virtual int version() const                                         = 0;
+    virtual Method method() const                                       = 0;
+    virtual rapidjson::Document &doc()                                  = 0;
+    virtual rapidjson::Value &reply()                                   = 0;
+    virtual RequestType type() const                                    = 0;
+    virtual Source source() const                                       = 0;
+    virtual void done(int status)                                       = 0;
+    virtual void setRpcError(int code, const char *message = nullptr)   = 0;
+    virtual void setRpcResult(rapidjson::Value &result)                 = 0;
 };


--- a/src/base/api/requests/HttpApiRequest.cpp
+++ b/src/base/api/requests/HttpApiRequest.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -53,6 +53,10 @@ static inline const char *rpcError(int code) {
        return "Invalid params";
    }

+    if (code >= HTTP_STATUS_BAD_REQUEST && code <= HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED) {
+        return http_status_str(static_cast<http_status>(code));
+    }
+
    return "Internal error";
 }

@@ -82,7 +86,7 @@ xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) :
            return;
        }

-        m_rpcMethod = Json::getString(json(), "method");
+        m_rpcMethod = Json::getString(m_body, "method");
        if (m_rpcMethod.isEmpty()) {
            done(RPC_INVALID_REQUEST);

@@ -129,6 +133,10 @@ bool xmrig::HttpApiRequest::accept()

 const rapidjson::Value &xmrig::HttpApiRequest::json() const
 {
+    if (type() == REQ_JSON_RPC) {
+        return Json::getValue(m_body, "params");
+    }
+
    return m_body;
 }

@@ -150,25 +158,14 @@ void xmrig::HttpApiRequest::done(int status)
        m_res.setStatus(HTTP_STATUS_OK);

        if (status != HTTP_STATUS_OK) {
-            if (status == HTTP_STATUS_NOT_FOUND) {
-                status = RPC_METHOD_NOT_FOUND;
-            }
-
-            Value error(kObjectType);
-            error.AddMember("code",    status, allocator);
-            error.AddMember("message", StringRef(rpcError(status)), allocator);
-
-            reply().AddMember(StringRef(kError), error, allocator);
+            setRpcError(status == HTTP_STATUS_NOT_FOUND ? RPC_METHOD_NOT_FOUND : status);
        }
        else if (!reply().HasMember(kResult)) {
            Value result(kObjectType);
            result.AddMember("status", "OK", allocator);

-            reply().AddMember(StringRef(kResult), result, allocator);
+            setRpcResult(result);
        }
-
-        reply().AddMember("jsonrpc", "2.0", allocator);
-        reply().AddMember(StringRef(kId), Value().CopyFrom(Json::getValue(json(), kId), allocator), allocator);
    }
    else {
        m_res.setStatus(status);
@@ -176,3 +173,38 @@ void xmrig::HttpApiRequest::done(int status)

    m_res.end();
 }
+
+
+void xmrig::HttpApiRequest::setRpcError(int code, const char *message)
+{
+    using namespace rapidjson;
+    auto &allocator = doc().GetAllocator();
+
+    Value error(kObjectType);
+    error.AddMember("code",    code, allocator);
+    error.AddMember("message", message ? StringRef(message) : StringRef(rpcError(code)), allocator);
+
+    rpcDone(kError, error);
+}
+
+
+void xmrig::HttpApiRequest::setRpcResult(rapidjson::Value &result)
+{
+    rpcDone(kResult, result);
+}
+
+
+void xmrig::HttpApiRequest::rpcDone(const char *key, rapidjson::Value &value)
+{
+    ApiRequest::done(0);
+
+    using namespace rapidjson;
+    auto &allocator = doc().GetAllocator();
+
+    reply().AddMember(StringRef(key), value, allocator);
+    reply().AddMember("jsonrpc", "2.0", allocator);
+    reply().AddMember(StringRef(kId), Value().CopyFrom(Json::getValue(m_body, kId), allocator), allocator);
+
+    m_res.setStatus(HTTP_STATUS_OK);
+    m_res.end();
+}
--- a/src/base/api/requests/HttpApiRequest.h
+++ b/src/base/api/requests/HttpApiRequest.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -53,8 +53,12 @@ protected:
    const rapidjson::Value &json() const override;
    Method method() const override;
    void done(int status) override;
+    void setRpcError(int code, const char *message = nullptr) override;
+    void setRpcResult(rapidjson::Value &result) override;

 private:
+    void rpcDone(const char *key, rapidjson::Value &value);
+
    const HttpData &m_req;
    HttpApiResponse m_res;
    int m_parsed = 0;
--- a/src/base/base.cmake
+++ b/src/base/base.cmake
@@ -169,3 +169,15 @@ else()
    remove_definitions(/DXMRIG_FEATURE_HTTP)
    remove_definitions(/DXMRIG_FEATURE_API)
 endif()
+
+
+if (WITH_ENV_VARS AND CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+    set(WITH_ENV_VARS OFF)
+endif()
+
+
+if (WITH_ENV_VARS)
+    add_definitions(/DXMRIG_FEATURE_ENV)
+else()
+    remove_definitions(/DXMRIG_FEATURE_ENV)
+endif()
--- a/src/base/io/json/Json.cpp
+++ b/src/base/io/json/Json.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -40,7 +40,9 @@ static const rapidjson::Value kNullValue;

 bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsBool()) {
@@ -51,9 +53,17 @@ bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool def
 }


+bool xmrig::Json::isEmpty(const rapidjson::Value &obj)
+{
+    return !obj.IsObject() || obj.ObjectEmpty();
+}
+
+
 const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key, const char *defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsString()) {
@@ -66,7 +76,9 @@ const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key,

 const rapidjson::Value &xmrig::Json::getArray(const rapidjson::Value &obj, const char *key)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return kNullValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsArray()) {
@@ -79,7 +91,9 @@ const rapidjson::Value &xmrig::Json::getArray(const rapidjson::Value &obj, const

 const rapidjson::Value &xmrig::Json::getObject(const rapidjson::Value &obj, const char *key)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return kNullValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsObject()) {
@@ -92,7 +106,9 @@ const rapidjson::Value &xmrig::Json::getObject(const rapidjson::Value &obj, cons

 const rapidjson::Value &xmrig::Json::getValue(const rapidjson::Value &obj, const char *key)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return kNullValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd()) {
@@ -105,7 +121,9 @@ const rapidjson::Value &xmrig::Json::getValue(const rapidjson::Value &obj, const

 int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsInt()) {
@@ -118,7 +136,9 @@ int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaul

 int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsInt64()) {
@@ -131,7 +151,9 @@ int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int6

 uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsUint64()) {
@@ -144,7 +166,9 @@ uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, ui

 unsigned xmrig::Json::getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue)
 {
-    assert(obj.IsObject());
+    if (isEmpty(obj)) {
+        return defaultValue;
+    }

    auto i = obj.FindMember(key);
    if (i != obj.MemberEnd() && i->value.IsUint()) {
@@ -169,5 +193,5 @@ rapidjson::Value xmrig::Json::normalize(double value, bool zero)

 bool xmrig::JsonReader::isEmpty() const
 {
-    return !m_obj.IsObject() || m_obj.ObjectEmpty();
+    return Json::isEmpty(m_obj);
 }
--- a/src/base/io/json/Json.h
+++ b/src/base/io/json/Json.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ class Json
 {
 public:
    static bool getBool(const rapidjson::Value &obj, const char *key, bool defaultValue = false);
+    static bool isEmpty(const rapidjson::Value &obj);
    static const char *getString(const rapidjson::Value &obj, const char *key, const char *defaultValue = nullptr);
    static const rapidjson::Value &getArray(const rapidjson::Value &obj, const char *key);
    static const rapidjson::Value &getObject(const rapidjson::Value &obj, const char *key);
--- a/src/base/kernel/Env.cpp
+++ b/src/base/kernel/Env.cpp
@@ -50,6 +50,7 @@
 namespace xmrig {


+#ifdef XMRIG_FEATURE_ENV
 static std::map<String, String> variables;


@@ -59,6 +60,7 @@ static void createVariables()
    variables.insert({ "XMRIG_EXE_DIR", Process::location(Process::ExeLocation, "") });
    variables.insert({ "XMRIG_CWD",     Process::location(Process::CwdLocation, "") });
 }
+#endif


 } // namespace xmrig
@@ -66,6 +68,7 @@ static void createVariables()

 xmrig::String xmrig::Env::expand(const char *in)
 {
+#   ifdef XMRIG_FEATURE_ENV
    if (in == nullptr) {
        return {};
    }
@@ -103,11 +106,15 @@ xmrig::String xmrig::Env::expand(const char *in)
    }

    return text.c_str();
+#   else
+    return in;
+#   endif
 }


 xmrig::String xmrig::Env::get(const String &name)
 {
+#   ifdef XMRIG_FEATURE_ENV
    if (variables.empty()) {
        createVariables();
    }
@@ -115,6 +122,7 @@ xmrig::String xmrig::Env::get(const String &name)
    if (variables.count(name)) {
        return variables.at(name);
    }
+#   endif

    return static_cast<const char *>(getenv(name));
 }
--- a/src/base/kernel/Platform.h
+++ b/src/base/kernel/Platform.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/base/kernel/Platform_hwloc.cpp
+++ b/src/base/kernel/Platform_hwloc.cpp
@@ -6,8 +6,8 @@
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@


 #include <hwloc.h>
+#include <thread>


 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
@@ -42,8 +43,11 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
    }

    if (hwloc_set_cpubind(cpu->topology(), pu->cpuset, HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT) >= 0) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
        return true;
    }

-    return hwloc_set_cpubind(cpu->topology(), pu->cpuset, HWLOC_CPUBIND_THREAD) >= 0;
+    const bool result = (hwloc_set_cpubind(cpu->topology(), pu->cpuset, HWLOC_CPUBIND_THREAD) >= 0);
+    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    return result;
 }
--- a/src/base/kernel/Platform_mac.cpp
+++ b/src/base/kernel/Platform_mac.cpp
@@ -4,8 +4,8 @@
 * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <uv.h>
+#include <thread>


 #include "base/kernel/Platform.h"
@@ -67,7 +68,9 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
    thread_affinity_policy_data_t policy = { static_cast<integer_t>(cpu_id) };
    mach_thread = pthread_mach_thread_np(pthread_self());

-    return thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, (thread_policy_t)&policy, 1) == KERN_SUCCESS;
+    const bool result = (thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, (thread_policy_t)&policy, 1) == KERN_SUCCESS);
+    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    return result;
 }
 #endif

--- a/src/base/kernel/Platform_unix.cpp
+++ b/src/base/kernel/Platform_unix.cpp
@@ -4,8 +4,8 @@
 * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
 #include <sys/resource.h>
 #include <unistd.h>
 #include <uv.h>
+#include <thread>


 #include "base/kernel/Platform.h"
@@ -92,10 +93,13 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
    CPU_SET(cpu_id, &mn);

 #   ifndef __ANDROID__
-    return pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &mn) == 0;
+    const bool result = (pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &mn) == 0);
 #   else
-    return sched_setaffinity(gettid(), sizeof(cpu_set_t), &mn) == 0;
+    const bool result = (sched_setaffinity(gettid(), sizeof(cpu_set_t), &mn) == 0);
 #   endif
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    return result;
 }
 #endif

--- a/src/base/kernel/Platform_win.cpp
+++ b/src/base/kernel/Platform_win.cpp
@@ -4,9 +4,8 @@
 * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018      SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -98,7 +97,9 @@ bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
        LOG_ERR("Unable to set affinity. Windows supports only affinity up to 63.");
    }

-    return SetThreadAffinityMask(GetCurrentThread(), 1ULL << cpu_id) != 0;
+    const bool result = (SetThreadAffinityMask(GetCurrentThread(), 1ULL << cpu_id) != 0);
+    Sleep(1);
+    return result;
 }
 #endif

--- a/src/base/kernel/config/BaseConfig.cpp
+++ b/src/base/kernel/config/BaseConfig.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -47,6 +47,28 @@
 #endif


+namespace xmrig {
+
+
+const char *BaseConfig::kApi            = "api";
+const char *BaseConfig::kApiId          = "id";
+const char *BaseConfig::kApiWorkerId    = "worker-id";
+const char *BaseConfig::kAutosave       = "autosave";
+const char *BaseConfig::kBackground     = "background";
+const char *BaseConfig::kColors         = "colors";
+const char *BaseConfig::kDryRun         = "dry-run";
+const char *BaseConfig::kHttp           = "http";
+const char *BaseConfig::kLogFile        = "log-file";
+const char *BaseConfig::kPrintTime      = "print-time";
+const char *BaseConfig::kSyslog         = "syslog";
+const char *BaseConfig::kUserAgent      = "user-agent";
+const char *BaseConfig::kVerbose        = "verbose";
+const char *BaseConfig::kWatch          = "watch";
+
+
+} // namespace xmrig
+
+
 bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
 {
    m_fileName = fileName;
@@ -55,26 +77,25 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName)
        return false;
    }

-    m_autoSave     = reader.getBool("autosave", m_autoSave);
-    m_background   = reader.getBool("background", m_background);
-    m_dryRun       = reader.getBool("dry-run", m_dryRun);
-    m_syslog       = reader.getBool("syslog", m_syslog);
-    m_watch        = reader.getBool("watch", m_watch);
-    m_logFile      = reader.getString("log-file");
-    m_userAgent    = reader.getString("user-agent");
-    m_version      = reader.getUint("version");
+    m_autoSave     = reader.getBool(kAutosave, m_autoSave);
+    m_background   = reader.getBool(kBackground, m_background);
+    m_dryRun       = reader.getBool(kDryRun, m_dryRun);
+    m_syslog       = reader.getBool(kSyslog, m_syslog);
+    m_watch        = reader.getBool(kWatch, m_watch);
+    m_logFile      = reader.getString(kLogFile);
+    m_userAgent    = reader.getString(kUserAgent);

-    Log::setColors(reader.getBool("colors", Log::isColors()));
-    setPrintTime(reader.getUint("print-time", 60));
-    setVerbose(reader.getValue("verbose"));
+    Log::setColors(reader.getBool(kColors, Log::isColors()));
+    setPrintTime(reader.getUint(kPrintTime, 60));
+    setVerbose(reader.getValue(kVerbose));

-    const rapidjson::Value &api = reader.getObject("api");
+    const rapidjson::Value &api = reader.getObject(kApi);
    if (api.IsObject()) {
-        m_apiId       = Json::getString(api, "id");
-        m_apiWorkerId = Json::getString(api, "worker-id");
+        m_apiId       = Json::getString(api, kApiId);
+        m_apiWorkerId = Json::getString(api, kApiWorkerId);
    }

-    m_http.load(reader.getObject("http"));
+    m_http.load(reader.getObject(kHttp));
    m_pools.load(reader);

    return m_pools.active() > 0;
--- a/src/base/kernel/config/BaseConfig.h
+++ b/src/base/kernel/config/BaseConfig.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -40,6 +40,21 @@ class IJsonReader;
 class BaseConfig : public IConfig
 {
 public:
+    static const char *kApi;
+    static const char *kApiId;
+    static const char *kApiWorkerId;
+    static const char *kAutosave;
+    static const char *kBackground;
+    static const char *kColors;
+    static const char *kDryRun;
+    static const char *kHttp;
+    static const char *kLogFile;
+    static const char *kPrintTime;
+    static const char *kSyslog;
+    static const char *kUserAgent;
+    static const char *kVerbose;
+    static const char *kWatch;
+
    BaseConfig() = default;

    inline bool isAutoSave() const                 { return m_autoSave; }
@@ -78,7 +93,6 @@ protected:
    String m_logFile;
    String m_userAgent;
    uint32_t m_printTime = 60;
-    uint32_t m_version   = 0;

 private:
    inline void setPrintTime(uint32_t printTime) { if (printTime <= 3600) { m_printTime = printTime; } }
--- a/src/base/kernel/config/BaseTransform.cpp
+++ b/src/base/kernel/config/BaseTransform.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -33,27 +33,17 @@
 #endif


+#include "base/kernel/config/BaseTransform.h"
 #include "base/io/json/JsonChain.h"
 #include "base/io/log/Log.h"
-#include "base/kernel/config/BaseTransform.h"
+#include "base/kernel/config/BaseConfig.h"
 #include "base/kernel/interfaces/IConfig.h"
 #include "base/kernel/Process.h"
 #include "base/net/stratum/Pool.h"
+#include "base/net/stratum/Pools.h"
 #include "core/config/Config_platform.h"


-namespace xmrig
-{
-
-static const char *kAlgo  = "algo";
-static const char *kApi   = "api";
-static const char *kCoin  = "coin";
-static const char *kHttp  = "http";
-static const char *kPools = "pools";
-
-} // namespace xmrig
-
-
 void xmrig::BaseTransform::load(JsonChain &chain, Process *process, IConfigTransform &transform)
 {
    using namespace rapidjson;
@@ -95,26 +85,26 @@ void xmrig::BaseTransform::finalize(rapidjson::Document &doc)
    using namespace rapidjson;
    auto &allocator = doc.GetAllocator();

-    if (m_algorithm.isValid() && doc.HasMember(kPools)) {
-        auto &pools = doc[kPools];
+    if (m_algorithm.isValid() && doc.HasMember(Pools::kPools)) {
+        auto &pools = doc[Pools::kPools];
        for (Value &pool : pools.GetArray()) {
-            if (!pool.HasMember(kAlgo)) {
-                pool.AddMember(StringRef(kAlgo), m_algorithm.toJSON(), allocator);
+            if (!pool.HasMember(Pool::kAlgo)) {
+                pool.AddMember(StringRef(Pool::kAlgo), m_algorithm.toJSON(), allocator);
            }
        }
    }

-    if (m_coin.isValid() && doc.HasMember(kPools)) {
-        auto &pools = doc[kPools];
+    if (m_coin.isValid() && doc.HasMember(Pools::kPools)) {
+        auto &pools = doc[Pools::kPools];
        for (Value &pool : pools.GetArray()) {
-            if (!pool.HasMember(kCoin)) {
-                pool.AddMember(StringRef(kCoin), m_coin.toJSON(), allocator);
+            if (!pool.HasMember(Pool::kCoin)) {
+                pool.AddMember(StringRef(Pool::kCoin), m_coin.toJSON(), allocator);
            }
        }
    }

    if (m_http) {
-        set(doc, kHttp, "enabled", true);
+        set(doc, BaseConfig::kHttp, Http::kEnabled, true);
    }
 }

@@ -123,20 +113,20 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
 {
    switch (key) {
    case IConfig::AlgorithmKey: /* --algo */
-        if (!doc.HasMember(kPools)) {
+        if (!doc.HasMember(Pools::kPools)) {
            m_algorithm = arg;
        }
        else {
-            return add(doc, kPools, kAlgo, arg);
+            return add(doc, Pools::kPools, Pool::kAlgo, arg);
        }
        break;

    case IConfig::CoinKey: /* --coin */
-        if (!doc.HasMember(kPools)) {
+        if (!doc.HasMember(Pools::kPools)) {
            m_coin = arg;
        }
        else {
-            return add(doc, kPools, kCoin, arg);
+            return add(doc, Pools::kPools, Pool::kCoin, arg);
        }
        break;

@@ -150,61 +140,61 @@ void xmrig::BaseTransform::transform(rapidjson::Document &doc, int key, const ch
            char *user = new char[p - arg + 1]();
            strncpy(user, arg, static_cast<size_t>(p - arg));

-            add<const char *>(doc, kPools, "user", user);
-            add(doc, kPools, "pass", p + 1);
+            add<const char *>(doc, Pools::kPools, Pool::kUser, user);
+            add(doc, Pools::kPools, Pool::kPass, p + 1);
            delete [] user;
        }
        break;

    case IConfig::UrlKey: /* --url */
    {
-        if (!doc.HasMember(kPools)) {
-            doc.AddMember(rapidjson::StringRef(kPools), rapidjson::kArrayType, doc.GetAllocator());
+        if (!doc.HasMember(Pools::kPools)) {
+            doc.AddMember(rapidjson::StringRef(Pools::kPools), rapidjson::kArrayType, doc.GetAllocator());
        }

-        rapidjson::Value &array = doc[kPools];
+        rapidjson::Value &array = doc[Pools::kPools];
        if (array.Size() == 0 || Pool(array[array.Size() - 1]).isValid()) {
            array.PushBack(rapidjson::kObjectType, doc.GetAllocator());
        }

-        set(doc, array[array.Size() - 1], "url", arg);
+        set(doc, array[array.Size() - 1], Pool::kUrl, arg);
        break;
    }

    case IConfig::UserKey: /* --user */
-        return add(doc, kPools, "user", arg);
+        return add(doc, Pools::kPools, Pool::kUser, arg);

    case IConfig::PasswordKey: /* --pass */
-        return add(doc, kPools, "pass", arg);
+        return add(doc, Pools::kPools, Pool::kPass, arg);

    case IConfig::RigIdKey: /* --rig-id */
-        return add(doc, kPools, "rig-id", arg);
+        return add(doc, Pools::kPools, Pool::kRigId, arg);

    case IConfig::FingerprintKey: /* --tls-fingerprint */
-        return add(doc, kPools, "tls-fingerprint", arg);
+        return add(doc, Pools::kPools, Pool::kFingerprint, arg);

    case IConfig::SelfSelectKey: /* --self-select */
-        return add(doc, kPools, "self-select", arg);
+        return add(doc, Pools::kPools, Pool::kSelfSelect, arg);

    case IConfig::LogFileKey: /* --log-file */
-        return set(doc, "log-file", arg);
+        return set(doc, BaseConfig::kLogFile, arg);

    case IConfig::HttpAccessTokenKey: /* --http-access-token */
        m_http = true;
-        return set(doc, kHttp, "access-token", arg);
+        return set(doc, BaseConfig::kHttp, Http::kToken, arg);

    case IConfig::HttpHostKey: /* --http-host */
        m_http = true;
-        return set(doc, kHttp, "host", arg);
+        return set(doc, BaseConfig::kHttp, Http::kHost, arg);

    case IConfig::ApiWorkerIdKey: /* --api-worker-id */
-        return set(doc, kApi, "worker-id", arg);
+        return set(doc, BaseConfig::kApi, BaseConfig::kApiWorkerId, arg);

    case IConfig::ApiIdKey: /* --api-id */
-        return set(doc, kApi, "id", arg);
+        return set(doc, BaseConfig::kApi, BaseConfig::kApiId, arg);

    case IConfig::UserAgentKey: /* --user-agent */
-        return set(doc, "user-agent", arg);
+        return set(doc, BaseConfig::kUserAgent, arg);

    case IConfig::RetriesKey:     /* --retries */
    case IConfig::RetryPauseKey:  /* --retry-pause */
@@ -239,43 +229,43 @@ void xmrig::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, b
 {
    switch (key) {
    case IConfig::BackgroundKey: /* --background */
-        return set(doc, "background", enable);
+        return set(doc, BaseConfig::kBackground, enable);

    case IConfig::SyslogKey: /* --syslog */
-        return set(doc, "syslog", enable);
+        return set(doc, BaseConfig::kSyslog, enable);

    case IConfig::KeepAliveKey: /* --keepalive */
-        return add(doc, kPools, "keepalive", enable);
+        return add(doc, Pools::kPools, Pool::kKeepalive, enable);

    case IConfig::TlsKey: /* --tls */
-        return add(doc, kPools, "tls", enable);
+        return add(doc, Pools::kPools, Pool::kTls, enable);

 #   ifdef XMRIG_FEATURE_HTTP
    case IConfig::DaemonKey: /* --daemon */
-        return add(doc, kPools, "daemon", enable);
+        return add(doc, Pools::kPools, Pool::kDaemon, enable);
 #   endif

 #   ifndef XMRIG_PROXY_PROJECT
    case IConfig::NicehashKey: /* --nicehash */
-        return add<bool>(doc, kPools, "nicehash", enable);
+        return add<bool>(doc, Pools::kPools, Pool::kNicehash, enable);
 #   endif

    case IConfig::ColorKey: /* --no-color */
-        return set(doc, "colors", enable);
+        return set(doc, BaseConfig::kColors, enable);

    case IConfig::HttpRestrictedKey: /* --http-no-restricted */
        m_http = true;
-        return set(doc, kHttp, "restricted", enable);
+        return set(doc, BaseConfig::kHttp, Http::kRestricted, enable);

    case IConfig::HttpEnabledKey: /* --http-enabled */
        m_http = true;
        break;

    case IConfig::DryRunKey: /* --dry-run */
-        return set(doc, "dry-run", enable);
+        return set(doc, BaseConfig::kDryRun, enable);

    case IConfig::VerboseKey: /* --verbose */
-        return set(doc, "verbose", enable);
+        return set(doc, BaseConfig::kVerbose, enable);

    default:
        break;
@@ -287,27 +277,27 @@ void xmrig::BaseTransform::transformUint64(rapidjson::Document &doc, int key, ui
 {
    switch (key) {
    case IConfig::RetriesKey: /* --retries */
-        return set(doc, "retries", arg);
+        return set(doc, Pools::kRetries, arg);

    case IConfig::RetryPauseKey: /* --retry-pause */
-        return set(doc, "retry-pause", arg);
+        return set(doc, Pools::kRetryPause, arg);

    case IConfig::DonateLevelKey: /* --donate-level */
-        return set(doc, "donate-level", arg);
+        return set(doc, Pools::kDonateLevel, arg);

    case IConfig::ProxyDonateKey: /* --donate-over-proxy */
-        return set(doc, "donate-over-proxy", arg);
+        return set(doc, Pools::kDonateOverProxy, arg);

    case IConfig::HttpPort: /* --http-port */
        m_http = true;
-        return set(doc, kHttp, "port", arg);
+        return set(doc, BaseConfig::kHttp, Http::kPort, arg);

    case IConfig::PrintTimeKey: /* --print-time */
-        return set(doc, "print-time", arg);
+        return set(doc, BaseConfig::kPrintTime, arg);

 #   ifdef XMRIG_FEATURE_HTTP
    case IConfig::DaemonPollKey:  /* --daemon-poll-interval */
-        return add(doc, kPools, "daemon-poll-interval", arg);
+        return add(doc, Pools::kPools, Pool::kDaemonPollInterval, arg);
 #   endif

    default:
--- a/src/base/kernel/config/BaseTransform.h
+++ b/src/base/kernel/config/BaseTransform.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/base/kernel/interfaces/IConfig.h
+++ b/src/base/kernel/interfaces/IConfig.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -115,6 +115,7 @@ public:
        AccessLogFileKey     = 'A',
        BindKey              = 'b',
        CustomDiffKey        = 1102,
+        CustomDiffStatsKey   = 1104,
        DebugKey             = 1101,
        ModeKey              = 'm',
        PoolCoinKey          = 'C',
--- a/src/base/net/http/Http.cpp
+++ b/src/base/net/http/Http.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,12 +30,14 @@

 namespace xmrig {

-static const char *kEnabled    = "enabled";
-static const char *kHost       = "host";
-static const char *kLocalhost  = "127.0.0.1";
-static const char *kPort       = "port";
-static const char *kRestricted = "restricted";
-static const char *kToken      = "access-token";
+
+const char *Http::kEnabled    = "enabled";
+const char *Http::kHost       = "host";
+const char *Http::kLocalhost  = "127.0.0.1";
+const char *Http::kPort       = "port";
+const char *Http::kRestricted = "restricted";
+const char *Http::kToken      = "access-token";
+

 }

--- a/src/base/net/http/Http.h
+++ b/src/base/net/http/Http.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -36,6 +36,13 @@ namespace xmrig {
 class Http
 {
 public:
+    static const char *kEnabled;
+    static const char *kHost;
+    static const char *kLocalhost;
+    static const char *kPort;
+    static const char *kRestricted;
+    static const char *kToken;
+
    Http();

    inline bool isAuthRequired() const         { return !m_restricted || !m_token.isNull(); }
--- a/src/base/net/stratum/Pool.cpp
+++ b/src/base/net/stratum/Pool.cpp
@@ -5,9 +5,9 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
 * Copyright 2019      Howard Chu  <https://github.com/hyc>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -47,23 +47,26 @@

 namespace xmrig {

-static const char *kAlgo                   = "algo";
-static const char *kCoin                   = "coin";
-static const char *kDaemon                 = "daemon";
-static const char *kDaemonPollInterval     = "daemon-poll-interval";
-static const char *kEnabled                = "enabled";
-static const char *kFingerprint            = "tls-fingerprint";
-static const char *kKeepalive              = "keepalive";
-static const char *kNicehash               = "nicehash";
-static const char *kPass                   = "pass";
-static const char *kRigId                  = "rig-id";
-static const char *kSelfSelect             = "self-select";
-static const char *kTls                    = "tls";
-static const char *kUrl                    = "url";
-static const char *kUser                   = "user";

-const String Pool::kDefaultPassword        = "x";
-const String Pool::kDefaultUser            = "x";
+const String Pool::kDefaultPassword       = "x";
+const String Pool::kDefaultUser           = "x";
+
+
+const char *Pool::kAlgo                   = "algo";
+const char *Pool::kCoin                   = "coin";
+const char *Pool::kDaemon                 = "daemon";
+const char *Pool::kDaemonPollInterval     = "daemon-poll-interval";
+const char *Pool::kEnabled                = "enabled";
+const char *Pool::kFingerprint            = "tls-fingerprint";
+const char *Pool::kKeepalive              = "keepalive";
+const char *Pool::kNicehash               = "nicehash";
+const char *Pool::kPass                   = "pass";
+const char *Pool::kRigId                  = "rig-id";
+const char *Pool::kSelfSelect             = "self-select";
+const char *Pool::kTls                    = "tls";
+const char *Pool::kUrl                    = "url";
+const char *Pool::kUser                   = "user";
+

 }

--- a/src/base/net/stratum/Pool.h
+++ b/src/base/net/stratum/Pool.h
@@ -5,9 +5,9 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
 * Copyright 2019      Howard Chu  <https://github.com/hyc>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -55,6 +55,21 @@ public:
    static const String kDefaultPassword;
    static const String kDefaultUser;

+    static const char *kAlgo;
+    static const char *kCoin;
+    static const char *kDaemon;
+    static const char *kDaemonPollInterval;
+    static const char *kEnabled;
+    static const char *kFingerprint;
+    static const char *kKeepalive;
+    static const char *kNicehash;
+    static const char *kPass;
+    static const char *kRigId;
+    static const char *kSelfSelect;
+    static const char *kTls;
+    static const char *kUrl;
+    static const char *kUser;
+
    constexpr static int kKeepAliveTimeout         = 60;
    constexpr static uint16_t kDefaultPort         = 3333;
    constexpr static uint64_t kDefaultPollInterval = 1000;
--- a/src/base/net/stratum/Pools.cpp
+++ b/src/base/net/stratum/Pools.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -23,20 +23,30 @@
 */


+#include "base/net/stratum/Pools.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IJsonReader.h"
-#include "base/net/stratum/Pools.h"
 #include "base/net/stratum/strategies/FailoverStrategy.h"
 #include "base/net/stratum/strategies/SinglePoolStrategy.h"
 #include "donate.h"
 #include "rapidjson/document.h"


+namespace xmrig {
+
+
+const char *Pools::kDonateLevel     = "donate-level";
+const char *Pools::kDonateOverProxy = "donate-over-proxy";
+const char *Pools::kPools           = "pools";
+const char *Pools::kRetries         = "retries";
+const char *Pools::kRetryPause      = "retry-pause";
+
+
+} // namespace xmrig
+
+
 xmrig::Pools::Pools() :
-    m_donateLevel(kDefaultDonateLevel),
-    m_retries(5),
-    m_retryPause(5),
-    m_proxyDonate(PROXY_DONATE_AUTO)
+    m_donateLevel(kDefaultDonateLevel)
 {
 #   ifdef XMRIG_PROXY_PROJECT
    m_retries    = 2;
@@ -108,7 +118,7 @@ void xmrig::Pools::load(const IJsonReader &reader)
 {
    m_data.clear();

-    const rapidjson::Value &pools = reader.getArray("pools");
+    const rapidjson::Value &pools = reader.getArray(kPools);
    if (!pools.IsArray()) {
        return;
    }
@@ -124,10 +134,10 @@ void xmrig::Pools::load(const IJsonReader &reader)
        }
    }

-    setDonateLevel(reader.getInt("donate-level", kDefaultDonateLevel));
-    setProxyDonate(reader.getInt("donate-over-proxy", PROXY_DONATE_AUTO));
-    setRetries(reader.getInt("retries"));
-    setRetryPause(reader.getInt("retry-pause"));
+    setDonateLevel(reader.getInt(kDonateLevel, kDefaultDonateLevel));
+    setProxyDonate(reader.getInt(kDonateOverProxy, PROXY_DONATE_AUTO));
+    setRetries(reader.getInt(kRetries));
+    setRetryPause(reader.getInt(kRetryPause));
 }


--- a/src/base/net/stratum/Pools.h
+++ b/src/base/net/stratum/Pools.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -43,6 +43,12 @@ class IStrategyListener;
 class Pools
 {
 public:
+    static const char *kDonateLevel;
+    static const char *kDonateOverProxy;
+    static const char *kPools;
+    static const char *kRetries;
+    static const char *kRetryPause;
+
    enum ProxyDonate {
        PROXY_DONATE_NONE,
        PROXY_DONATE_AUTO,
@@ -74,9 +80,9 @@ private:
    void setRetryPause(int retryPause);

    int m_donateLevel;
-    int m_retries;
-    int m_retryPause;
-    ProxyDonate m_proxyDonate;
+    int m_retries               = 5;
+    int m_retryPause            = 5;
+    ProxyDonate m_proxyDonate   = PROXY_DONATE_AUTO;
    std::vector<Pool> m_data;
 };

--- a/src/core/Miner.cpp
+++ b/src/core/Miner.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -123,6 +123,10 @@ public:

    inline void handleJobChange()
    {
+        if (!enabled) {
+            Nonce::pause(true);
+        }
+
        active = true;

        if (reset) {
@@ -136,7 +140,7 @@ public:
        Nonce::touch();

        if (enabled) {
-            Nonce::pause(false);;
+            Nonce::pause(false);
        }

        if (ticks == 0) {
--- a/src/core/Miner.h
+++ b/src/core/Miner.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/core/config/Config.cpp
+++ b/src/core/config/Config.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -211,41 +211,41 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const
    auto &allocator = doc.GetAllocator();

    Value api(kObjectType);
-    api.AddMember("id",                m_apiId.toJSON(), allocator);
-    api.AddMember("worker-id",         m_apiWorkerId.toJSON(), allocator);
+    api.AddMember(StringRef(kApiId),                m_apiId.toJSON(), allocator);
+    api.AddMember(StringRef(kApiWorkerId),              m_apiWorkerId.toJSON(), allocator);

-    doc.AddMember("api",               api, allocator);
-    doc.AddMember("http",              m_http.toJSON(doc), allocator);
-    doc.AddMember("autosave",          isAutoSave(), allocator);
-    doc.AddMember("background",        isBackground(), allocator);
-    doc.AddMember("colors",            Log::isColors(), allocator);
+    doc.AddMember(StringRef(kApi),                      api, allocator);
+    doc.AddMember(StringRef(kHttp),                     m_http.toJSON(doc), allocator);
+    doc.AddMember(StringRef(kAutosave),                 isAutoSave(), allocator);
+    doc.AddMember(StringRef(kBackground),               isBackground(), allocator);
+    doc.AddMember(StringRef(kColors),                   Log::isColors(), allocator);

 #   ifdef XMRIG_ALGO_RANDOMX
-    doc.AddMember(StringRef(kRandomX), rx().toJSON(doc), allocator);
+    doc.AddMember(StringRef(kRandomX),                  rx().toJSON(doc), allocator);
 #   endif

-    doc.AddMember(StringRef(kCPU),     cpu().toJSON(doc), allocator);
+    doc.AddMember(StringRef(kCPU),                      cpu().toJSON(doc), allocator);

 #   ifdef XMRIG_FEATURE_OPENCL
-    doc.AddMember(StringRef(kOcl),     cl().toJSON(doc), allocator);
+    doc.AddMember(StringRef(kOcl),                      cl().toJSON(doc), allocator);
 #   endif

 #   ifdef XMRIG_FEATURE_CUDA
-    doc.AddMember(StringRef(kCuda),    cuda().toJSON(doc), allocator);
+    doc.AddMember(StringRef(kCuda),                     cuda().toJSON(doc), allocator);
 #   endif

-    doc.AddMember("donate-level",               m_pools.donateLevel(), allocator);
-    doc.AddMember("donate-over-proxy",          m_pools.proxyDonate(), allocator);
-    doc.AddMember("log-file",                   m_logFile.toJSON(), allocator);
-    doc.AddMember("pools",                      m_pools.toJSON(doc), allocator);
-    doc.AddMember("print-time",                 printTime(), allocator);
+    doc.AddMember(StringRef(Pools::kDonateLevel),       m_pools.donateLevel(), allocator);
+    doc.AddMember(StringRef(Pools::kDonateOverProxy),   m_pools.proxyDonate(), allocator);
+    doc.AddMember(StringRef(kLogFile),                  m_logFile.toJSON(), allocator);
+    doc.AddMember(StringRef(Pools::kPools),             m_pools.toJSON(doc), allocator);
+    doc.AddMember(StringRef(kPrintTime),                printTime(), allocator);
 #   if defined(XMRIG_FEATURE_NVML)
-    doc.AddMember(StringRef(kHealthPrintTime),  healthPrintTime(), allocator);
+    doc.AddMember(StringRef(kHealthPrintTime),          healthPrintTime(), allocator);
 #   endif
-    doc.AddMember("retries",                    m_pools.retries(), allocator);
-    doc.AddMember("retry-pause",                m_pools.retryPause(), allocator);
-    doc.AddMember("syslog",                     isSyslog(), allocator);
-    doc.AddMember("user-agent",                 m_userAgent.toJSON(), allocator);
-    doc.AddMember("verbose",                    Log::verbose(), allocator);
-    doc.AddMember("watch",                      m_watch, allocator);
+    doc.AddMember(StringRef(Pools::kRetries),           m_pools.retries(), allocator);
+    doc.AddMember(StringRef(Pools::kRetryPause),        m_pools.retryPause(), allocator);
+    doc.AddMember(StringRef(kSyslog),                   isSyslog(), allocator);
+    doc.AddMember(StringRef(kUserAgent),                m_userAgent.toJSON(), allocator);
+    doc.AddMember(StringRef(kVerbose),                  Log::verbose(), allocator);
+    doc.AddMember(StringRef(kWatch),                    m_watch, allocator);
 }
--- a/src/crypto/common/VirtualMemory.cpp
+++ b/src/crypto/common/VirtualMemory.cpp
@@ -6,9 +6,9 @@
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
 * Copyright 2018-2019 tevador     <tevador@gmail.com>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -46,9 +46,6 @@ namespace xmrig {
 static IMemoryPool *pool = nullptr;
 static std::mutex mutex;

-constexpr size_t twoMiB = 2U * 1024U * 1024U;
-constexpr size_t oneGiB = 1024U * 1024U * 1024U;
-
 } // namespace xmrig


--- a/src/crypto/common/VirtualMemory.h
+++ b/src/crypto/common/VirtualMemory.h
@@ -6,9 +6,9 @@
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
 * Copyright 2018-2019 tevador     <tevador@gmail.com>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/crypto/randomx/asm/program_epilogue_store.inc
+++ b/src/crypto/randomx/asm/program_epilogue_store.inc
@@ -1,5 +1,5 @@
 	;# save VM register values
-	add rsp, 24
+	add rsp, 40
 	pop rcx
 	mov qword ptr [rcx+0], r8
 	mov qword ptr [rcx+8], r9
--- a/src/crypto/randomx/asm/program_loop_load.inc
+++ b/src/crypto/randomx/asm/program_loop_load.inc
@@ -1,5 +1,5 @@
 	lea rcx, [rsi+rax]
-	mov [rsp+8], rcx
+	mov [rsp+16], rcx
 	xor r8,  qword ptr [rcx+0]
 	xor r9,  qword ptr [rcx+8]
 	xor r10, qword ptr [rcx+16]
@@ -9,7 +9,7 @@
 	xor r14, qword ptr [rcx+48]
 	xor r15, qword ptr [rcx+56]
 	lea rcx, [rsi+rdx]
-	mov [rsp+16], rcx
+	mov [rsp+24], rcx
 	cvtdq2pd xmm0, qword ptr [rcx+0]
 	cvtdq2pd xmm1, qword ptr [rcx+8]
 	cvtdq2pd xmm2, qword ptr [rcx+16]
@@ -18,11 +18,11 @@
 	cvtdq2pd xmm5, qword ptr [rcx+40]
 	cvtdq2pd xmm6, qword ptr [rcx+48]
 	cvtdq2pd xmm7, qword ptr [rcx+56]
-	andps xmm4, xmm13
-	andps xmm5, xmm13
-	andps xmm6, xmm13
-	andps xmm7, xmm13
-	orps xmm4, xmm14
-	orps xmm5, xmm14
-	orps xmm6, xmm14
-	orps xmm7, xmm14
+	andpd xmm4, xmm13
+	andpd xmm5, xmm13
+	andpd xmm6, xmm13
+	andpd xmm7, xmm13
+	orpd xmm4, xmm14
+	orpd xmm5, xmm14
+	orpd xmm6, xmm14
+	orpd xmm7, xmm14
--- a/src/crypto/randomx/asm/program_loop_load_xop.inc
+++ b/src/crypto/randomx/asm/program_loop_load_xop.inc
@@ -0,0 +1,24 @@
+	lea rcx, [rsi+rax]
+	mov [rsp+8], rcx
+	xor r8,  qword ptr [rcx+0]
+	xor r9,  qword ptr [rcx+8]
+	xor r10, qword ptr [rcx+16]
+	xor r11, qword ptr [rcx+24]
+	xor r12, qword ptr [rcx+32]
+	xor r13, qword ptr [rcx+40]
+	xor r14, qword ptr [rcx+48]
+	xor r15, qword ptr [rcx+56]
+	lea rcx, [rsi+rdx]
+	mov [rsp+16], rcx
+	cvtdq2pd xmm0, qword ptr [rcx+0]
+	cvtdq2pd xmm1, qword ptr [rcx+8]
+	cvtdq2pd xmm2, qword ptr [rcx+16]
+	cvtdq2pd xmm3, qword ptr [rcx+24]
+	cvtdq2pd xmm4, qword ptr [rcx+32]
+	cvtdq2pd xmm5, qword ptr [rcx+40]
+	cvtdq2pd xmm6, qword ptr [rcx+48]
+	cvtdq2pd xmm7, qword ptr [rcx+56]
+	vpcmov xmm4, xmm4, xmm14, xmm13
+	vpcmov xmm5, xmm5, xmm14, xmm13
+	vpcmov xmm6, xmm6, xmm14, xmm13
+	vpcmov xmm7, xmm7, xmm14, xmm13
--- a/src/crypto/randomx/asm/program_loop_store.inc
+++ b/src/crypto/randomx/asm/program_loop_store.inc
@@ -1,4 +1,4 @@
-	mov rcx, [rsp+16]
+	mov rcx, [rsp+24]
 	mov qword ptr [rcx+0], r8
 	mov qword ptr [rcx+8], r9
 	mov qword ptr [rcx+16], r10
@@ -7,7 +7,7 @@
 	mov qword ptr [rcx+40], r13
 	mov qword ptr [rcx+48], r14
 	mov qword ptr [rcx+56], r15
-	mov rcx, [rsp+8]
+	mov rcx, [rsp+16]
 	xorpd xmm0, xmm4
 	xorpd xmm1, xmm5
 	xorpd xmm2, xmm6
--- a/src/crypto/randomx/asm/program_xmm_constants.inc
+++ b/src/crypto/randomx/asm/program_xmm_constants.inc
@@ -1,5 +1,5 @@
 mantissaMask:
-	db 255, 255, 255, 255, 255, 255, 255, 0, 255, 255, 255, 255, 255, 255, 255, 0
+	db 0, 0, 192, 255, 255, 255, 255, 0, 0, 0, 192, 255, 255, 255, 255, 0
 exp240:
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 scaleMask:
--- a/src/crypto/randomx/jit_compiler_x86.cpp
+++ b/src/crypto/randomx/jit_compiler_x86.cpp
@@ -89,6 +89,7 @@ namespace randomx {
 	const uint8_t* codePrologue = (uint8_t*)&randomx_program_prologue;
 	const uint8_t* codeLoopBegin = (uint8_t*)&randomx_program_loop_begin;
 	const uint8_t* codeLoopLoad = (uint8_t*)&randomx_program_loop_load;
+	const uint8_t* codeLoopLoadXOP = (uint8_t*)&randomx_program_loop_load_xop;
 	const uint8_t* codeProgamStart = (uint8_t*)&randomx_program_start;
 	const uint8_t* codeReadDatasetLightSshInit = (uint8_t*)&randomx_program_read_dataset_sshash_init;
 	const uint8_t* codeReadDatasetLightSshFin = (uint8_t*)&randomx_program_read_dataset_sshash_fin;
@@ -104,7 +105,8 @@ namespace randomx {

 	const int32_t prefetchScratchpadSize = codePrefetchScratchpadEnd - codePrefetchScratchpad;
 	const int32_t prologueSize = codeLoopBegin - codePrologue;
-	const int32_t loopLoadSize = codeProgamStart - codeLoopLoad;
+	const int32_t loopLoadSize = codeLoopLoadXOP - codeLoopLoad;
+	const int32_t loopLoadXOPSize = codeProgamStart - codeLoopLoadXOP;
 	const int32_t readDatasetLightInitSize = codeReadDatasetLightSshFin - codeReadDatasetLightSshInit;
 	const int32_t readDatasetLightFinSize = codeLoopStore - codeReadDatasetLightSshFin;
 	const int32_t loopStoreSize = codeLoopEnd - codeLoopStore;
@@ -184,6 +186,7 @@ namespace randomx {
 	static const uint8_t REX_XOR_RAX_R64[] = { 0x49, 0x33 };
 	static const uint8_t REX_XCHG[] = { 0x4d, 0x87 };
 	static const uint8_t REX_ANDPS_XMM12[] = { 0x45, 0x0F, 0x54, 0xE5, 0x45, 0x0F, 0x56, 0xE6 };
+	static const uint8_t REX_VPCMOV_XMM12[] = { 0x8F, 0x48, 0x18, 0xA2, 0xE6, 0xD0 };
 	static const uint8_t REX_PADD[] = { 0x66, 0x44, 0x0f };
 	static const uint8_t PADD_OPCODES[] = { 0xfc, 0xfd, 0xfe, 0xd4 };
 	static const uint8_t CALL = 0xe8;
@@ -295,11 +298,27 @@ namespace randomx {
 		cpuid(1, info);
 		hasAVX = ((info[2] & (1 << 27)) != 0) && ((info[2] & (1 << 28)) != 0);

+		cpuid(0x80000001, info);
+		hasXOP = ((info[2] & (1 << 11)) != 0);
+
 		allocatedCode = (uint8_t*)allocExecutableMemory(CodeSize * 2);
 		// Shift code base address to improve caching - all threads will use different L2/L3 cache sets
 		code = allocatedCode + (codeOffset.fetch_add(59 * 64) % CodeSize);
 		memcpy(code, codePrologue, prologueSize);
+		if (hasXOP) {
+			memcpy(code + prologueSize, codeLoopLoadXOP, loopLoadXOPSize);
+		}
+		else {
+			memcpy(code + prologueSize, codeLoopLoad, loopLoadSize);
+		}
 		memcpy(code + epilogueOffset, codeEpilogue, epilogueSize);
+
+		codePosFirst = prologueSize + (hasXOP ? loopLoadXOPSize : loopLoadSize);
+
+#		ifdef XMRIG_FIX_RYZEN
+		mainLoopBounds.first = code + prologueSize;
+		mainLoopBounds.second = code + epilogueOffset;
+#		endif
 	}

 	JitCompilerX86::~JitCompilerX86() {
@@ -313,7 +332,7 @@ namespace randomx {

 		uint8_t* p;
 		uint32_t n;
-		if (flags & RANDOMX_FLAG_RYZEN) {
+		if (flags & RANDOMX_FLAG_AMD) {
 			p = RandomX_CurrentConfig.codeReadDatasetRyzenTweaked;
 			n = RandomX_CurrentConfig.codeReadDatasetRyzenTweakedSize;
 		}
@@ -381,18 +400,16 @@ namespace randomx {
 		*(uint32_t*)(code + codePos + 10) = RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated;
 		*(uint32_t*)(code + codePos + 20) = RandomX_CurrentConfig.ScratchpadL3Mask64_Calculated;
 		if (hasAVX) {
-			uint32_t* p = (uint32_t*)(code + codePos + 32);
+			uint32_t* p = (uint32_t*)(code + codePos + 67);
 			*p = (*p & 0xFF000000U) | 0x0077F8C5U;
 		}

 #		ifdef XMRIG_FIX_RYZEN
-		xmrig::Rx::setMainLoopBounds(code + prologueSize, code + epilogueOffset);
+		xmrig::Rx::setMainLoopBounds(mainLoopBounds);
 #		endif

-		codePos = prologueSize;
-		memcpy(code + codePos - 48, &pcfg.eMask, sizeof(pcfg.eMask));
-		memcpy(code + codePos, codeLoopLoad, loopLoadSize);
-		codePos += loopLoadSize;
+		memcpy(code + prologueSize - 48, &pcfg.eMask, sizeof(pcfg.eMask));
+		codePos = codePosFirst;

 		//mark all registers as used
 		uint64_t* r = (uint64_t*)registerUsage;
@@ -403,9 +420,10 @@ namespace randomx {
 		}

 		for (int i = 0, n = static_cast<int>(RandomX_CurrentConfig.ProgramSize); i < n; ++i) {
-			Instruction instr = prog(i);
+			Instruction& instr = prog(i);
+			const uint8_t opcode = instr.opcode;
 			*((uint64_t*)&instr) &= (uint64_t(-1) - (0xFFFF << 8)) | ((RegistersCount - 1) << 8) | ((RegistersCount - 1) << 16);
-			(this->*(engine[instr.opcode]))(instr);
+			(this->*(engine[opcode]))(instr);
 		}

 		emit(REX_MOV_RR, code, codePos);
@@ -601,32 +619,22 @@ namespace randomx {
 		codePos = pos;
 	}

-	static const uint32_t template_IADD_M[8] = {
-		0x0604034c,
-		0x060c034c,
-		0x0614034c,
-		0x061c034c,
-		0x0624034c,
-		0x062c034c,
-		0x0634034c,
-		0x063c034c,
-	};
-
 	void JitCompilerX86::h_IADD_M(const Instruction& instr) {
 		uint8_t* const p = code;
 		int pos = codePos;
 		
-		if (instr.src != instr.dst) {
+		const uint32_t dst = instr.dst;
+		if (instr.src != dst) {
 			genAddressReg<true>(instr, p, pos);
-			emit32(template_IADD_M[instr.dst], p, pos);
+			emit32(0x0604034c + (dst << 19), p, pos);
 		}
 		else {
 			emit(REX_ADD_RM, p, pos);
-			emitByte(0x86 + 8 * instr.dst, p, pos);
+			emitByte(0x86 + (dst << 3), p, pos);
 			genAddressImm(instr, p, pos);
 		}

-		registerUsage[instr.dst] = pos;
+		registerUsage[dst] = pos;
 		codePos = pos;
 	}

@@ -656,19 +664,18 @@ namespace randomx {
 		uint8_t* const p = code;
 		int pos = codePos;
 		
-		if (instr.src != instr.dst) {
+		const uint32_t dst = instr.dst;
+		if (instr.src != dst) {
 			genAddressReg<true>(instr, p, pos);
-			emit(REX_SUB_RM, p, pos);
-			emitByte(0x04 + 8 * instr.dst, p, pos);
-			emitByte(0x06, p, pos);
+			emit32(0x06042b4c + (dst << 19), p, pos);
 		}
 		else {
 			emit(REX_SUB_RM, p, pos);
-			emitByte(0x86 + 8 * instr.dst, p, pos);
+			emitByte(0x86 + (dst << 3), p, pos);
 			genAddressImm(instr, p, pos);
 		}

-		registerUsage[instr.dst] = pos;
+		registerUsage[dst] = pos;
 		codePos = pos;
 	}

@@ -714,14 +721,31 @@ namespace randomx {
 		uint8_t* const p = code;
 		int pos = codePos;

+		const uint32_t dst = instr.dst;
+
 		emit(REX_MOV_RR64, p, pos);
-		emitByte(0xc0 + instr.dst, p, pos);
+		emitByte(0xc0 + dst, p, pos);
 		emit(REX_MUL_R, p, pos);
 		emitByte(0xe0 + instr.src, p, pos);
 		emit(REX_MOV_R64R, p, pos);
-		emitByte(0xc2 + 8 * instr.dst, p, pos);
+		emitByte(0xc2 + 8 * dst, p, pos);

-		registerUsage[instr.dst] = pos;
+		registerUsage[dst] = pos;
+		codePos = pos;
+	}
+
+	void JitCompilerX86::h_IMULH_R_BMI2(const Instruction& instr) {
+		uint8_t* const p = code;
+		int pos = codePos;
+
+		const uint32_t src = instr.src;
+		const uint32_t dst = instr.dst;
+
+		*(uint32_t*)(p + pos) = 0xC4D08B49 + (dst << 16);
+		*(uint32_t*)(p + pos + 4) = 0xC0F6FB42 + (dst << 27) + (src << 24);
+		pos += 8;
+
+		registerUsage[dst] = pos;
 		codePos = pos;
 	}

@@ -749,6 +773,29 @@ namespace randomx {
 		codePos = pos;
 	}

+	void JitCompilerX86::h_IMULH_M_BMI2(const Instruction& instr) {
+		uint8_t* const p = code;
+		int pos = codePos;
+
+		const uint64_t src = instr.src;
+		const uint64_t dst = instr.dst;
+
+		if (src != dst) {
+			genAddressReg<false>(instr, p, pos);
+			*(uint32_t*)(p + pos) = static_cast<uint32_t>(0xC4D08B49 + (dst << 16));
+			*(uint64_t*)(p + pos + 4) = 0x0E04F6FB62ULL + (dst << 27);
+			pos += 9;
+		}
+		else {
+			*(uint64_t*)(p + pos) = 0x86F6FB62C4D08B49ULL + (dst << 16) + (dst << 59);
+			*(uint32_t*)(p + pos + 8) = instr.getImm32() & ScratchpadL3Mask;
+			pos += 12;
+		}
+
+		registerUsage[dst] = pos;
+		codePos = pos;
+	}
+
 	void JitCompilerX86::h_ISMULH_R(const Instruction& instr) {
 		uint8_t* const p = code;
 		int pos = codePos;
@@ -998,7 +1045,12 @@ namespace randomx {
 		const uint32_t dst = instr.dst % RegisterCountFlt;
 		genAddressReg<true>(instr, p, pos);
 		emit(REX_CVTDQ2PD_XMM12, p, pos);
-		emit(REX_ANDPS_XMM12, p, pos);
+		if (hasXOP) {
+			emit(REX_VPCMOV_XMM12, p, pos);
+		}
+		else {
+			emit(REX_ANDPS_XMM12, p, pos);
+		}
 		emit(REX_DIVPD, p, pos);
 		emitByte(0xe4 + 8 * dst, p, pos);

@@ -1020,18 +1072,21 @@ namespace randomx {
 		uint8_t* const p = code;
 		int pos = codePos;

-		emit(REX_MOV_RR64, p, pos);
-		emitByte(0xc0 + instr.src, p, pos);
-		int rotate = (13 - (instr.getImm32() & 63)) & 63;
-		if (rotate != 0) {
-			emit(ROL_RAX, p, pos);
-			emitByte(rotate, p, pos);
-		}
-		if (vm_flags & RANDOMX_FLAG_RYZEN) {
-			emit(AND_OR_MOV_LDMXCSR_RYZEN, p, pos);
+		const uint32_t src = instr.src;
+
+		*(uint32_t*)(p + pos) = 0x00C08B49 + (src << 16);
+		const int rotate = (static_cast<int>(instr.getImm32() & 63) - 2) & 63;
+		*(uint32_t*)(p + pos + 3) = 0x00C8C148 + (rotate << 24);
+
+		if (vm_flags & RANDOMX_FLAG_AMD) {
+			*(uint64_t*)(p + pos + 7) = 0x742024443B0CE083ULL;
+			*(uint8_t*)(p + pos + 15) = 8;
+			*(uint64_t*)(p + pos + 16) = 0x202444890414AE0FULL;
+			pos += 24;
 		}
 		else {
-			emit(AND_OR_MOV_LDMXCSR, p, pos);
+			*(uint64_t*)(p + pos + 7) = 0x0414AE0F0CE083ULL;
+			pos += 14;
 		}

 		codePos = pos;
@@ -1056,14 +1111,12 @@ namespace randomx {
 			}
 		}

-		emit(REX_ADD_I, p, pos);
-		emitByte(0xc0 + reg, p, pos);
+		*(uint32_t*)(p + pos) = 0x00c08149 + (reg << 16);
 		const int shift = instr.getModCond() + RandomX_CurrentConfig.JumpOffset;
-		const uint32_t imm = (instr.getImm32() | (1UL << shift)) & ~(1UL << (shift - 1));
-		emit32(imm, p, pos);
-		emit(REX_TEST, p, pos);
-		emitByte(0xc0 + reg, p, pos);
-		emit32(RandomX_CurrentConfig.ConditionMask_Calculated << shift, p, pos);
+		*(uint32_t*)(p + pos + 3) = (instr.getImm32() | (1UL << shift)) & ~(1UL << (shift - 1));
+		*(uint32_t*)(p + pos + 7) = 0x00c0f749 + (reg << 16);
+		*(uint32_t*)(p + pos + 10) = RandomX_CurrentConfig.ConditionMask_Calculated << shift;
+		pos += 14;

 		if (jmp_offset >= -128) {
 			emitByte(JZ_SHORT, p, pos);
@@ -1090,9 +1143,7 @@ namespace randomx {
 		int pos = codePos;

 		genAddressRegDst(instr, p, pos);
-		emit(REX_MOV_MR, p, pos);
-		emitByte(0x04 + 8 * instr.src, p, pos);
-		emitByte(0x06, p, pos);
+		emit32(0x0604894c + (static_cast<uint32_t>(instr.src) << 19), p, pos);

 		codePos = pos;
 	}
--- a/src/crypto/randomx/jit_compiler_x86.hpp
+++ b/src/crypto/randomx/jit_compiler_x86.hpp
@@ -69,11 +69,16 @@ namespace randomx {
 		int registerUsage[RegistersCount];
 		uint8_t* allocatedCode;
 		uint8_t* code;
+#		ifdef XMRIG_FIX_RYZEN
+		std::pair<const void*, const void*> mainLoopBounds;
+#		endif
 		int32_t codePos;
+		int32_t codePosFirst;
 		uint32_t vm_flags;

 		static bool BranchesWithin32B;
 		bool hasAVX;
+		bool hasXOP;

 		static void applyTweaks();
 		void generateProgramPrologue(Program&, ProgramConfiguration&);
@@ -118,7 +123,9 @@ namespace randomx {
 		void h_IMUL_R(const Instruction&);
 		void h_IMUL_M(const Instruction&);
 		void h_IMULH_R(const Instruction&);
+		void h_IMULH_R_BMI2(const Instruction&);
 		void h_IMULH_M(const Instruction&);
+		void h_IMULH_M_BMI2(const Instruction&);
 		void h_ISMULH_R(const Instruction&);
 		void h_ISMULH_M(const Instruction&);
 		void h_IMUL_RCP(const Instruction&);
--- a/src/crypto/randomx/jit_compiler_x86_static.S
+++ b/src/crypto/randomx/jit_compiler_x86_static.S
@@ -43,6 +43,7 @@
 .global DECL(randomx_program_prologue_first_load)
 .global DECL(randomx_program_loop_begin)
 .global DECL(randomx_program_loop_load)
+.global DECL(randomx_program_loop_load_xop)
 .global DECL(randomx_program_start)
 .global DECL(randomx_program_read_dataset)
 .global DECL(randomx_program_read_dataset_ryzen)
@@ -93,8 +94,12 @@ DECL(randomx_program_prologue_first_load):
 	and eax, RANDOMX_SCRATCHPAD_MASK
 	ror rdx, 32
 	and edx, RANDOMX_SCRATCHPAD_MASK
-	sub rsp, 24
-	stmxcsr dword ptr [rsp]
+	sub rsp, 40
+	mov dword ptr [rsp], 0x9FC0
+	mov dword ptr [rsp+4], 0xBFC0
+	mov dword ptr [rsp+8], 0xDFC0
+	mov dword ptr [rsp+12], 0xFFC0
+	mov dword ptr [rsp+32], -1
 	nop
 	nop
 	nop
@@ -110,6 +115,9 @@ DECL(randomx_program_loop_begin):
 DECL(randomx_program_loop_load):
 	#include "asm/program_loop_load.inc"

+DECL(randomx_program_loop_load_xop):
+	#include "asm/program_loop_load_xop.inc"
+
 DECL(randomx_program_start):
 	nop

--- a/src/crypto/randomx/jit_compiler_x86_static.asm
+++ b/src/crypto/randomx/jit_compiler_x86_static.asm
@@ -34,6 +34,7 @@ PUBLIC randomx_program_prologue
 PUBLIC randomx_program_prologue_first_load
 PUBLIC randomx_program_loop_begin
 PUBLIC randomx_program_loop_load
+PUBLIC randomx_program_loop_load_xop
 PUBLIC randomx_program_start
 PUBLIC randomx_program_read_dataset
 PUBLIC randomx_program_read_dataset_ryzen
@@ -81,8 +82,12 @@ randomx_program_prologue_first_load PROC
 	and eax, RANDOMX_SCRATCHPAD_MASK
 	ror rdx, 32
 	and edx, RANDOMX_SCRATCHPAD_MASK
-	sub rsp, 24
-	stmxcsr dword ptr [rsp]
+	sub rsp, 40
+	mov dword ptr [rsp], 9FC0h
+	mov dword ptr [rsp+4], 0BFC0h
+	mov dword ptr [rsp+8], 0DFC0h
+	mov dword ptr [rsp+12], 0FFC0h
+	mov dword ptr [rsp+32], -1
 	nop
 	nop
 	nop
@@ -101,6 +106,10 @@ randomx_program_loop_load PROC
 	include asm/program_loop_load.inc
 randomx_program_loop_load ENDP

+randomx_program_loop_load_xop PROC
+	include asm/program_loop_load_xop.inc
+randomx_program_loop_load_xop ENDP
+
 randomx_program_start PROC
 	nop
 randomx_program_start ENDP
--- a/src/crypto/randomx/jit_compiler_x86_static.hpp
+++ b/src/crypto/randomx/jit_compiler_x86_static.hpp
@@ -35,6 +35,7 @@ extern "C" {
 	void randomx_program_prologue_first_load();
 	void randomx_program_loop_begin();
 	void randomx_program_loop_load();
+	void randomx_program_loop_load_xop();
 	void randomx_program_start();
 	void randomx_program_read_dataset();
 	void randomx_program_read_dataset_ryzen();
--- a/src/crypto/randomx/randomx.cpp
+++ b/src/crypto/randomx/randomx.cpp
@@ -41,6 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "crypto/randomx/jit_compiler_a64_static.hpp"
 #endif

+#include "backend/cpu/Cpu.h"
+
 #include <cassert>

 RandomX_ConfigurationWownero::RandomX_ConfigurationWownero()
@@ -235,14 +237,29 @@ void RandomX_ConfigurationBase::Apply()
 	CEIL_##x = CEIL_##prev + RANDOMX_FREQ_##x; \
 	for (; k < CEIL_##x; ++k) { JIT_HANDLE(x, prev); }

+#define INST_HANDLE2(x, func_name, prev) \
+	CEIL_##x = CEIL_##prev + RANDOMX_FREQ_##x; \
+	for (; k < CEIL_##x; ++k) { JIT_HANDLE(func_name, prev); }
+
 	INST_HANDLE(IADD_RS, NULL);
 	INST_HANDLE(IADD_M, IADD_RS);
 	INST_HANDLE(ISUB_R, IADD_M);
 	INST_HANDLE(ISUB_M, ISUB_R);
 	INST_HANDLE(IMUL_R, ISUB_M);
 	INST_HANDLE(IMUL_M, IMUL_R);
-	INST_HANDLE(IMULH_R, IMUL_M);
-	INST_HANDLE(IMULH_M, IMULH_R);
+
+#if defined(_M_X64) || defined(__x86_64__)
+	if (xmrig::Cpu::info()->hasBMI2()) {
+		INST_HANDLE2(IMULH_R, IMULH_R_BMI2, IMUL_M);
+		INST_HANDLE2(IMULH_M, IMULH_M_BMI2, IMULH_R);
+	}
+	else
+#endif
+	{
+		INST_HANDLE(IMULH_R, IMUL_M);
+		INST_HANDLE(IMULH_M, IMULH_R);
+	}
+
 	INST_HANDLE(ISMULH_R, IMULH_M);
 	INST_HANDLE(ISMULH_M, ISMULH_R);
 	INST_HANDLE(IMUL_RCP, ISMULH_M);
--- a/src/crypto/randomx/randomx.h
+++ b/src/crypto/randomx/randomx.h
@@ -49,7 +49,7 @@ enum randomx_flags {
  RANDOMX_FLAG_FULL_MEM = 4,
  RANDOMX_FLAG_JIT = 8,
  RANDOMX_FLAG_1GB_PAGES = 16,
-  RANDOMX_FLAG_RYZEN = 64,
+  RANDOMX_FLAG_AMD = 64,
 };


--- a/src/crypto/rx/Rx.h
+++ b/src/crypto/rx/Rx.h
@@ -58,18 +58,13 @@ public:
    static void init(IRxListener *listener);

 #   ifdef XMRIG_FIX_RYZEN
-    static inline const std::pair<const void*, const void*> &mainLoopBounds()           { return m_mainLoopBounds; }
-    static inline void setMainLoopBounds(const void* loopBegin, const void* loopEnd)    { m_mainLoopBounds.first = loopBegin; m_mainLoopBounds.second = loopEnd; }
+    static void setMainLoopBounds(const std::pair<const void*, const void*>& bounds);
 #   endif

 private:
    static void msrInit(const RxConfig &config);
    static void msrDestroy();
    static void setupMainLoopExceptionFrame();
-
-#   ifdef XMRIG_FIX_RYZEN
-    static thread_local std::pair<const void*, const void*> m_mainLoopBounds;
-#   endif
 };


--- a/src/crypto/rx/RxConfig.cpp
+++ b/src/crypto/rx/RxConfig.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ constexpr size_t kMsrArraySize = 4;
 static const std::array<MsrItems, kMsrArraySize> msrPresets = {
    MsrItems(),
    MsrItems{{ 0xC0011020, 0x0 }, { 0xC0011021, 0x40, ~0x20ULL }, { 0xC0011022, 0x510000 }, { 0xC001102b, 0x1808cc16 }},
-    MsrItems{{ 0x1a4, 0x6 }},
+    MsrItems{{ 0x1a4, 0xf }},
    MsrItems()
 };

--- a/src/crypto/rx/RxConfig.h
+++ b/src/crypto/rx/RxConfig.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/crypto/rx/RxVm.cpp
+++ b/src/crypto/rx/RxVm.cpp
@@ -7,8 +7,8 @@
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
 * Copyright 2018-2019 tevador     <tevador@gmail.com>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -45,8 +45,12 @@ xmrig::RxVm::RxVm(RxDataset *dataset, uint8_t *scratchpad, bool softAes, xmrig::
        m_flags |= RANDOMX_FLAG_JIT;
    }

-    if ((assembly == Assembly::RYZEN) || ((assembly == Assembly::AUTO) && (Cpu::info()->assembly() == Assembly::RYZEN))) {
-        m_flags |= RANDOMX_FLAG_RYZEN;
+    if (assembly == Assembly::AUTO) {
+        assembly = Cpu::info()->assembly();
+    }
+
+    if ((assembly == Assembly::RYZEN) || (assembly == Assembly::BULLDOZER)) {
+        m_flags |= RANDOMX_FLAG_AMD;
    }

    m_vm = randomx_create_vm(static_cast<randomx_flags>(m_flags), dataset->cache() ? dataset->cache()->get() : nullptr, dataset->get(), scratchpad);
--- a/src/crypto/rx/RxVm.h
+++ b/src/crypto/rx/RxVm.h
@@ -7,8 +7,8 @@
 * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
 * Copyright 2018-2019 tevador     <tevador@gmail.com>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/crypto/rx/Rx_linux.cpp
+++ b/src/crypto/rx/Rx_linux.cpp
@@ -7,10 +7,10 @@
 * Copyright 2017-2019 XMR-Stak                 <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
 * Copyright 2018      Lee Clagett              <https://github.com/vtnerd>
 * Copyright 2018-2019 tevador                  <tevador@gmail.com>
- * Copyright 2018-2019 SChernykh                <https://github.com/SChernykh>
 * Copyright 2000      Transmeta Corporation    <https://github.com/intel/msr-tools>
 * Copyright 2004-2008 H. Peter Anvin           <https://github.com/intel/msr-tools>
- * Copyright 2016-2019 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh                <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -91,13 +91,19 @@ static MsrItem rdmsr(uint32_t reg)
 }


+static uint64_t get_masked_value(uint64_t old_value, uint64_t new_value, uint64_t mask)
+{
+    return (new_value & mask) | (old_value & ~mask);
+}
+
+
 static bool wrmsr_on_cpu(uint32_t reg, uint32_t cpu, uint64_t value, uint64_t mask)
 {
    // If a bit in mask is set to 1, use new value, otherwise use old value
    if (mask != MsrItem::kNoMask) {
        uint64_t old_value;
        if (rdmsr_on_cpu(reg, cpu, old_value)) {
-            value = (value & mask) | (old_value & ~mask);
+            value = get_masked_value(old_value, value, mask);
        }
    }

@@ -162,7 +168,7 @@ static bool wrmsr(const MsrItems &preset, bool save)
    if (save) {
        for (const auto &i : preset) {
            auto item = rdmsr(i.reg());
-            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), i.value());
+            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), get_masked_value(item.value(), i.value(), i.mask()));

            if (item.isValid()) {
                savedState.emplace_back(item);
@@ -180,6 +186,9 @@ static bool wrmsr(const MsrItems &preset, bool save)
 }


+#ifdef XMRIG_FIX_RYZEN
+static thread_local std::pair<const void*, const void*> mainLoopBounds = { nullptr, nullptr };
+
 static void MainLoopHandler(int sig, siginfo_t *info, void *ucontext)
 {
    ucontext_t *ucp = (ucontext_t*) ucontext;
@@ -187,7 +196,7 @@ static void MainLoopHandler(int sig, siginfo_t *info, void *ucontext)
    LOG_VERBOSE(YELLOW_BOLD("%s at %p"), (sig == SIGSEGV) ? "SIGSEGV" : "SIGILL", ucp->uc_mcontext.gregs[REG_RIP]);

    void* p = reinterpret_cast<void*>(ucp->uc_mcontext.gregs[REG_RIP]);
-    const std::pair<const void*, const void*>& loopBounds = Rx::mainLoopBounds();
+    const std::pair<const void*, const void*>& loopBounds = mainLoopBounds;

    if ((loopBounds.first <= p) && (p < loopBounds.second)) {
        ucp->uc_mcontext.gregs[REG_RIP] = reinterpret_cast<size_t>(loopBounds.second);
@@ -197,8 +206,11 @@ static void MainLoopHandler(int sig, siginfo_t *info, void *ucontext)
    }
 }

-
-thread_local std::pair<const void*, const void*> Rx::m_mainLoopBounds = { nullptr, nullptr };
+void Rx::setMainLoopBounds(const std::pair<const void*, const void*>& bounds)
+{
+    mainLoopBounds = bounds;
+}
+#endif


 } // namespace xmrig
@@ -235,9 +247,11 @@ void xmrig::Rx::msrDestroy()

 void xmrig::Rx::setupMainLoopExceptionFrame()
 {
+#   ifdef XMRIG_FIX_RYZEN
    struct sigaction act = {};
    act.sa_sigaction = MainLoopHandler;
    act.sa_flags = SA_RESTART | SA_SIGINFO;
    sigaction(SIGSEGV, &act, nullptr);
    sigaction(SIGILL, &act, nullptr);
+#   endif
 }
--- a/src/crypto/rx/Rx_win.cpp
+++ b/src/crypto/rx/Rx_win.cpp
@@ -10,8 +10,8 @@
 * Copyright 2000      Transmeta Corporation    <https://github.com/intel/msr-tools>
 * Copyright 2004-2008 H. Peter Anvin           <https://github.com/intel/msr-tools>
 * Copyright 2007-2009 hiyohiyo                 <https://openlibsys.org>, <hiyohiyo@crystalmark.info>
- * Copyright 2018-2019 SChernykh                <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh                <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig                    <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -217,6 +217,12 @@ static MsrItem rdmsr(HANDLE driver, uint32_t reg)
 }


+static uint64_t get_masked_value(uint64_t old_value, uint64_t new_value, uint64_t mask)
+{
+    return (new_value & mask) | (old_value & ~mask);
+}
+
+
 static bool wrmsr(HANDLE driver, uint32_t reg, uint64_t value, uint64_t mask)
 {
    struct {
@@ -230,7 +236,7 @@ static bool wrmsr(HANDLE driver, uint32_t reg, uint64_t value, uint64_t mask)
    if (mask != MsrItem::kNoMask) {
        uint64_t old_value;
        if (rdmsr(driver, reg, old_value)) {
-            value = (value & mask) | (old_value & ~mask);
+            value = get_masked_value(old_value, value, mask);
        }
    }

@@ -268,7 +274,7 @@ static bool wrmsr(const MsrItems &preset, bool save)
    if (save) {
        for (const auto &i : preset) {
            auto item = rdmsr(driver, i.reg());
-            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), i.value());
+            LOG_VERBOSE(CLEAR "%s" CYAN_BOLD("0x%08" PRIx32) CYAN(":0x%016" PRIx64) CYAN_BOLD(" -> 0x%016" PRIx64), tag, i.reg(), item.value(), get_masked_value(item.value(), i.value(), i.mask()));

            if (item.isValid()) {
                savedState.emplace_back(item);
@@ -303,6 +309,9 @@ static bool wrmsr(const MsrItems &preset, bool save)
 }


+#ifdef XMRIG_FIX_RYZEN
+static thread_local std::pair<const void*, const void*> mainLoopBounds = { nullptr, nullptr };
+
 static LONG WINAPI MainLoopHandler(_EXCEPTION_POINTERS *ExceptionInfo)
 {
    if (ExceptionInfo->ExceptionRecord->ExceptionCode == 0xC0000005) {
@@ -320,7 +329,7 @@ static LONG WINAPI MainLoopHandler(_EXCEPTION_POINTERS *ExceptionInfo)
    }

    void* p = reinterpret_cast<void*>(ExceptionInfo->ContextRecord->Rip);
-    const std::pair<const void*, const void*>& loopBounds = Rx::mainLoopBounds();
+    const std::pair<const void*, const void*>& loopBounds = mainLoopBounds;

    if ((loopBounds.first <= p) && (p < loopBounds.second)) {
        ExceptionInfo->ContextRecord->Rip = reinterpret_cast<DWORD64>(loopBounds.second);
@@ -330,8 +339,11 @@ static LONG WINAPI MainLoopHandler(_EXCEPTION_POINTERS *ExceptionInfo)
    return EXCEPTION_CONTINUE_SEARCH;
 }

-
-thread_local std::pair<const void*, const void*> Rx::m_mainLoopBounds = { nullptr, nullptr };
+void Rx::setMainLoopBounds(const std::pair<const void*, const void*>& bounds)
+{
+    mainLoopBounds = bounds;
+}
+#endif


 } // namespace xmrig
@@ -368,5 +380,7 @@ void xmrig::Rx::msrDestroy()

 void xmrig::Rx::setupMainLoopExceptionFrame()
 {
+#   ifdef XMRIG_FIX_RYZEN
    AddVectoredExceptionHandler(1, MainLoopHandler);
+#   endif
 }
--- a/src/net/strategies/DonateStrategy.cpp
+++ b/src/net/strategies/DonateStrategy.cpp
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -110,9 +110,7 @@ void xmrig::DonateStrategy::connect()
    if (m_proxy) {
        m_proxy->connect();
    }
-    else if (m_controller->config()->pools().proxyDonate() == Pools::PROXY_DONATE_ALWAYS) {
-        setState(STATE_IDLE);
-    }
+
    else {
        m_strategy->connect();
    }
--- a/src/net/strategies/DonateStrategy.h
+++ b/src/net/strategies/DonateStrategy.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/src/version.h
+++ b/src/version.h
@@ -5,8 +5,8 @@
 * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
 * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
 * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,15 +28,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "5.5.0"
+#define APP_VERSION   "5.5.2"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
-#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
+#define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"
 #define APP_KIND      "miner"

 #define APP_VER_MAJOR  5
 #define APP_VER_MINOR  5
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  2

 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)
Author	SHA1	Message	Date
XMRig	bf1a0a0b83	v5.5.2	2020-02-02 13:30:29 +07:00
XMRig	f864687a96	Merge branch 'dev'	2020-02-02 13:29:13 +07:00
XMRig	030d6e5962	Update year.	2020-02-01 20:24:00 +07:00
xmrig	f609be6ec3	Update CHANGELOG.md	2020-02-01 18:47:11 +07:00
xmrig	aa4a4c9fd0	Merge pull request #1520 from SChernykh/dev Fixed setThreadAffinity()	2020-01-29 17:48:37 +07:00
SChernykh	269d12d1be	Fixed setThreadAffinity() Added 1 ms sleep to guarantee thread rescheduling to the correct CPU core before returning.	2020-01-28 19:39:02 +01:00
xmrig	23a1ae0337	Merge pull request #1519 from SChernykh/dev Removed MSR mod for Bulldozer	2020-01-27 22:20:21 +07:00
SChernykh	4571899664	Removed MSR mod for Bulldozer It turned out to be useless: https://www.reddit.com/r/MoneroMining/comments/et7s7w/psa_amd_opteronfxa6a8a10_owners_needed_to_test/	2020-01-27 09:39:39 +01:00
xmrig	6d9b50b938	Merge pull request #1516 from SChernykh/dev Fix compile error	2020-01-24 20:52:29 +07:00
SChernykh	cd763be05b	Fix compile error	2020-01-24 14:09:07 +01:00
xmrig	4e6b24d67d	Merge pull request #1515 from SChernykh/dev Fix crash on Linux	2020-01-24 19:35:40 +07:00
SChernykh	42a7194e93	Fix crash on Linux	2020-01-24 13:34:12 +01:00
xmrig	01e063f6f5	Update CHANGELOG.md	2020-01-24 11:42:32 +07:00
xmrig	81e3f6e7d9	Merge pull request #1510 from SChernykh/dev Optimized CFROUND	2020-01-23 12:49:13 +07:00
SChernykh	9f1753cc4f	Optimized CFROUND	2020-01-22 20:11:00 +01:00
xmrig	39eafc3255	Merge pull request #1508 from SChernykh/dev Added support for BMI2 instructions	2020-01-22 12:00:45 +07:00
SChernykh	d342968211	Added support for BMI2 instructions	2020-01-21 19:44:56 +01:00
xmrig	8e6f4d4ecb	Merge pull request #1502 from SChernykh/dev Optimizations for AMD Bulldozer	2020-01-15 20:26:06 +07:00
SChernykh	f80177cbd3	Optimizations for AMD Bulldozer - Added support for XOP instructions - Enabled Ryzen code for Bulldozer because it's faster there too	2020-01-15 13:04:26 +01:00
xmrig	32b0314990	Merge pull request #1501 from SChernykh/dev MSR preset for Bulldozer CPUs	2020-01-15 08:57:14 +07:00
SChernykh	665e43fecc	MSR preset for Bulldozer CPUs Also fixed verbose output for MSR presets with masks.	2020-01-14 19:27:34 +01:00
xmrig	b5fb96dca0	Merge pull request #1500 from SChernykh/dev JIT compiler: removed unnecessary memcpy from generateProgram()	2020-01-14 07:59:08 +07:00
SChernykh	73722ce186	JIT compiler: removed unnecessary memcpy from generateProgram()	2020-01-13 18:00:41 +01:00
XMRig	638ed7b4f2	v5.5.2-dev	2020-01-12 12:55:50 +07:00
XMRig	b5b12216d6	Merge branch 'master' into dev	2020-01-12 12:55:04 +07:00
xmrig	d2867a2ed8	Merge pull request #1495 from jtgrassie/missed-script-change add intel change to boost script	2020-01-12 09:56:37 +07:00
Jethro Grassie	e290995999	add change to boost script	2020-01-11 21:42:48 -05:00
XMRig	9ae8907b3e	v5.5.1	2020-01-12 08:34:01 +07:00
XMRig	a80f3e8190	Merge branch 'dev'	2020-01-12 08:32:16 +07:00
xmrig	b3d1ca6cb2	Update CHANGELOG.md	2020-01-12 07:43:29 +07:00
xmrig	0290b1ed3c	Merge pull request #1493 from SChernykh/dev Update MSR preset for Intel	2020-01-09 14:24:11 +07:00
SChernykh	869209389e	Update MSR preset for Intel As per https://github.com/xmrig/xmrig/issues/1433#issuecomment-572126184	2020-01-09 08:10:36 +01:00
XMRig	c6530e352f	Code cleanup.	2020-01-07 10:13:01 +07:00
xmrig	706f588b36	Merge pull request #1489 from SChernykh/dev JIT compiler tweaks	2020-01-07 02:41:40 +07:00
SChernykh	eb20dfbc94	JIT compiler tweaks	2020-01-06 13:57:48 +01:00
xmrig	f69ba3ea1d	Update CHANGELOG.md	2020-01-03 19:54:28 +07:00
XMRig	88ff807700	Fix compile warnings.	2020-01-03 19:11:48 +07:00
XMRig	e76e75cdff	Merge branch 'dev' of github.com:xmrig/xmrig into dev	2020-01-03 05:36:47 +07:00
XMRig	083c61754b	Fixed unwanted resume after dataset change.	2020-01-03 05:36:22 +07:00
xmrig	146bbda33f	Merge pull request #1477 from SChernykh/dev Refactor Ryzen fix to fix compilation issues	2019-12-31 17:07:37 +07:00
SChernykh	c9f90e6770	Refactor Ryzen fix to fix compilation issues	2019-12-31 11:55:07 +02:00
xmrig	6a2a8579ae	Merge pull request #1473 from SChernykh/dev Auto-config for mobile Ryzen APUs	2019-12-31 02:36:30 +07:00
SChernykh	29dd2c2138	Cleanup	2019-12-30 20:55:03 +02:00
SChernykh	4e5aef0a8a	Auto-config for mobile Ryzen APUs	2019-12-30 20:53:21 +02:00
XMRig	039c42b1fe	v5.5.1-dev	2019-12-30 16:05:51 +07:00
XMRig	1e45349890	Merge branch 'master' into dev	2019-12-30 16:05:24 +07:00
XMRig	d64bbfa9c0	#1469 Fixed build with gcc 4.8.	2019-12-30 16:04:07 +07:00