Update/Improve API docs

Cleanup API code
2025-12-09 08:42:40 -05:00 · 2023-05-23 16:49:48 -06:00 · 2023-05-23 16:49:48 -06:00
53 changed files with 1307 additions and 1338 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,30 +1,3 @@
-# v6.21.0
- [#3302](https://github.com/xmrig/xmrig/pull/3302) [#3312](https://github.com/xmrig/xmrig/pull/3312) Enabled keepalive for Windows (>= Vista).
- [#3320](https://github.com/xmrig/xmrig/pull/3320) Added "built for OS/architecture/bits" to "ABOUT".
- [#3339](https://github.com/xmrig/xmrig/pull/3339) Added SNI option for TLS connections.
- [#3342](https://github.com/xmrig/xmrig/pull/3342) Update `cn_main_loop.asm`.
- [#3346](https://github.com/xmrig/xmrig/pull/3346) ARM64 JIT: don't use `x18` register.
- [#3348](https://github.com/xmrig/xmrig/pull/3348) Update to latest `sse2neon.h`.
- [#3356](https://github.com/xmrig/xmrig/pull/3356) Updated pricing record size for **Zephyr** solo mining.
- [#3358](https://github.com/xmrig/xmrig/pull/3358) **Zephyr** solo mining: handle multiple outputs.
-
-# v6.20.0
- Added new ARM CPU names.
- [#2394](https://github.com/xmrig/xmrig/pull/2394) Added new CMake options `ARM_V8` and `ARM_V7`.
- [#2830](https://github.com/xmrig/xmrig/pull/2830) Added API rebind polling.
- [#2927](https://github.com/xmrig/xmrig/pull/2927) Fixed compatibility with hwloc 1.11.x.
- [#3060](https://github.com/xmrig/xmrig/pull/3060) Added x86 to `README.md`.
- [#3236](https://github.com/xmrig/xmrig/pull/3236) Fixed: receive CUDA loader error on Linux too.
- [#3290](https://github.com/xmrig/xmrig/pull/3290) Added [Zephyr](https://www.zephyrprotocol.com/) coin support for solo mining.
-
-# v6.19.3
- [#3245](https://github.com/xmrig/xmrig/issues/3245) Improved algorithm negotiation for donation rounds by sending extra information about current mining job.
- [#3254](https://github.com/xmrig/xmrig/pull/3254) Tweaked auto-tuning for Intel CPUs.
- [#3271](https://github.com/xmrig/xmrig/pull/3271) RandomX: optimized program generation.
- [#3273](https://github.com/xmrig/xmrig/pull/3273) RandomX: fixed undefined behavior.
- [#3275](https://github.com/xmrig/xmrig/pull/3275) RandomX: fixed `jccErratum` list.
- [#3280](https://github.com/xmrig/xmrig/pull/3280) Updated example scripts.
-
 # v6.19.2
 - [#3230](https://github.com/xmrig/xmrig/pull/3230) Fixed parsing of `TX_EXTRA_MERGE_MINING_TAG`.
 - [#3232](https://github.com/xmrig/xmrig/pull/3232) Added new `X-Hash-Difficulty` HTTP header.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,7 @@ option(WITH_SECURE_JIT      "Enable secure access to JIT memory" OFF)
 option(WITH_DMI             "Enable DMI/SMBIOS reader" ON)

 option(BUILD_STATIC         "Build static binary" OFF)
-option(ARM_V8               "Force ARMv8 (64 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
-option(ARM_V7               "Force ARMv7 (32 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
+option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(HWLOC_DEBUG          "Enable hwloc debug helpers and log" OFF)


--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and [GhostRider](https://github.com/xmrig/xmrig/tree/master/src/crypto/ghostrider#readme) unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD.

 ## Mining backends
- **CPU** (x86/x64/ARMv7/ARMv8)
+- **CPU** (x64/ARMv7/ARMv8)
 - **OpenCL** for AMD GPUs.
 - **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmrig/xmrig-cuda).

--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -29,12 +29,6 @@ else()
    set(WITH_VAES OFF)
 endif()

-if (ARM_V8)
-    set(ARM_TARGET 8)
-elseif (ARM_V7)
-    set(ARM_TARGET 7)
-endif()
-
 if (NOT ARM_TARGET)
    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
        set(ARM_TARGET 8)
--- a/doc/API.md
+++ b/doc/API.md
@@ -4,7 +4,7 @@ If you want use HTTP API you need enable it (`"enabled": true,`) then choice `po

 Offical HTTP client for API: http://workers.xmrig.info/

-Example configuration:
+Example configuration, used in Curl examples below:

 ```json
 "api": {
@@ -12,11 +12,11 @@ Example configuration:
 	"worker-id": null,
 },
 "http": {
-	"enabled": false,
+	"enabled": true,
 	"host": "127.0.0.1",
-	"port": 0,
-	"access-token": null,
-	"restricted": true
+	"port": 44444,
+	"access-token": "SECRET",
+	"restricted": false
 }
 ```

@@ -37,30 +37,78 @@ Versions before 2.15 was use another options for API https://github.com/xmrig/xm

 ## Endpoints

-### GET /1/summary
+### APIVersion 2

-Get miner summary information. [Example](api/1/summary.json).
+#### GET /2/summary

-### GET /1/threads
+Get miner summary information. [Example](api/2/summary.json).

-Get detailed information about miner threads. [Example](api/1/threads.json).
+#### GET /2/backends
+
+Get detailed information about miner backends. [Example](api/2/backends.json).
+
+### APIVersion 1 (deprecated)
+
+#### GET /1/summary
+
+Get miner summary information. Currently identical to `GET /2/summary`
+
+#### GET /1/threads
+
+**REMOVED** Get detailed information about miner threads. [Example](api/1/threads.json).
+
+Functionally replaced by `GET /2/backends` which contains a `threads` item per backend.
+
+### APIVersion 0 (deprecated)
+
+#### GET /api.json
+
+Get miner summary information. Currently identical to `GET /2/summary`


 ## Restricted endpoints

 All API endpoints below allow access to sensitive information and remote configure miner. You should set `access-token` and allow unrestricted access (`"restricted": false`).

-### GET /1/config
+### JSON-RPC Interface

-Get current miner configuration. [Example](api/1/config.json).
+#### POST /json_rpc

+Control miner with JSON-RPC. Methods: `pause`, `resume`, `stop`, `start`

-### PUT /1/config
+Curl example:
+
+```
+curl -v --data "{\"method\":\"pause\",\"id\":1}" -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/json_rpc
+```
+
+### APIVersion 2
+
+#### GET /2/config
+
+Get current miner configuration. [Example](api/2/config.json).
+
+#### PUT /2/config

 Update current miner configuration. Common use case, get current configuration, make changes, and upload it to miner.

 Curl example:

 ```
-curl -v --data-binary @config.json -X PUT -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/1/config
+...GET current config...
+curl -v -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/2/config > config.json
+...make changes...
+vim config.json
+...PUT changed config...
+curl -v --data-binary @config.json -X PUT -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/2/config
 ```
+
+### APIVersion 1 (deprecated)
+
+#### GET /1/config
+
+Get current miner configuration. Currently identical to `GET /2/config`
+
+#### PUT /1/config
+
+Update current miner configuration. Currently identical to `PUT /2/config`
--- a/doc/api/2/backends.json
+++ b/doc/api/2/backends.json
@@ -0,0 +1,78 @@
+[
+    {
+        "type": "cpu",
+        "enabled": true,
+        "algo": "rx/0",
+        "profile": "rx",
+        "hw-aes": true,
+        "priority": -1,
+        "msr": true,
+        "asm": "intel",
+        "argon2-impl": "AVX2",
+        "hugepages": [6, 6],
+        "memory": 6291456,
+        "hashrate": [1235.78, 1228.89, null],
+        "threads": [
+            {
+                "intensity": 1,
+                "affinity": 0,
+                "av": 1,
+                "hashrate": [409.75, 406.58, null]
+            },
+            {
+                "intensity": 1,
+                "affinity": 2,
+                "av": 1,
+                "hashrate": [412.9, 411.33, null]
+            },
+            {
+                "intensity": 1,
+                "affinity": 4,
+                "av": 1,
+                "hashrate": [413.11, 410.98, null]
+            }
+        ]
+    },
+    {
+        "type": "cuda",
+        "enabled": true,
+        "algo": "cn-heavy/xhv",
+        "profile": "cn-heavy/xhv",
+        "versions": {
+            "cuda-runtime": "11.6",
+            "cuda-driver": "11.6",
+            "plugin": "6.17.1-dev",
+            "nvml": "11.512.15",
+            "driver": "512.15"
+        },
+        "hashrate": [247.02, 247.34, null],
+        "threads": [
+            {
+                "index": 0,
+                "threads": 32,
+                "blocks": 38,
+                "bfactor": 6,
+                "bsleep": 25,
+                "affinity": -1,
+                "cclock": 0,
+                "mclock": 0,
+                "dataset_host": false,
+                "hashrate": [246.77, 247.26, null],
+                "name": "NVIDIA GeForce GTX 970",
+                "bus_id": "01:00.0",
+                "smx": 13,
+                "arch": 52,
+                "global_mem": 4294836224,
+                "clock": 1177,
+                "memory_clock": 3666,
+                "health": {
+                    "temperature": 69,
+                    "power": 161,
+                    "clock": 1328,
+                    "mem_clock": 3662,
+                    "fan_speed": [100]
+                }
+            }
+        ]
+    }
+]
--- a/doc/api/2/config.json
+++ b/doc/api/2/config.json
@@ -0,0 +1,136 @@
+{
+    "api": {
+        "id": null,
+        "worker-id": null
+    },
+    "http": {
+        "enabled": true,
+        "host": "127.0.0.1",
+        "port": 44444,
+        "access-token": "SECRET",
+        "restricted": false
+    },
+    "autosave": true,
+    "background": false,
+    "colors": true,
+    "title": true,
+    "randomx": {
+        "init": -1,
+        "init-avx2": -1,
+        "mode": "auto",
+        "1gb-pages": true,
+        "rdmsr": true,
+        "wrmsr": true,
+        "cache_qos": false,
+        "numa": true,
+        "scratchpad_prefetch_mode": 1
+    },
+    "cpu": {
+        "enabled": true,
+        "huge-pages": true,
+        "huge-pages-jit": true,
+        "hw-aes": null,
+        "priority": null,
+        "memory-pool": true,
+        "yield": true,
+        "asm": true,
+        "argon2-impl": null,
+        "argon2": [0, 2, 4, 6, 5, 7],
+        "astrobwt/v2": [1, 2, 3, 4, 5, 6, 7],
+        "cn": [
+            [1, 0],
+            [1, 2],
+            [1, 4]
+        ],
+        "cn-heavy": [
+            [1, 0],
+            [1, 2]
+        ],
+        "cn-lite": [
+            [1, 0],
+            [1, 2],
+            [1, 4],
+            [1, 6],
+            [1, 5],
+            [1, 7]
+        ],
+        "cn-pico": [
+            [2, 1],
+            [2, 2],
+            [2, 3],
+            [2, 4],
+            [2, 5],
+            [2, 6],
+            [2, 7]
+        ],
+        "cn/2": [
+            [1, 0],
+            [1, 2],
+            [1, 4]
+        ],
+        "cn/upx2": [
+            [2, 1],
+            [2, 2],
+            [2, 3],
+            [2, 4],
+            [2, 5],
+            [2, 6],
+            [2, 7]
+        ],
+        "ghostrider": [
+            [8, 0],
+            [8, 2],
+            [8, 4]
+        ],
+        "rx": [0, 2, 4],
+        "rx/arq": [1, 2, 3, 4, 5, 6, 7],
+        "rx/keva": [0, 2, 4, 6, 5, 7],
+        "rx/wow": [0, 2, 4, 6, 5, 7],
+        "cn-lite/0": false,
+        "cn/0": "cn"
+    },
+    "log-file": null,
+    "donate-level": 0,
+    "donate-over-proxy": 0,
+    "pools": [
+        {
+            "algo": null,
+            "coin": null,
+            "url": "some.pool:10064",
+            "user": "4blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahbl",
+            "pass": "x",
+            "rig-id": null,
+            "nicehash": false,
+            "keepalive": true,
+            "enabled": true,
+            "tls": false,
+            "wss": false,
+            "daemon": false,
+            "socks5": null,
+            "self-select": null,
+            "submit-to-origin": false
+        }
+    ],
+    "retries": 5,
+    "retry-pause": 5,
+    "print-time": 64,
+    "syslog": false,
+    "tls": {
+        "enabled": false,
+        "protocols": null,
+        "cert": null,
+        "cert_key": null,
+        "ciphers": null,
+        "ciphersuites": null,
+        "dhparam": null
+    },
+    "dns": {
+        "ipv6": false,
+        "ttl": 30
+    },
+    "user-agent": null,
+    "verbose": 1,
+    "watch": true,
+    "pause-on-battery": false,
+    "pause-on-active": false
+}
--- a/doc/api/2/summary.json
+++ b/doc/api/2/summary.json
@@ -0,0 +1,76 @@
+{
+    "id": "51aca77da137cb62",
+    "worker_id": "tpad",
+    "uptime": 106,
+    "restricted": false,
+    "resources": {
+        "memory": {
+            "free": 4977348608,
+            "total": 16659546112,
+            "resident_set_memory": 16441344
+        },
+        "load_average": [3.4, 2.7, 2.44],
+        "hardware_concurrency": 8
+    },
+    "features": ["api", "asm", "http", "hwloc", "tls"],
+    "results": {
+        "diff_current": 37638,
+        "shares_good": 3,
+        "shares_total": 3,
+        "avg_time": 35,
+        "avg_time_ms": 35603,
+        "hashes_total": 165638,
+        "best": [358821, 344438, 73371, 0, 0, 0, 0, 0, 0, 0]
+    },
+    "algo": "rx/0",
+    "connection": {
+        "pool": "some.pool:20064",
+        "ip": "127.1.2.3",
+        "uptime": 106,
+        "uptime_ms": 106811,
+        "ping": 405,
+        "failures": 0,
+        "tls": "TLSv1.3",
+        "tls-fingerprint": null,
+        "algo": "rx/0",
+        "diff": 37638,
+        "accepted": 3,
+        "rejected": 0,
+        "avg_time": 35,
+        "avg_time_ms": 35603,
+        "hashes_total": 165638
+    },
+    "version": "6.17.1-dev",
+    "kind": "miner",
+    "ua": "XMRig/6.17.1-dev (Linux x86_64) libuv/1.43.0 gcc/9.4.0",
+    "cpu": {
+        "brand": "Intel(R) Core(TM) i7-4700MQ CPU @ 2.40GHz",
+        "family": 6,
+        "model": 60,
+        "stepping": 3,
+        "proc_info": 198339,
+        "aes": true,
+        "avx2": true,
+        "x64": true,
+        "64_bit": true,
+        "l2": 1048576,
+        "l3": 6291456,
+        "cores": 4,
+        "threads": 8,
+        "packages": 1,
+        "nodes": 1,
+        "backend": "hwloc/2.7.0",
+        "msr": "intel",
+        "assembly": "intel",
+        "arch": "x86_64",
+        "flags": ["aes", "avx", "avx2", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "popcnt"]
+    },
+    "donate_level": 0,
+    "paused": false,
+    "algorithms": ["cn/0", "cn/1", "cn/2", "cn/r", "cn/fast", "cn/half", "cn/xao", "cn/rto", "cn/rwz", "cn/zls", "cn/double", "cn/ccx", "cn-lite/1", "cn-heavy/0", "cn-heavy/tube", "cn-heavy/xhv", "cn-pico", "cn-pico/tlo", "cn/upx2", "rx/0", "rx/wow", "rx/arq", "rx/graft", "rx/sfx", "rx/keva", "argon2/chukwa", "argon2/chukwav2", "argon2/ninja", "astrobwt/v2", "ghostrider"],
+    "hashrate": {
+        "total": [1207.19, 1210.82, null],
+        "highest": 1316.85
+    },
+    "hugepages": [6, 6]
+}
--- a/scripts/pool_mine_example.cmd
+++ b/scripts/pool_mine_example.cmd
@@ -16,5 +16,5 @@
 :: Smaller pools also often have smaller fees/payout limits.

 cd /d "%~dp0"
-xmrig.exe -o xmrpool.eu:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x
+xmrig.exe -o pool.hashvault.pro:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x
 pause
--- a/scripts/solo_mine_example.cmd
+++ b/scripts/solo_mine_example.cmd
@@ -12,5 +12,5 @@
 :: But you will only get a payout when you find a block which can take more than a year for a single low-end PC.

 cd /d "%~dp0"
-xmrig.exe -o YOUR_NODE_IP:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon
+xmrig.exe -o node.xmr.to:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon
 pause
--- a/src/backend/cpu/Cpu.h
+++ b/src/backend/cpu/Cpu.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 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,7 +37,7 @@ public:
 };


-} // namespace xmrig
+} /* namespace xmrig */


-#endif // XMRIG_CPU_H
+#endif /* XMRIG_CPU_H */
--- a/src/backend/cpu/interfaces/ICpuInfo.h
+++ b/src/backend/cpu/interfaces/ICpuInfo.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -26,12 +26,6 @@
 #include "crypto/common/Assembly.h"


-#ifdef XMRIG_FEATURE_HWLOC
-using hwloc_const_bitmap_t  = const struct hwloc_bitmap_s *;
-using hwloc_topology_t      = struct hwloc_topology *;
-#endif
-
-
 namespace xmrig {


@@ -122,16 +116,10 @@ public:
    virtual size_t threads() const                                                  = 0;
    virtual Vendor vendor() const                                                   = 0;
    virtual uint32_t model() const                                                  = 0;
-
-#   ifdef XMRIG_FEATURE_HWLOC
-    virtual bool membind(hwloc_const_bitmap_t nodeset)                              = 0;
-    virtual const std::vector<uint32_t> &nodeset() const                            = 0;
-    virtual hwloc_topology_t topology() const                                       = 0;
-#   endif
 };


-} // namespace xmrig
+} /* namespace xmrig */


 #endif // XMRIG_CPUINFO_H
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -296,7 +296,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
                // Affected CPU models and stepping numbers are taken from https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf
                m_jccErratum =
                    ((model == 0x4E) && (stepping == 0x3)) ||
-                    ((model == 0x55) && ((stepping == 0x4) || (stepping == 0x7))) ||
+                    ((model == 0x55) && (stepping == 0x4)) ||
                    ((model == 0x5E) && (stepping == 0x3)) ||
                    ((model == 0x8E) && (stepping >= 0x9) && (stepping <= 0xC)) ||
                    ((model == 0x9E) && (stepping >= 0x9) && (stepping <= 0xD)) ||
--- a/src/backend/cpu/platform/BasicCpuInfo.h
+++ b/src/backend/cpu/platform/BasicCpuInfo.h
@@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -72,10 +72,11 @@ protected:
 #   endif
    }

+protected:
    Arch m_arch             = ARCH_UNKNOWN;
    bool m_jccErratum       = false;
    char m_brand[64 + 6]{};
-    size_t m_threads        = 0;
+    size_t m_threads;
    std::vector<int32_t> m_units;
    Vendor m_vendor         = VENDOR_UNKNOWN;

@@ -93,7 +94,7 @@ private:
 };


-} // namespace xmrig
+} /* namespace xmrig */


-#endif // XMRIG_BASICCPUINFO_H
+#endif /* XMRIG_BASICCPUINFO_H */
--- a/src/backend/cpu/platform/HwlocCpuInfo.cpp
+++ b/src/backend/cpu/platform/HwlocCpuInfo.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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,22 +36,27 @@
 #include "base/io/log/Log.h"


-#if HWLOC_API_VERSION < 0x20000
-static inline int hwloc_obj_type_is_cache(hwloc_obj_type_t type)
-{
-    return type == HWLOC_OBJ_CACHE;
-}
-#endif
-
-
 namespace xmrig {


+uint32_t HwlocCpuInfo::m_features = 0;
+
+
+static inline bool isCacheObject(hwloc_obj_t obj)
+{
+#   if HWLOC_API_VERSION >= 0x20000
+    return hwloc_obj_type_is_cache(obj->type);
+#   else
+    return obj->type == HWLOC_OBJ_CACHE;
+#   endif
+}
+
+
 template <typename func>
 static inline void findCache(hwloc_obj_t obj, unsigned min, unsigned max, func lambda)
 {
    for (size_t i = 0; i < obj->arity; i++) {
-        if (hwloc_obj_type_is_cache(obj->children[i]->type)) {
+        if (isCacheObject(obj->children[i])) {
            const unsigned depth = obj->children[i]->attr->cache.depth;
            if (depth < min || depth > max) {
                continue;
@@ -169,6 +174,10 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo()
    m_packages  = countByType(m_topology, HWLOC_OBJ_PACKAGE);

    if (m_nodes > 1) {
+        if (hwloc_topology_get_support(m_topology)->membind->set_thisthread_membind) {
+            m_features |= SET_THISTHREAD_MEMBIND;
+        }
+
        m_nodeset.reserve(m_nodes);
        hwloc_obj_t node = nullptr;

@@ -313,7 +322,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
    if (cache->attr->cache.depth == 3) {
        for (size_t i = 0; i < cache->arity; ++i) {
            hwloc_obj_t l2 = cache->children[i];
-            if (!hwloc_obj_type_is_cache(l2->type) || l2->attr == nullptr) {
+            if (!isCacheObject(l2) || l2->attr == nullptr) {
                continue;
            }

--- a/src/backend/cpu/platform/HwlocCpuInfo.h
+++ b/src/backend/cpu/platform/HwlocCpuInfo.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -21,9 +21,12 @@


 #include "backend/cpu/platform/BasicCpuInfo.h"
+#include "base/tools/Object.h"


-using hwloc_obj_t = struct hwloc_obj *;
+using hwloc_const_bitmap_t  = const struct hwloc_bitmap_s *;
+using hwloc_obj_t           = struct hwloc_obj *;
+using hwloc_topology_t      = struct hwloc_topology *;


 namespace xmrig {
@@ -34,27 +37,39 @@ class HwlocCpuInfo : public BasicCpuInfo
 public:
    XMRIG_DISABLE_COPY_MOVE(HwlocCpuInfo)

+
+    enum Feature : uint32_t {
+        SET_THISTHREAD_MEMBIND = 1
+    };
+
+
    HwlocCpuInfo();
    ~HwlocCpuInfo() override;

+    static inline bool hasFeature(Feature feature)              { return m_features & feature; }
+
+    inline const std::vector<uint32_t> &nodeset() const         { return m_nodeset; }
+    inline hwloc_topology_t topology() const                    { return m_topology; }
+
+    bool membind(hwloc_const_bitmap_t nodeset);
+
 protected:
-    bool membind(hwloc_const_bitmap_t nodeset) override;
    CpuThreads threads(const Algorithm &algorithm, uint32_t limit) const override;

-    inline const char *backend() const override                     { return m_backend; }
-    inline const std::vector<uint32_t> &nodeset() const override    { return m_nodeset; }
-    inline hwloc_topology_t topology() const override               { return m_topology; }
-    inline size_t cores() const override                            { return m_cores; }
-    inline size_t L2() const override                               { return m_cache[2]; }
-    inline size_t L3() const override                               { return m_cache[3]; }
-    inline size_t nodes() const override                            { return m_nodes; }
-    inline size_t packages() const override                         { return m_packages; }
+    inline const char *backend() const override     { return m_backend; }
+    inline size_t cores() const override            { return m_cores; }
+    inline size_t L2() const override               { return m_cache[2]; }
+    inline size_t L3() const override               { return m_cache[3]; }
+    inline size_t nodes() const override            { return m_nodes; }
+    inline size_t packages() const override         { return m_packages; }

 private:
    CpuThreads allThreads(const Algorithm &algorithm, uint32_t limit) const;
    void processTopLevelCache(hwloc_obj_t cache, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const;
    void setThreads(size_t threads);

+    static uint32_t m_features;
+
    char m_backend[20]          = { 0 };
    hwloc_topology_t m_topology = nullptr;
    size_t m_cache[5]           = { 0 };
@@ -65,7 +80,7 @@ private:
 };


-} // namespace xmrig
+} /* namespace xmrig */


-#endif // XMRIG_HWLOCCPUINFO_H
+#endif /* XMRIG_HWLOCCPUINFO_H */
--- a/src/backend/cpu/platform/lscpu_arm.cpp
+++ b/src/backend/cpu/platform/lscpu_arm.cpp
@@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2018      Riku Voipio <riku.voipio@iki.fi>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -17,6 +17,7 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include "base/tools/String.h"
 #include "3rdparty/fmt/core.h"

@@ -83,7 +84,6 @@ static const id_part arm_part[] = {
    { 0xc27, "Cortex-M7" },
    { 0xc60, "Cortex-M0+" },
    { 0xd01, "Cortex-A32" },
-    { 0xd02, "Cortex-A34" },
    { 0xd03, "Cortex-A53" },
    { 0xd04, "Cortex-A35" },
    { 0xd05, "Cortex-A55" },
@@ -97,60 +97,40 @@ static const id_part arm_part[] = {
    { 0xd0d, "Cortex-A77" },
    { 0xd0e, "Cortex-A76AE" },
    { 0xd13, "Cortex-R52" },
-    { 0xd15, "Cortex-R82" },
    { 0xd20, "Cortex-M23" },
    { 0xd21, "Cortex-M33" },
-    { 0xd40, "Neoverse-V1" },
    { 0xd41, "Cortex-A78" },
    { 0xd42, "Cortex-A78AE" },
-    { 0xd43, "Cortex-A65AE" },
-    { 0xd44, "Cortex-X1" },
-    { 0xd46, "Cortex-A510" },
-    { 0xd47, "Cortex-A710" },
-    { 0xd48, "Cortex-X2" },
-    { 0xd49, "Neoverse-N2" },
    { 0xd4a, "Neoverse-E1" },
    { 0xd4b, "Cortex-A78C" },
-    { 0xd4c, "Cortex-X1C" },
-    { 0xd4d, "Cortex-A715" },
-    { 0xd4e, "Cortex-X3" },
-    { 0xd4f, "Neoverse-V2" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part brcm_part[] = {
-    { 0x0f, "Brahma-B15" },
-    { 0x100, "Brahma-B53" },
+    { 0x0f, "Brahma B15" },
+    { 0x100, "Brahma B53" },
    { 0x516, "ThunderX2" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part dec_part[] = {
    { 0xa10, "SA110" },
    { 0xa11, "SA1100" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part cavium_part[] = {
    { 0x0a0, "ThunderX" },
-    { 0x0a1, "ThunderX-88XX" },
-    { 0x0a2, "ThunderX-81XX" },
-    { 0x0a3, "ThunderX-83XX" },
-    { 0x0af, "ThunderX2-99xx" },
-    { 0x0b0, "OcteonTX2" },
-    { 0x0b1, "OcteonTX2-98XX" },
-    { 0x0b2, "OcteonTX2-96XX" },
-    { 0x0b3, "OcteonTX2-95XX" },
-    { 0x0b4, "OcteonTX2-95XXN" },
-    { 0x0b5, "OcteonTX2-95XXMM" },
-    { 0x0b6, "OcteonTX2-95XXO" },
-    { 0x0b8, "ThunderX3-T110" },
-    { -1, nullptr }
+    { 0x0a1, "ThunderX 88XX" },
+    { 0x0a2, "ThunderX 81XX" },
+    { 0x0a3, "ThunderX 83XX" },
+    { 0x0af, "ThunderX2 99xx" },
+    { -1, nullptr },
 };

 static const id_part apm_part[] = {
    { 0x000, "X-Gene" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part qcom_part[] = {
@@ -161,43 +141,36 @@ static const id_part qcom_part[] = {
    { 0x201, "Kryo" },
    { 0x205, "Kryo" },
    { 0x211, "Kryo" },
-    { 0x800, "Falkor-V1/Kryo" },
-    { 0x801, "Kryo-V2" },
-    { 0x802, "Kryo-3XX-Gold" },
-    { 0x803, "Kryo-3XX-Silver" },
-    { 0x804, "Kryo-4XX-Gold" },
-    { 0x805, "Kryo-4XX-Silver" },
+    { 0x800, "Falkor V1/Kryo" },
+    { 0x801, "Kryo V2" },
    { 0xc00, "Falkor" },
    { 0xc01, "Saphira" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part samsung_part[] = {
    { 0x001, "exynos-m1" },
-    { 0x002, "exynos-m3" },
-    { 0x003, "exynos-m4" },
-    { 0x004, "exynos-m5" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part nvidia_part[] = {
    { 0x000, "Denver" },
    { 0x003, "Denver 2" },
    { 0x004, "Carmel" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part marvell_part[] = {
-    { 0x131, "Feroceon-88FR131" },
+    { 0x131, "Feroceon 88FR131" },
    { 0x581, "PJ4/PJ4b" },
    { 0x584, "PJ4B-MP" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part faraday_part[] = {
    { 0x526, "FA526" },
    { 0x626, "FA626" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const id_part intel_part[] = {
@@ -222,50 +195,23 @@ static const id_part intel_part[] = {
    { 0x689, "PXA31x" },
    { 0xb11, "SA1110" },
    { 0xc12, "IPX1200" },
-    { -1, nullptr }
+    { -1, nullptr },
 };

 static const struct id_part fujitsu_part[] = {
    { 0x001, "A64FX" },
-    { -1, nullptr }
+    { -1, "unknown" },
 };

 static const id_part hisi_part[] = {
-    { 0xd01, "Kunpeng-920" },	/* aka tsv110 */
-    { 0xd40, "Cortex-A76" },	/* HiSilicon uses this ID though advertises A76 */
-    { -1, nullptr }
+    { 0xd01, "Kunpeng-920" }, /* aka tsv110 */
+    { -1, nullptr },
 };

 static const id_part apple_part[] = {
    { 0x022, "M1" },
    { 0x023, "M1" },
-    { 0x024, "M1-Pro" },
-    { 0x025, "M1-Pro" },
-    { 0x028, "M1-Max" },
-    { 0x029, "M1-Max" },
-    { 0x032, "M2" },
-    { 0x033, "M2" },
-    { 0x034, "M2-Pro" },
-    { 0x035, "M2-Pro" },
-    { 0x038, "M2-Max" },
-    { 0x039, "M2-Max" },
-    { -1, nullptr }
-};
-
-
-static const struct id_part ft_part[] = {
-    { 0x660, "FTC660" },
-    { 0x661, "FTC661" },
-    { 0x662, "FTC662" },
-    { 0x663, "FTC663" },
-    { -1, nullptr }
-};
-
-
-static const struct id_part ampere_part[] = {
-    { 0xac3, "Ampere-1" },
-    { 0xac4, "Ampere-1a" },
-    { -1, nullptr }
+    { -1, nullptr },
 };


@@ -283,9 +229,7 @@ static const hw_impl hw_implementer[] = {
    { 0x56, marvell_part, "Marvell" },
    { 0x61, apple_part,   "Apple" },
    { 0x66, faraday_part, "Faraday" },
-    { 0x69, intel_part,   "Intel" },
-    { 0x70, ft_part,      "Phytium" },
-    { 0xc0, ampere_part,  "Ampere" }
+    { 0x69, intel_part,   "Intel" }
 };


--- a/src/backend/cuda/wrappers/CudaLib.cpp
+++ b/src/backend/cuda/wrappers/CudaLib.cpp
@@ -353,9 +353,13 @@ bool xmrig::CudaLib::open()
 #   ifdef XMRIG_OS_LINUX
    if (m_loader == defaultLoader) {
        m_loader = Process::location(Process::ExeLocation, m_loader);
-        if (uv_dlopen(m_loader, &cudaLib) == 0) {
-            return true;
-        }
+    }
+    else {
+        return false;
+    }
+
+    if (uv_dlopen(m_loader, &cudaLib) == 0) {
+        return true;
    }
 #   endif

--- a/src/backend/opencl/runners/tools/OclKawPow.cpp
+++ b/src/backend/opencl/runners/tools/OclKawPow.cpp
@@ -399,9 +399,6 @@ private:
    uv_loop_t* m_loop          = nullptr;
    uv_thread_t m_loopThread   = {};
    uv_async_t m_shutdownAsync = {};
-    uv_async_t m_batonAsync    = {};
-
-    std::vector<KawPowBaton> m_batons;

    static void loop(void* data)
    {
@@ -422,37 +419,19 @@ void KawPowBuilder::build_async(const IOclRunner& runner, uint64_t period, uint3
    if (!m_loop) {
        m_loop = new uv_loop_t{};
        uv_loop_init(m_loop);
-
-        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle)
-            {
-                KawPowBuilder* builder = reinterpret_cast<KawPowBuilder*>(handle->data);
-                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_shutdownAsync), nullptr);
-                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_batonAsync), nullptr);
-            });
-
-        uv_async_init(m_loop, &m_batonAsync, [](uv_async_t* handle)
-            {
-                std::vector<KawPowBaton> batons;
-                {
-                    KawPowBuilder* b = reinterpret_cast<KawPowBuilder*>(handle->data);
-
-                    std::lock_guard<std::mutex> lock(b->m_mutex);
-                    batons = std::move(b->m_batons);
-                }
-
-                for (const KawPowBaton& baton : batons) {
-                    builder.build(baton.runner, baton.period, baton.worksize);
-                }
-            });
-
-        m_shutdownAsync.data = this;
-        m_batonAsync.data = this;
-
+        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle) { uv_close(reinterpret_cast<uv_handle_t*>(handle), nullptr); });
        uv_thread_create(&m_loopThread, loop, this);
    }

-    m_batons.emplace_back(runner, period, worksize);
-    uv_async_send(&m_batonAsync);
+    KawPowBaton* baton = new KawPowBaton(runner, period, worksize);
+
+    uv_queue_work(m_loop, &baton->req,
+        [](uv_work_t* req) {
+            KawPowBaton* baton = static_cast<KawPowBaton*>(req->data);
+            builder.build(baton->runner, baton->period, baton->worksize);
+        },
+        [](uv_work_t* req, int) { delete static_cast<KawPowBaton*>(req->data); }
+    );
 }


--- a/src/base/api/Api.cpp
+++ b/src/base/api/Api.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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,21 +123,6 @@ void xmrig::Api::stop()
 }


-void xmrig::Api::tick()
-{
-#   ifdef XMRIG_FEATURE_HTTP
-    if (m_httpd->isBound() || !m_base->config()->http().isEnabled()) {
-        return;
-    }
-
-    if (++m_ticks % 10 == 0) {
-        m_ticks = 0;
-        m_httpd->start();
-    }
-#   endif
-}
-
-
 void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig)
 {
    if (config->apiId() != previousConfig->apiId()) {
--- a/src/base/api/Api.h
+++ b/src/base/api/Api.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -21,6 +21,7 @@


 #include <vector>
+#include <cstdint>


 #include "base/kernel/interfaces/IBaseListener.h"
@@ -43,7 +44,7 @@ class Api : public IBaseListener
 public:
    XMRIG_DISABLE_COPY_MOVE_DEFAULT(Api)

-    explicit Api(Base *base);
+    Api(Base *base);
    ~Api() override;

    inline const char *id() const                   { return m_id; }
@@ -53,7 +54,6 @@ public:
    void request(const HttpData &req);
    void start();
    void stop();
-    void tick();

 protected:
    void onConfigChanged(Config *config, Config *previousConfig) override;
@@ -65,15 +65,14 @@ private:

    Base *m_base;
    char m_id[32]{};
-    const uint64_t m_timestamp;
-    Httpd *m_httpd  = nullptr;
-    std::vector<IApiListener *> m_listeners;
    String m_workerId;
-    uint8_t m_ticks = 0;
+    const uint64_t m_timestamp;
+    Httpd *m_httpd = nullptr;
+    std::vector<IApiListener *> m_listeners;
 };


 } // namespace xmrig


-#endif // XMRIG_API_H
+#endif /* XMRIG_API_H */
--- a/src/base/api/Httpd.h
+++ b/src/base/api/Httpd.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -22,6 +22,11 @@

 #include "base/kernel/interfaces/IBaseListener.h"
 #include "base/net/http/HttpListener.h"
+#include "base/tools/Object.h"
+
+
+#include <cstdint>
+#include <memory>


 namespace xmrig {
@@ -38,11 +43,9 @@ class Httpd : public IBaseListener, public IHttpListener
 public:
    XMRIG_DISABLE_COPY_MOVE_DEFAULT(Httpd)

-    explicit Httpd(Base *base);
+    Httpd(Base *base);
    ~Httpd() override;

-    inline bool isBound() const { return m_server != nullptr; }
-
    bool start();
    void stop();

@@ -66,7 +69,7 @@ private:
 };


-} // namespace xmrig
+} /* namespace xmrig */


-#endif // XMRIG_HTTPD_H
+#endif /* XMRIG_HTTPD_H */
--- a/src/base/api/interfaces/IApiRequest.h
+++ b/src/base/api/interfaces/IApiRequest.h
@@ -52,6 +52,8 @@ public:
    enum RequestType {
        REQ_UNKNOWN,
        REQ_SUMMARY,
+        REQ_BACKENDS,
+        REQ_CONFIG,
        REQ_JSON_RPC
    };

--- a/src/base/api/requests/ApiRequest.h
+++ b/src/base/api/requests/ApiRequest.h
@@ -60,7 +60,7 @@ protected:
    inline Source source() const override           { return m_source; }
    inline void done(int) override                  { m_state = STATE_DONE; }

-    int m_version       = 1;
+    int m_version       = 0;
    RequestType m_type  = REQ_UNKNOWN;
    State m_state       = STATE_NEW;
    String m_rpcMethod;
--- a/src/base/api/requests/HttpApiRequest.cpp
+++ b/src/base/api/requests/HttpApiRequest.cpp
@@ -67,10 +67,33 @@ xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) :
    m_res(req.id()),
    m_url(req.url.c_str())
 {
-    if (method() == METHOD_GET) {
-        if (url() == "/1/summary" || url() == "/2/summary" || url() == "/api.json") {
-            m_type = REQ_SUMMARY;
+    if (url().size() > 4 && memcmp(url().data(), "/", 1) == 0 && memcmp(url().data()+2, "/", 1) == 0) {
+        if (memcmp(url().data(), "/2/", 3) == 0) {
+            m_version = 2;
+        } else if (memcmp(url().data(), "/1/", 3) == 0) {
+            m_version = 1;
        }
+        switch (url().size()) {
+        case 9:
+            if (memcmp(url().data()+3, "config", 6) == 0) {
+                m_type = REQ_CONFIG;
+            }
+            break;
+        case 10:
+            if (memcmp(url().data()+3, "summary", 7) == 0) {
+                m_type = REQ_SUMMARY;
+            }
+            break;
+        case 11:
+            if (memcmp(url().data()+3, "backends", 8) == 0) {
+                m_type = REQ_BACKENDS;
+            }
+            break;
+        }
+    }
+
+    if (url() == "/api.json") {
+            m_type = REQ_SUMMARY;
    }

    if (method() == METHOD_POST && url() == "/json_rpc") {
@@ -94,12 +117,6 @@ xmrig::HttpApiRequest::HttpApiRequest(const HttpData &req, bool restricted) :

        return;
    }
-
-    if (url().size() > 4) {
-        if (memcmp(url().data(), "/2/", 3) == 0) {
-            m_version = 2;
-        }
-    }
 }


--- a/src/base/crypto/Coin.cpp
+++ b/src/base/crypto/Coin.cpp
@@ -53,7 +53,6 @@ static const CoinInfo coinInfo[] = {
    { Algorithm::RX_KEVA,         "KVA",      "Kevacoin",     0,      0,              MAGENTA_BG_BOLD(WHITE_BOLD_S " keva    ") },
    { Algorithm::KAWPOW_RVN,      "RVN",      "Ravencoin",    0,      0,              BLUE_BG_BOLD(   WHITE_BOLD_S " raven   ") },
    { Algorithm::RX_WOW,          "WOW",      "Wownero",      300,    100000000000,   MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
-    { Algorithm::RX_0,            "ZEPH",     "Zephyr",       120,    1000000000000,  BLUE_BG_BOLD(   WHITE_BOLD_S " zephyr  ") },
 };


--- a/src/base/crypto/Coin.h
+++ b/src/base/crypto/Coin.h
@@ -39,7 +39,6 @@ public:
        KEVA,
        RAVEN,
        WOWNERO,
-        ZEPHYR,
        MAX
    };

--- a/src/base/kernel/Base.cpp
+++ b/src/base/kernel/Base.cpp
@@ -45,13 +45,6 @@
 #ifdef XMRIG_FEATURE_API
 #   include "base/api/Api.h"
 #   include "base/api/interfaces/IApiRequest.h"
-
-namespace xmrig {
-
-static const char *kConfigPathV1 = "/1/config";
-static const char *kConfigPathV2 = "/2/config";
-
-} // namespace xmrig
 #endif


@@ -317,7 +310,7 @@ void xmrig::Base::onFileChanged(const String &fileName)
 void xmrig::Base::onRequest(IApiRequest &request)
 {
    if (request.method() == IApiRequest::METHOD_GET) {
-        if (request.url() == kConfigPathV1 || request.url() == kConfigPathV2) {
+        if (request.type() == IApiRequest::REQ_CONFIG) {
            if (request.isRestricted()) {
                return request.done(403);
            }
@@ -327,7 +320,7 @@ void xmrig::Base::onRequest(IApiRequest &request)
        }
    }
    else if (request.method() == IApiRequest::METHOD_PUT || request.method() == IApiRequest::METHOD_POST) {
-        if (request.url() == kConfigPathV1 || request.url() == kConfigPathV2) {
+        if (request.type() == IApiRequest::REQ_CONFIG) {
            request.accept();

            if (!reload(request.json())) {
--- a/src/base/kernel/Platform.h
+++ b/src/base/kernel/Platform.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -49,12 +49,6 @@ public:
    static inline bool isUserActive(uint64_t ms)    { return idleTime() < ms; }
    static inline const String &userAgent()         { return m_userAgent; }

-#   ifdef XMRIG_OS_WIN
-    static bool hasKeepalive();
-#   else
-    static constexpr bool hasKeepalive()            { return true; }
-#   endif
-
    static bool isOnBatteryPower();
    static uint64_t idleTime();

--- a/src/base/kernel/Platform_hwloc.cpp
+++ b/src/base/kernel/Platform_hwloc.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 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
@@ -16,7 +16,9 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include "base/kernel/Platform.h"
+#include "backend/cpu/platform/HwlocCpuInfo.h"
 #include "backend/cpu/Cpu.h"


@@ -27,21 +29,20 @@
 #ifndef XMRIG_OS_APPLE
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {
-    auto topology = Cpu::info()->topology();
-    auto pu       = hwloc_get_pu_obj_by_os_index(topology, static_cast<unsigned>(cpu_id));
+    auto cpu       = static_cast<HwlocCpuInfo *>(Cpu::info());
+    hwloc_obj_t pu = hwloc_get_pu_obj_by_os_index(cpu->topology(), static_cast<unsigned>(cpu_id));

    if (pu == nullptr) {
        return false;
    }

-    if (hwloc_set_cpubind(topology, pu->cpuset, HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT) >= 0) {
+    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;
    }

-    const bool result = (hwloc_set_cpubind(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;
 }
 #endif
--- a/src/base/kernel/Platform_win.cpp
+++ b/src/base/kernel/Platform_win.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -16,6 +16,7 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include <algorithm>
 #include <winsock2.h>
 #include <windows.h>
@@ -69,12 +70,6 @@ char *xmrig::Platform::createUserAgent()
 }


-bool xmrig::Platform::hasKeepalive()
-{
-    return winOsVersion().dwMajorVersion >= 6;
-}
-
-
 #ifndef XMRIG_FEATURE_HWLOC
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {
--- a/src/base/kernel/config/BaseConfig.cpp
+++ b/src/base/kernel/config/BaseConfig.cpp
@@ -142,7 +142,7 @@ void xmrig::BaseConfig::printVersions()
    snprintf(buf, sizeof buf, "MSVC/%d", MSVC_VERSION);
 #   endif

-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s") WHITE_BOLD(" (built for %s") WHITE_BOLD(" %s,") WHITE_BOLD(" %s)"), "ABOUT", APP_NAME, APP_VERSION, buf, APP_OS, APP_ARCH, APP_BITS);
+    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s"), "ABOUT", APP_NAME, APP_VERSION, buf);

    std::string libs;

--- a/src/base/net/stratum/Client.cpp
+++ b/src/base/net/stratum/Client.cpp
@@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2019      jtgrassie   <https://github.com/jtgrassie>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -42,14 +42,13 @@
 #include "base/io/json/JsonRequest.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IClientListener.h"
-#include "base/kernel/Platform.h"
 #include "base/net/dns/Dns.h"
 #include "base/net/dns/DnsRecords.h"
 #include "base/net/stratum/Socks5.h"
 #include "base/net/tools/NetBuffer.h"
 #include "base/tools/Chrono.h"
-#include "base/tools/cryptonote/BlobReader.h"
 #include "base/tools/Cvt.h"
+#include "base/tools/cryptonote/BlobReader.h"
 #include "net/JobResult.h"


@@ -344,9 +343,6 @@ bool xmrig::Client::close()
    setState(ClosingState);

    if (uv_is_closing(reinterpret_cast<uv_handle_t*>(m_socket)) == 0) {
-        if (Platform::hasKeepalive()) {
-            uv_tcp_keepalive(m_socket, 0, 60);
-        }
        uv_close(reinterpret_cast<uv_handle_t*>(m_socket), Client::onClose);
    }

@@ -571,9 +567,9 @@ void xmrig::Client::connect(const sockaddr *addr)
    uv_tcp_init(uv_default_loop(), m_socket);
    uv_tcp_nodelay(m_socket, 1);

-    if (Platform::hasKeepalive()) {
-        uv_tcp_keepalive(m_socket, 1, 60);
-    }
+#   ifndef WIN32
+    uv_tcp_keepalive(m_socket, 1, 60);
+#   endif

    uv_tcp_connect(req, m_socket, addr, onConnect);
 }
@@ -589,7 +585,7 @@ void xmrig::Client::handshake()
    if (isTLS()) {
        m_expire = Chrono::steadyMSecs() + kResponseTimeout;

-        m_tls->handshake(m_pool.isSNI() ? m_pool.host().data() : nullptr);
+        m_tls->handshake();
    }
    else
 #   endif
--- a/src/base/net/stratum/DaemonClient.cpp
+++ b/src/base/net/stratum/DaemonClient.cpp
@@ -1,13 +1,13 @@
 /* XMRig
- * Copyright (c) 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright (c) 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright (c) 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright (c) 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright (c) 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright (c) 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright (c) 2019      Howard Chu  <https://github.com/hyc>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * 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 2019      Howard Chu  <https://github.com/hyc>
+ * 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,6 +23,7 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include <uv.h>


@@ -33,7 +34,6 @@
 #include "base/io/json/JsonRequest.h"
 #include "base/io/log/Log.h"
 #include "base/kernel/interfaces/IClientListener.h"
-#include "base/kernel/Platform.h"
 #include "base/net/dns/Dns.h"
 #include "base/net/dns/DnsRecords.h"
 #include "base/net/http/Fetch.h"
@@ -42,9 +42,9 @@
 #include "base/net/stratum/SubmitResult.h"
 #include "base/net/tools/NetBuffer.h"
 #include "base/tools/bswap_64.h"
-#include "base/tools/cryptonote/Signatures.h"
 #include "base/tools/Cvt.h"
 #include "base/tools/Timer.h"
+#include "base/tools/cryptonote/Signatures.h"
 #include "net/JobResult.h"


@@ -358,9 +358,9 @@ void xmrig::DaemonClient::onResolved(const DnsRecords &records, int status, cons
    uv_tcp_init(uv_default_loop(), s);
    uv_tcp_nodelay(s, 1);

-    if (Platform::hasKeepalive()) {
-        uv_tcp_keepalive(s, 1, 60);
-    }
+#   ifndef WIN32
+    uv_tcp_keepalive(s, 1, 60);
+#   endif

    if (m_pool.zmq_port() > 0) {
        delete m_ZMQSocket;
@@ -589,9 +589,6 @@ void xmrig::DaemonClient::retry()
    }

    if ((m_ZMQConnectionState != ZMQ_NOT_CONNECTED) && (m_ZMQConnectionState != ZMQ_DISCONNECTING)) {
-        if (Platform::hasKeepalive()) {
-            uv_tcp_keepalive(m_ZMQSocket, 0, 60);
-        }
        uv_close(reinterpret_cast<uv_handle_t*>(m_ZMQSocket), onZMQClose);
    }

@@ -919,9 +916,6 @@ bool xmrig::DaemonClient::ZMQClose(bool shutdown)
    m_ZMQConnectionState = ZMQ_DISCONNECTING;

    if (uv_is_closing(reinterpret_cast<uv_handle_t*>(m_ZMQSocket)) == 0) {
-        if (Platform::hasKeepalive()) {
-            uv_tcp_keepalive(m_ZMQSocket, 0, 60);
-        }
        uv_close(reinterpret_cast<uv_handle_t*>(m_ZMQSocket), shutdown ? onZMQShutdown : onZMQClose);
        if (!shutdown) {
            retry();
--- a/src/base/net/stratum/Pool.cpp
+++ b/src/base/net/stratum/Pool.cpp
@@ -77,7 +77,6 @@ const char *Pool::kSelfSelect             = "self-select";
 const char *Pool::kSOCKS5                 = "socks5";
 const char *Pool::kSubmitToOrigin         = "submit-to-origin";
 const char *Pool::kTls                    = "tls";
-const char *Pool::kSni                    = "sni";
 const char *Pool::kUrl                    = "url";
 const char *Pool::kUser                   = "user";
 const char *Pool::kSpendSecretKey         = "spend-secret-key";
@@ -138,7 +137,6 @@ xmrig::Pool::Pool(const rapidjson::Value &object) :
    m_flags.set(FLAG_ENABLED,  Json::getBool(object, kEnabled, true));
    m_flags.set(FLAG_NICEHASH, Json::getBool(object, kNicehash) || m_url.host().contains(kNicehashHost));
    m_flags.set(FLAG_TLS,      Json::getBool(object, kTls) || m_url.isTLS());
-    m_flags.set(FLAG_SNI,      Json::getBool(object, kSni));

    setKeepAlive(Json::getValue(object, kKeepalive));

@@ -301,7 +299,6 @@ rapidjson::Value xmrig::Pool::toJSON(rapidjson::Document &doc) const

    obj.AddMember(StringRef(kEnabled),      m_flags.test(FLAG_ENABLED), allocator);
    obj.AddMember(StringRef(kTls),          isTLS(), allocator);
-    obj.AddMember(StringRef(kSni),          isSNI(), allocator);
    obj.AddMember(StringRef(kFingerprint),  m_fingerprint.toJSON(), allocator);
    obj.AddMember(StringRef(kDaemon),       m_mode == MODE_DAEMON, allocator);
    obj.AddMember(StringRef(kSOCKS5),       m_proxy.toJSON(doc), allocator);
--- a/src/base/net/stratum/Pool.h
+++ b/src/base/net/stratum/Pool.h
@@ -70,7 +70,6 @@ public:
    static const char *kSOCKS5;
    static const char *kSubmitToOrigin;
    static const char *kTls;
-    static const char* kSni;
    static const char *kUrl;
    static const char *kUser;
    static const char* kSpendSecretKey;
@@ -96,7 +95,6 @@ public:

    inline bool isNicehash() const                      { return m_flags.test(FLAG_NICEHASH); }
    inline bool isTLS() const                           { return m_flags.test(FLAG_TLS) || m_url.isTLS(); }
-    inline bool isSNI() const                           { return m_flags.test(FLAG_SNI); }
    inline bool isValid() const                         { return m_url.isValid(); }
    inline const Algorithm &algorithm() const           { return m_algorithm; }
    inline const Coin &coin() const                     { return m_coin; }
@@ -140,7 +138,6 @@ private:
        FLAG_ENABLED,
        FLAG_NICEHASH,
        FLAG_TLS,
-        FLAG_SNI,
        FLAG_MAX
    };

--- a/src/base/net/stratum/Tls.cpp
+++ b/src/base/net/stratum/Tls.cpp
@@ -60,7 +60,7 @@ xmrig::Client::Tls::~Tls()
 }


-bool xmrig::Client::Tls::handshake(const char* servername)
+bool xmrig::Client::Tls::handshake()
 {
    m_ssl = SSL_new(m_ctx);
    assert(m_ssl != nullptr);
@@ -69,10 +69,6 @@ bool xmrig::Client::Tls::handshake(const char* servername)
        return false;
    }

-    if (servername) {
-        SSL_set_tlsext_host_name(m_ssl, servername);
-    }
-
    SSL_set_connect_state(m_ssl);
    SSL_set_bio(m_ssl, m_read, m_write);
    SSL_do_handshake(m_ssl);
--- a/src/base/net/stratum/Tls.h
+++ b/src/base/net/stratum/Tls.h
@@ -42,7 +42,7 @@ public:
    Tls(Client *client);
    ~Tls();

-    bool handshake(const char* servername);
+    bool handshake();
    bool send(const char *data, size_t size);
    const char *fingerprint() const;
    const char *version() const;
--- a/src/base/tools/cryptonote/BlockTemplate.cpp
+++ b/src/base/tools/cryptonote/BlockTemplate.cpp
@@ -197,11 +197,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
        ar(m_vote);
    }

-    if (m_coin == Coin::ZEPHYR) {
-        uint8_t pricing_record[120];
-        ar(pricing_record);
-    }
-
    // Miner transaction begin
    // Prefix begin
    setOffset(MINER_TX_PREFIX_OFFSET, ar.index());
@@ -225,12 +220,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
    ar(m_height);
    ar(m_numOutputs);

-    if (m_coin == Coin::ZEPHYR) {
-        if (m_numOutputs < 2) {
-            return false;
-        }
-    }
-    else if (m_numOutputs != 1) {
+    // must be 1 output
+    if (m_numOutputs != 1) {
        return false;
    }

@@ -246,37 +237,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)

    ar(m_ephPublicKey, kKeySize);

-    if (m_coin == Coin::ZEPHYR) {
-        if (m_outputType != 2) {
-            return false;
-        }
-
-        uint64_t asset_type_len;
-        ar(asset_type_len);
-        ar.skip(asset_type_len);
-        ar(m_viewTag);
-
-        for (uint64_t k = 1; k < m_numOutputs; ++k) {
-            uint64_t amount2;
-            ar(amount2);
-
-            uint8_t output_type2;
-            ar(output_type2);
-            if (output_type2 != 2) {
-                return false;
-            }
-
-            Span key2;
-            ar(key2, kKeySize);
-
-            ar(asset_type_len);
-            ar.skip(asset_type_len);
-
-            uint8_t view_tag2;
-            ar(view_tag2);
-        }
-    }
-    else if (m_outputType == 3) {
+    if (m_outputType == 3) {
        ar(m_viewTag);
    }

@@ -287,8 +248,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
    BlobReader<true> ar_extra(blob(TX_EXTRA_OFFSET), m_extraSize);
    ar.skip(m_extraSize);

-    bool pubkey_offset_first = true;
-
    while (ar_extra.index() < m_extraSize) {
        uint64_t extra_tag  = 0;
        uint64_t size       = 0;
@@ -297,10 +256,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)

        switch (extra_tag) {
        case 0x01: // TX_EXTRA_TAG_PUBKEY
-            if (pubkey_offset_first) {
-                pubkey_offset_first = false;
-                setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
-            }
+            setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
            ar_extra.skip(kKeySize);
            break;

@@ -321,13 +277,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
        }
    }

-    if (m_coin == Coin::ZEPHYR) {
-        uint64_t pricing_record_height, amount_burnt, amount_minted;
-        ar(pricing_record_height);
-        ar(amount_burnt);
-        ar(amount_minted);
-    }
-
    setOffset(MINER_TX_PREFIX_END_OFFSET, ar.index());
    // Prefix end

--- a/src/core/Miner.cpp
+++ b/src/core/Miner.cpp
@@ -689,7 +689,7 @@ void xmrig::Miner::onRequest(IApiRequest &request)
            d_ptr->getMiner(request.reply(), request.doc(), request.version());
            d_ptr->getHashrate(request.reply(), request.doc(), request.version());
        }
-        else if (request.url() == "/2/backends") {
+        else if (request.type() == IApiRequest::REQ_BACKENDS && request.version() == 2) {
            request.accept();

            d_ptr->getBackends(request.reply(), request.doc());
@@ -711,6 +711,12 @@ void xmrig::Miner::onRequest(IApiRequest &request)

            stop();
        }
+        else if (request.rpcMethod() == "start") {
+            request.accept();
+
+            const auto config = d_ptr->controller->config();
+            onConfigChanged(config, config);
+        }
    }

    for (IBackend *backend : d_ptr->backends) {
--- a/src/crypto/cn/asm/cn_main_loop.asm
+++ b/src/crypto/cn/asm/cn_main_loop.asm
@@ -8,7 +8,6 @@ PUBLIC cnv2_mainloop_bulldozer_asm
 PUBLIC cnv2_double_mainloop_sandybridge_asm
 PUBLIC cnv2_rwz_mainloop_asm
 PUBLIC cnv2_rwz_double_mainloop_asm
-PUBLIC cnv2_upx_double_mainloop_zen3_asm

 ALIGN(64)
 cnv1_single_mainloop_asm PROC
--- a/src/crypto/cn/asm/win64/cn_main_loop.asm
+++ b/src/crypto/cn/asm/win64/cn_main_loop.asm
@@ -8,7 +8,6 @@ PUBLIC cnv2_mainloop_bulldozer_asm
 PUBLIC cnv2_double_mainloop_sandybridge_asm
 PUBLIC cnv2_rwz_mainloop_asm
 PUBLIC cnv2_rwz_double_mainloop_asm
-PUBLIC cnv2_upx_double_mainloop_zen3_asm

 ALIGN(64)
 cnv1_single_mainloop_asm PROC
--- a/src/crypto/cn/sse2neon.h
+++ b/src/crypto/cn/sse2neon.h
--- a/src/crypto/common/VirtualMemory_hwloc.cpp
+++ b/src/crypto/common/VirtualMemory_hwloc.cpp
@@ -1,8 +1,8 @@
 /* XMRig
 * Copyright (c) 2018      Lee Clagett <https://github.com/vtnerd>
 * Copyright (c) 2018-2019 tevador     <tevador@gmail.com>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -18,8 +18,10 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include "crypto/common/VirtualMemory.h"
 #include "backend/cpu/Cpu.h"
+#include "backend/cpu/platform/HwlocCpuInfo.h"
 #include "base/io/log/Log.h"


@@ -32,9 +34,10 @@ uint32_t xmrig::VirtualMemory::bindToNUMANode(int64_t affinity)
        return 0;
    }

-    auto pu = hwloc_get_pu_obj_by_os_index(Cpu::info()->topology(), static_cast<unsigned>(affinity));
+    auto cpu       = static_cast<HwlocCpuInfo *>(Cpu::info());
+    hwloc_obj_t pu = hwloc_get_pu_obj_by_os_index(cpu->topology(), static_cast<unsigned>(affinity));

-    if (pu == nullptr || !Cpu::info()->membind(pu->nodeset)) {
+    if (pu == nullptr || !cpu->membind(pu->nodeset)) {
        LOG_WARN("CPU #%02" PRId64 " warning: \"can't bind memory\"", affinity);

        return 0;
--- a/src/crypto/common/VirtualMemory_unix.cpp
+++ b/src/crypto/common/VirtualMemory_unix.cpp
@@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2018-2020 tevador     <tevador@gmail.com>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -17,6 +17,7 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include "crypto/common/VirtualMemory.h"
 #include "backend/cpu/Cpu.h"
 #include "crypto/common/portable/mm_malloc.h"
@@ -24,7 +25,6 @@

 #include <cmath>
 #include <cstdlib>
-#include <fstream>
 #include <sys/mman.h>


@@ -84,9 +84,7 @@ static inline int hugePagesFlag(size_t size)

 bool xmrig::VirtualMemory::isHugepagesAvailable()
 {
-#   ifdef XMRIG_OS_LINUX
-    return std::ifstream("/proc/sys/vm/nr_hugepages").good() || std::ifstream("/sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages").good();
-#   elif defined(XMRIG_OS_MACOS) && defined(XMRIG_ARM)
+#   if defined(XMRIG_OS_MACOS) && defined(XMRIG_ARM)
    return false;
 #   else
    return true;
--- a/src/crypto/ghostrider/ghostrider.cpp
+++ b/src/crypto/ghostrider/ghostrider.cpp
@@ -47,12 +47,9 @@
 #include <uv.h>

 #ifdef XMRIG_FEATURE_HWLOC
-#   include "base/kernel/Platform.h"
-#   include <hwloc.h>
-
-#   if HWLOC_API_VERSION < 0x20000
-#       define HWLOC_OBJ_L3CACHE HWLOC_OBJ_CACHE
-#   endif
+#include "base/kernel/Platform.h"
+#include "backend/cpu/platform/HwlocCpuInfo.h"
+#include <hwloc.h>
 #endif

 #if defined(XMRIG_ARM)
@@ -89,7 +86,7 @@ CORE_HASH(14, whirlpool  );

 #undef CORE_HASH

-using core_hash_func = void (*)(const uint8_t* data, size_t size, uint8_t* output);
+typedef void (*core_hash_func)(const uint8_t* data, size_t size, uint8_t* output);
 static const core_hash_func core_hash[15] = { h0, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11, h12, h13, h14 };

 namespace xmrig
@@ -168,8 +165,6 @@ static struct AlgoTune

 struct HelperThread
 {
-    XMRIG_DISABLE_COPY_MOVE_DEFAULT(HelperThread)
-
    HelperThread(hwloc_bitmap_t cpu_set, int priority, bool is8MB) : m_cpuSet(cpu_set), m_priority(priority), m_is8MB(is8MB)
    {
        uv_mutex_init(&m_mutex);
@@ -199,17 +194,14 @@ struct HelperThread

    struct TaskBase
    {
-        XMRIG_DISABLE_COPY_MOVE(TaskBase)
-
-        TaskBase()          = default;
-        virtual ~TaskBase() = default;
-        virtual void run()  = 0;
+        virtual ~TaskBase() {}
+        virtual void run() = 0;
    };

    template<typename T>
    struct Task : TaskBase
    {
-        explicit inline Task(T&& task) : m_task(std::move(task))
+        inline Task(T&& task) : m_task(std::move(task))
        {
            static_assert(sizeof(Task) <= 128, "Task struct is too large");
        }
@@ -227,7 +219,7 @@ struct HelperThread
    inline void launch_task(T&& task)
    {
        uv_mutex_lock(&m_mutex);
-        new (&m_tasks[m_numTasks++]) Task<T>(std::forward<T>(task));
+        new (&m_tasks[m_numTasks++]) Task<T>(std::move(task));
        uv_cond_signal(&m_cond);
        uv_mutex_unlock(&m_mutex);
    }
@@ -242,7 +234,7 @@ struct HelperThread
    void run()
    {
        if (hwloc_bitmap_weight(m_cpuSet) > 0) {
-            hwloc_topology_t topology = Cpu::info()->topology();
+            hwloc_topology_t topology = reinterpret_cast<HwlocCpuInfo*>(Cpu::info())->topology();
            if (hwloc_set_cpubind(topology, m_cpuSet, HWLOC_CPUBIND_THREAD | HWLOC_CPUBIND_STRICT) < 0) {
                hwloc_set_cpubind(topology, m_cpuSet, HWLOC_CPUBIND_THREAD);
            }
@@ -296,9 +288,9 @@ void benchmark()
        // Try to avoid CPU core 0 because many system threads use it and can interfere
        uint32_t thread_index1 = (Cpu::info()->threads() > 2) ? 2 : 0;

-        hwloc_topology_t topology = Cpu::info()->topology();
+        hwloc_topology_t topology = reinterpret_cast<HwlocCpuInfo*>(Cpu::info())->topology();
        hwloc_obj_t pu = hwloc_get_pu_obj_by_os_index(topology, thread_index1);
-        hwloc_obj_t pu2 = nullptr;
+        hwloc_obj_t pu2;
        hwloc_get_closest_objs(topology, pu, &pu2, 1);
        uint32_t thread_index2 = pu2 ? pu2->os_index : thread_index1;

@@ -489,17 +481,12 @@ HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::v
    }

    if (cpu_index >= 0) {
-        hwloc_obj_t root = hwloc_get_root_obj(Cpu::info()->topology());
+        hwloc_topology_t topology = reinterpret_cast<HwlocCpuInfo*>(Cpu::info())->topology();
+        hwloc_obj_t root = hwloc_get_root_obj(topology);

        bool is8MB = false;

        findByType(root, HWLOC_OBJ_L3CACHE, [cpu_index, &is8MB](hwloc_obj_t obj) {
-#           if HWLOC_API_VERSION < 0x20000
-            if (obj->attr->cache.depth != 3) {
-                return false;
-            }
-#           endif
-
            if (!hwloc_bitmap_isset(obj->cpuset, cpu_index)) {
                return false;
            }
@@ -523,11 +510,7 @@ HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::v
            return true;
        });

-#       if HWLOC_API_VERSION >= 0x20000
        for (auto obj_type : { HWLOC_OBJ_CORE, HWLOC_OBJ_L1CACHE, HWLOC_OBJ_L2CACHE, HWLOC_OBJ_L3CACHE }) {
-#       else
-        for (auto obj_type : { HWLOC_OBJ_CORE, HWLOC_OBJ_CACHE }) {
-#       endif
            findByType(root, obj_type, [cpu_index, helper_cpu_set, main_threads_set](hwloc_obj_t obj) {
                const hwloc_cpuset_t& s = obj->cpuset;
                if (hwloc_bitmap_isset(s, cpu_index)) {
@@ -588,13 +571,9 @@ void hash_octa(const uint8_t* data, size_t size, uint8_t* output, cryptonight_ct
    uint8_t tmp[64 * N];

    if (helper && (tune[cn_indices[0]].threads == 2) && (tune[cn_indices[1]].threads == 2) && (tune[cn_indices[2]].threads == 2)) {
-        constexpr size_t n = N / 2;
-
-        helper->launch_task([av, data, size, &ctx_memory, ctx, &cn_indices, &core_indices, &tmp, output, tune]() {
-#           ifdef _MSC_VER
-            constexpr size_t n = N / 2;
-#           endif
+        const size_t n = N / 2;

+        helper->launch_task([n, av, data, size, &ctx_memory, ctx, &cn_indices, &core_indices, &tmp, output, tune]() {
            const uint8_t* input = data;
            size_t input_size = size;

--- a/src/crypto/randomx/jit_compiler_a64.cpp
+++ b/src/crypto/randomx/jit_compiler_a64.cpp
@@ -131,8 +131,8 @@ void JitCompilerA64::generateProgram(Program& program, ProgramConfiguration& con
 	// and w16, w10, ScratchpadL3Mask64
 	emit32(0x121A0000 | 16 | (10 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);

-	// and w17, w20, ScratchpadL3Mask64
-	emit32(0x121A0000 | 17 | (20 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);
+	// and w17, w18, ScratchpadL3Mask64
+	emit32(0x121A0000 | 17 | (18 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);

 	codePos = PrologueSize;
 	literalPos = ImulRcpLiteralsEnd;
@@ -148,16 +148,16 @@ void JitCompilerA64::generateProgram(Program& program, ProgramConfiguration& con
 	}

 	// Update spMix2
-	// eor w20, config.readReg2, config.readReg3
-	emit32(ARMV8A::EOR32 | 20 | (IntRegMap[config.readReg2] << 5) | (IntRegMap[config.readReg3] << 16), code, codePos);
+	// eor w18, config.readReg2, config.readReg3
+	emit32(ARMV8A::EOR32 | 18 | (IntRegMap[config.readReg2] << 5) | (IntRegMap[config.readReg3] << 16), code, codePos);

 	// Jump back to the main loop
 	const uint32_t offset = (((uint8_t*)randomx_program_aarch64_vm_instructions_end) - ((uint8_t*)randomx_program_aarch64)) - codePos;
 	emit32(ARMV8A::B | (offset / 4), code, codePos);

-	// and w20, w20, CacheLineAlignMask
+	// and w18, w18, CacheLineAlignMask
 	codePos = (((uint8_t*)randomx_program_aarch64_cacheline_align_mask1) - ((uint8_t*)randomx_program_aarch64));
-	emit32(0x121A0000 | 20 | (20 << 5) | ((RandomX_CurrentConfig.Log2_DatasetBaseSize - 7) << 10), code, codePos);
+	emit32(0x121A0000 | 18 | (18 << 5) | ((RandomX_CurrentConfig.Log2_DatasetBaseSize - 7) << 10), code, codePos);

 	// and w10, w10, CacheLineAlignMask
 	codePos = (((uint8_t*)randomx_program_aarch64_cacheline_align_mask2) - ((uint8_t*)randomx_program_aarch64));
@@ -189,8 +189,8 @@ void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration
 	// and w16, w10, ScratchpadL3Mask64
 	emit32(0x121A0000 | 16 | (10 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);

-	// and w17, w20, ScratchpadL3Mask64
-	emit32(0x121A0000 | 17 | (20 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);
+	// and w17, w18, ScratchpadL3Mask64
+	emit32(0x121A0000 | 17 | (18 << 5) | ((RandomX_CurrentConfig.Log2_ScratchpadL3 - 7) << 10), code, codePos);

 	codePos = PrologueSize;
 	literalPos = ImulRcpLiteralsEnd;
@@ -206,8 +206,8 @@ void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration
 	}

 	// Update spMix2
-	// eor w20, config.readReg2, config.readReg3
-	emit32(ARMV8A::EOR32 | 20 | (IntRegMap[config.readReg2] << 5) | (IntRegMap[config.readReg3] << 16), code, codePos);
+	// eor w18, config.readReg2, config.readReg3
+	emit32(ARMV8A::EOR32 | 18 | (IntRegMap[config.readReg2] << 5) | (IntRegMap[config.readReg3] << 16), code, codePos);

 	// Jump back to the main loop
 	const uint32_t offset = (((uint8_t*)randomx_program_aarch64_vm_instructions_end_light) - ((uint8_t*)randomx_program_aarch64)) - codePos;
@@ -477,7 +477,7 @@ void JitCompilerA64::emitAddImmediate(uint32_t dst, uint32_t src, uint32_t imm,
 	}
 	else
 	{
-		constexpr uint32_t tmp_reg = 20;
+		constexpr uint32_t tmp_reg = 18;
 		emitMovImmediate(tmp_reg, imm, code, k);

 		// add dst, src, tmp_reg
@@ -526,7 +526,7 @@ void JitCompilerA64::emitMemLoadFP(uint32_t src, Instruction& instr, uint8_t* co
 	uint32_t k = codePos;

 	uint32_t imm = instr.getImm32();
-	constexpr uint32_t tmp_reg = 19;
+	constexpr uint32_t tmp_reg = 18;

 	imm &= instr.getModMem() ? (RandomX_CurrentConfig.ScratchpadL1_Size - 1) : (RandomX_CurrentConfig.ScratchpadL2_Size - 1);
 	emitAddImmediate(tmp_reg, src, imm, code, k);
@@ -580,7 +580,7 @@ void JitCompilerA64::h_IADD_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// add dst, dst, tmp_reg
@@ -618,7 +618,7 @@ void JitCompilerA64::h_ISUB_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// sub dst, dst, tmp_reg
@@ -637,7 +637,7 @@ void JitCompilerA64::h_IMUL_R(Instruction& instr, uint32_t& codePos)

 	if (src == dst)
 	{
-		src = 20;
+		src = 18;
 		emitMovImmediate(src, instr.getImm32(), code, k);
 	}

@@ -655,7 +655,7 @@ void JitCompilerA64::h_IMUL_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// sub dst, dst, tmp_reg
@@ -686,7 +686,7 @@ void JitCompilerA64::h_IMULH_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// umulh dst, dst, tmp_reg
@@ -717,7 +717,7 @@ void JitCompilerA64::h_ISMULH_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// smulh dst, dst, tmp_reg
@@ -735,7 +735,7 @@ void JitCompilerA64::h_IMUL_RCP(Instruction& instr, uint32_t& codePos)

 	uint32_t k = codePos;

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	const uint32_t dst = IntRegMap[instr.dst];

 	constexpr uint64_t N = 1ULL << 63;
@@ -754,9 +754,9 @@ void JitCompilerA64::h_IMUL_RCP(Instruction& instr, uint32_t& codePos)
 	literalPos -= sizeof(uint64_t);
 	*(uint64_t*)(code + literalPos) = (q << shift) + ((r << shift) / divisor);

-	if (literal_id < 12)
+	if (literal_id < 13)
 	{
-		static constexpr uint32_t literal_regs[12] = { 30 << 16, 29 << 16, 28 << 16, 27 << 16, 26 << 16, 25 << 16, 24 << 16, 23 << 16, 22 << 16, 21 << 16, 11 << 16, 0 };
+		static constexpr uint32_t literal_regs[13] = { 30 << 16, 29 << 16, 28 << 16, 27 << 16, 26 << 16, 25 << 16, 24 << 16, 23 << 16, 22 << 16, 21 << 16, 20 << 16, 11 << 16, 0 };

 		// mul dst, dst, literal_reg
 		emit32(ARMV8A::MUL | dst | (dst << 5) | literal_regs[literal_id], code, k);
@@ -794,7 +794,7 @@ void JitCompilerA64::h_IXOR_R(Instruction& instr, uint32_t& codePos)

 	if (src == dst)
 	{
-		src = 20;
+		src = 18;
 		emitMovImmediate(src, instr.getImm32(), code, k);
 	}

@@ -812,7 +812,7 @@ void JitCompilerA64::h_IXOR_M(Instruction& instr, uint32_t& codePos)
 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emitMemLoad<tmp_reg>(dst, src, instr, code, k);

 	// eor dst, dst, tmp_reg
@@ -850,7 +850,7 @@ void JitCompilerA64::h_IROL_R(Instruction& instr, uint32_t& codePos)

 	if (src != dst)
 	{
-		constexpr uint32_t tmp_reg = 20;
+		constexpr uint32_t tmp_reg = 18;

 		// sub tmp_reg, xzr, src
 		emit32(ARMV8A::SUB | tmp_reg | (31 << 5) | (src << 16), code, k);
@@ -878,7 +878,7 @@ void JitCompilerA64::h_ISWAP_R(Instruction& instr, uint32_t& codePos)

 	uint32_t k = codePos;

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	emit32(ARMV8A::MOV_REG | tmp_reg | (dst << 16), code, k);
 	emit32(ARMV8A::MOV_REG | dst | (src << 16), code, k);
 	emit32(ARMV8A::MOV_REG | src | (tmp_reg << 16), code, k);
@@ -1026,7 +1026,7 @@ void JitCompilerA64::h_CFROUND(Instruction& instr, uint32_t& codePos)

 	const uint32_t src = IntRegMap[instr.src];

-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;
 	constexpr uint32_t fpcr_tmp_reg = 8;

 	// ror tmp_reg, src, imm
@@ -1050,7 +1050,7 @@ void JitCompilerA64::h_ISTORE(Instruction& instr, uint32_t& codePos)

 	const uint32_t src = IntRegMap[instr.src];
 	const uint32_t dst = IntRegMap[instr.dst];
-	constexpr uint32_t tmp_reg = 20;
+	constexpr uint32_t tmp_reg = 18;

 	uint32_t imm = instr.getImm32();

--- a/src/crypto/randomx/jit_compiler_a64_static.S
+++ b/src/crypto/randomx/jit_compiler_a64_static.S
@@ -72,9 +72,9 @@
 # x15 -> "r7"
 # x16 -> spAddr0
 # x17 -> spAddr1
-# x18 -> unused (platform register, don't touch it)
+# x18 -> temporary
 # x19 -> temporary
-# x20 -> temporary
+# x20 -> literal for IMUL_RCP
 # x21 -> literal for IMUL_RCP
 # x22 -> literal for IMUL_RCP
 # x23 -> literal for IMUL_RCP
@@ -109,7 +109,7 @@ DECL(randomx_program_aarch64):
 	# Save callee-saved registers
 	sub	sp, sp, 192
 	stp	x16, x17, [sp]
-	str	x19, [sp, 16]
+	stp	x18, x19, [sp, 16]
 	stp	x20, x21, [sp, 32]
 	stp	x22, x23, [sp, 48]
 	stp	x24, x25, [sp, 64]
@@ -164,6 +164,7 @@ DECL(randomx_program_aarch64):
 	# Read literals
 	ldr	x0, literal_x0
 	ldr	x11, literal_x11
+	ldr	x20, literal_x20
 	ldr	x21, literal_x21
 	ldr	x22, literal_x22
 	ldr	x23, literal_x23
@@ -195,11 +196,11 @@ DECL(randomx_program_aarch64):
 DECL(randomx_program_aarch64_main_loop):
 	# spAddr0 = spMix1 & ScratchpadL3Mask64;
 	# spAddr1 = (spMix1 >> 32) & ScratchpadL3Mask64;
-	lsr	x20, x10, 32
+	lsr	x18, x10, 32

 	# Actual mask will be inserted by JIT compiler
 	and	w16, w10, 1
-	and	w17, w20, 1
+	and	w17, w18, 1

 	# x16 = scratchpad + spAddr0
 	# x17 = scratchpad + spAddr1
@@ -207,31 +208,31 @@ DECL(randomx_program_aarch64_main_loop):
 	add	x17, x17, x2

 	# xor integer registers with scratchpad data (spAddr0)
-	ldp	x20, x19, [x16]
-	eor	x4, x4, x20
+	ldp	x18, x19, [x16]
+	eor	x4, x4, x18
 	eor	x5, x5, x19
-	ldp	x20, x19, [x16, 16]
-	eor	x6, x6, x20
+	ldp	x18, x19, [x16, 16]
+	eor	x6, x6, x18
 	eor	x7, x7, x19
-	ldp	x20, x19, [x16, 32]
-	eor	x12, x12, x20
+	ldp	x18, x19, [x16, 32]
+	eor	x12, x12, x18
 	eor	x13, x13, x19
-	ldp	x20, x19, [x16, 48]
-	eor	x14, x14, x20
+	ldp	x18, x19, [x16, 48]
+	eor	x14, x14, x18
 	eor	x15, x15, x19

 	# Load group F registers (spAddr1)
-	ldpsw	x20, x19, [x17]
-	ins	v16.d[0], x20
+	ldpsw	x18, x19, [x17]
+	ins	v16.d[0], x18
 	ins	v16.d[1], x19
-	ldpsw	x20, x19, [x17, 8]
-	ins	v17.d[0], x20
+	ldpsw	x18, x19, [x17, 8]
+	ins	v17.d[0], x18
 	ins	v17.d[1], x19
-	ldpsw	x20, x19, [x17, 16]
-	ins	v18.d[0], x20
+	ldpsw	x18, x19, [x17, 16]
+	ins	v18.d[0], x18
 	ins	v18.d[1], x19
-	ldpsw	x20, x19, [x17, 24]
-	ins	v19.d[0], x20
+	ldpsw	x18, x19, [x17, 24]
+	ins	v19.d[0], x18
 	ins	v19.d[1], x19
 	scvtf	v16.2d, v16.2d
 	scvtf	v17.2d, v17.2d
@@ -239,17 +240,17 @@ DECL(randomx_program_aarch64_main_loop):
 	scvtf	v19.2d, v19.2d

 	# Load group E registers (spAddr1)
-	ldpsw	x20, x19, [x17, 32]
-	ins	v20.d[0], x20
+	ldpsw	x18, x19, [x17, 32]
+	ins	v20.d[0], x18
 	ins	v20.d[1], x19
-	ldpsw	x20, x19, [x17, 40]
-	ins	v21.d[0], x20
+	ldpsw	x18, x19, [x17, 40]
+	ins	v21.d[0], x18
 	ins	v21.d[1], x19
-	ldpsw	x20, x19, [x17, 48]
-	ins	v22.d[0], x20
+	ldpsw	x18, x19, [x17, 48]
+	ins	v22.d[0], x18
 	ins	v22.d[1], x19
-	ldpsw	x20, x19, [x17, 56]
-	ins	v23.d[0], x20
+	ldpsw	x18, x19, [x17, 56]
+	ins	v23.d[0], x18
 	ins	v23.d[1], x19
 	scvtf	v20.2d, v20.2d
 	scvtf	v21.2d, v21.2d
@@ -272,6 +273,7 @@ DECL(randomx_program_aarch64_vm_instructions):

 literal_x0:  .fill 1,8,0
 literal_x11: .fill 1,8,0
+literal_x20: .fill 1,8,0
 literal_x21: .fill 1,8,0
 literal_x22: .fill 1,8,0
 literal_x23: .fill 1,8,0
@@ -307,17 +309,17 @@ DECL(randomx_program_aarch64_vm_instructions_end):
 	lsr	x10, x9, 32

 	# mx ^= r[readReg2] ^ r[readReg3];
-	eor	x9, x9, x20
+	eor	x9, x9, x18

 	# Calculate dataset pointer for dataset prefetch
-	mov	w20, w9
+	mov	w18, w9
 DECL(randomx_program_aarch64_cacheline_align_mask1):
 	# Actual mask will be inserted by JIT compiler
-	and	x20, x20, 1
-	add	x20, x20, x1
+	and	x18, x18, 1
+	add	x18, x18, x1

 	# Prefetch dataset data
-	prfm	pldl2strm, [x20]
+	prfm	pldl2strm, [x18]

 	# mx <-> ma
 	ror	x9, x9, 32
@@ -329,17 +331,17 @@ DECL(randomx_program_aarch64_cacheline_align_mask2):

 DECL(randomx_program_aarch64_xor_with_dataset_line):
 	# xor integer registers with dataset data
-	ldp	x20, x19, [x10]
-	eor	x4, x4, x20
+	ldp	x18, x19, [x10]
+	eor	x4, x4, x18
 	eor	x5, x5, x19
-	ldp	x20, x19, [x10, 16]
-	eor	x6, x6, x20
+	ldp	x18, x19, [x10, 16]
+	eor	x6, x6, x18
 	eor	x7, x7, x19
-	ldp	x20, x19, [x10, 32]
-	eor	x12, x12, x20
+	ldp	x18, x19, [x10, 32]
+	eor	x12, x12, x18
 	eor	x13, x13, x19
-	ldp	x20, x19, [x10, 48]
-	eor	x14, x14, x20
+	ldp	x18, x19, [x10, 48]
+	eor	x14, x14, x18
 	eor	x15, x15, x19

 DECL(randomx_program_aarch64_update_spMix1):
@@ -382,7 +384,7 @@ DECL(randomx_program_aarch64_update_spMix1):

 	# Restore callee-saved registers
 	ldp	x16, x17, [sp]
-	ldr	x19, [sp, 16]
+	ldp	x18, x19, [sp, 16]
 	ldp	x20, x21, [sp, 32]
 	ldp	x22, x23, [sp, 48]
 	ldp	x24, x25, [sp, 64]
@@ -403,7 +405,7 @@ DECL(randomx_program_aarch64_vm_instructions_end_light):
 	stp	x2, x30, [sp, 80]

 	# mx ^= r[readReg2] ^ r[readReg3];
-	eor	x9, x9, x20
+	eor	x9, x9, x18

 	# mx <-> ma
 	ror	x9, x9, 32
@@ -445,8 +447,8 @@ DECL(randomx_program_aarch64_light_dataset_offset):
 # x3 -> end item

 DECL(randomx_init_dataset_aarch64):
-	# Save x20 (used as temporary, but must be saved to not break ABI) and x30 (return address)
-	stp	x20, x30, [sp, -16]!
+	# Save x30 (return address)
+	str	x30, [sp, -16]!

 	# Load pointer to cache memory
 	ldr	x0, [x0]
@@ -458,8 +460,8 @@ DECL(randomx_init_dataset_aarch64_main_loop):
 	cmp	x2, x3
 	bne	DECL(randomx_init_dataset_aarch64_main_loop)

-	# Restore x20 and x30
-	ldp	x20, x30, [sp], 16
+	# Restore x30 (return address)
+	ldr	x30, [sp], 16

 	ret

--- a/src/crypto/rx/RxConfig.cpp
+++ b/src/crypto/rx/RxConfig.cpp
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -22,6 +22,11 @@
 #include "base/io/json/Json.h"


+#ifdef XMRIG_FEATURE_HWLOC
+#   include "backend/cpu/platform/HwlocCpuInfo.h"
+#endif
+
+
 #include <array>
 #include <algorithm>
 #include <cmath>
@@ -185,7 +190,7 @@ std::vector<uint32_t> xmrig::RxConfig::nodeset() const
        return m_nodeset;
    }

-    return (m_numa && Cpu::info()->nodes() > 1) ? Cpu::info()->nodeset() : std::vector<uint32_t>();
+    return (m_numa && Cpu::info()->nodes() > 1) ? static_cast<HwlocCpuInfo *>(Cpu::info())->nodeset() : std::vector<uint32_t>();
 }
 #endif

--- a/src/crypto/rx/RxConfig.h
+++ b/src/crypto/rx/RxConfig.h
@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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,7 +123,7 @@ private:
 };


-} // namespace xmrig
+} /* namespace xmrig */


-#endif // XMRIG_RXCONFIG_H
+#endif /* XMRIG_RXCONFIG_H */
--- a/src/crypto/rx/RxNUMAStorage.cpp
+++ b/src/crypto/rx/RxNUMAStorage.cpp
@@ -1,7 +1,7 @@
 /* XMRig
 * Copyright (c) 2018-2019 tevador     <tevador@gmail.com>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 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
@@ -19,6 +19,7 @@

 #include "crypto/rx/RxNUMAStorage.h"
 #include "backend/cpu/Cpu.h"
+#include "backend/cpu/platform/HwlocCpuInfo.h"
 #include "base/io/log/Log.h"
 #include "base/io/log/Tags.h"
 #include "base/kernel/Platform.h"
@@ -44,12 +45,13 @@ static std::mutex mutex;

 static bool bindToNUMANode(uint32_t nodeId)
 {
-    auto node = hwloc_get_numanode_obj_by_os_index(Cpu::info()->topology(), nodeId);
+    auto cpu         = static_cast<HwlocCpuInfo *>(Cpu::info());
+    hwloc_obj_t node = hwloc_get_numanode_obj_by_os_index(cpu->topology(), nodeId);
    if (!node) {
        return false;
    }

-    if (Cpu::info()->membind(node->nodeset)) {
+    if (cpu->membind(node->nodeset)) {
        Platform::setThreadAffinity(static_cast<uint64_t>(hwloc_bitmap_first(node->cpuset)));

        return true;
--- a/src/net/Network.cpp
+++ b/src/net/Network.cpp
@@ -308,10 +308,6 @@ void xmrig::Network::tick()
    if (m_donate) {
        m_donate->tick(now);
    }
-
-#   ifdef XMRIG_FEATURE_API
-    m_controller->api()->tick();
-#   endif
 }


--- a/src/version.h
+++ b/src/version.h
@@ -22,15 +22,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.21.0"
+#define APP_VERSION   "6.19.3-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
 #define APP_KIND      "miner"

 #define APP_VER_MAJOR  6
-#define APP_VER_MINOR  21
-#define APP_VER_PATCH  0
+#define APP_VER_MINOR  19
+#define APP_VER_PATCH  3

 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)
@@ -52,39 +52,4 @@
 #   endif
 #endif

-#ifdef XMRIG_OS_WIN
-#    define APP_OS "Windows"
-#elif defined XMRIG_OS_IOS
-#    define APP_OS "iOS"
-#elif defined XMRIG_OS_MACOS
-#    define APP_OS "macOS"
-#elif defined XMRIG_OS_ANDROID
-#    define APP_OS "Android"
-#elif defined XMRIG_OS_LINUX
-#    define APP_OS "Linux"
-#elif defined XMRIG_OS_FREEBSD
-#    define APP_OS "FreeBSD"
-#else
-#    define APP_OS "Unknown OS"
-#endif
-
-#define STR(X) #X
-#define STR2(X) STR(X)
-
-#ifdef XMRIG_ARM
-#   define APP_ARCH "ARMv" STR2(XMRIG_ARM)
-#else
-#   if defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
-#       define APP_ARCH "x86-64"
-#   else
-#       define APP_ARCH "x86"
-#   endif
-#endif
-
-#ifdef XMRIG_64_BIT
-#   define APP_BITS "64 bit"
-#else
-#   define APP_BITS "32 bit"
-#endif
-
 #endif // XMRIG_VERSION_H
Author	SHA1	Message	Date
Tony Butler	460ae15b85	Update/Improve API docs	2023-05-23 16:49:48 -06:00
Tony Butler	2e167031cc	Cleanup API code	2023-05-23 16:49:48 -06:00