fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge https://github.com/xmrig/xmrig

Browse source
This commit is contained in:
MoneroOcean 2019-11-29 13:02:41 -08:00
commit 6e95a8ecd6
27 changed files with 6888 additions and 7338 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/crypto/common/Algorithm.cpp
View file

@ -161,7 +161,9 @@ size_t xmrig::Algorithm::l2() const
size_t xmrig::Algorithm::l3() const
{
# if defined(XMRIG_ALGO_RANDOMX) || defined(XMRIG_ALGO_ARGON2)
constexpr size_t oneMiB = 0x100000;
# endif
const Family f = family();
assert(f != UNKNOWN);

4
src/crypto/randomx/randomx.cpp
View file

@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(_M_X64) || defined(__x86_64__)
#include "crypto/randomx/jit_compiler_x86_static.hpp"
#elif defined(XMRIG_ARM)
#elif defined(XMRIG_ARMv8)
#include "crypto/randomx/jit_compiler_a64_static.hpp"
#endif
@ -201,7 +201,7 @@ void RandomX_ConfigurationBase::Apply()
#define JIT_HANDLE(x, prev) randomx::JitCompilerX86::engine[k] = &randomx::JitCompilerX86::h_##x
#elif defined(XMRIG_ARM)
#elif defined(XMRIG_ARMv8)
Log2_ScratchpadL1 = Log2(ScratchpadL1_Size);
Log2_ScratchpadL2 = Log2(ScratchpadL2_Size);

2
src/crypto/randomx/randomx.h
View file

@ -133,7 +133,7 @@ struct RandomX_ConfigurationBase
uint32_t ConditionMask_Calculated;
#ifdef XMRIG_ARM
#if defined(XMRIG_ARMv8)
uint32_t Log2_ScratchpadL1;
uint32_t Log2_ScratchpadL2;
uint32_t Log2_ScratchpadL3;