mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-04-20 14:02:46 -04:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.7.0 into master

Browse Source
This commit is contained in:
MoneroOcean
2020-12-23 06:03:02 +00:00
parent 966aaa72ca 9d256a1e9b
commit 1719879f7e
249 changed files with 6814 additions and 6134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/cn/CnHash.cpp
View File

@@ -219,7 +219,7 @@ static void patchAsmVariants()
patchCode(cn_double_double_mainloop_sandybridge_asm, cnv2_double_mainloop_sandybridge_asm, ITER);
}
VirtualMemory::protectExecutableMemory(base, allocation_size);
VirtualMemory::protectRX(base, allocation_size);
VirtualMemory::flushInstructionCache(base, allocation_size);
}
} // namespace xmrig

2
src/crypto/cn/r/CryptonightR_gen.cpp
View File

@@ -76,7 +76,7 @@ static inline void add_random_math(uint8_t* &p, const V4_Instruction* code, int
void_func begin = instructions[c];
if ((ASM = xmrig::Assembly::BULLDOZER) && (inst.opcode == MUL) && !is_64_bit) {
if ((ASM == xmrig::Assembly::BULLDOZER) && (inst.opcode == MUL) && !is_64_bit) {
// AMD Bulldozer has latency 4 for 32-bit IMUL and 6 for 64-bit IMUL
// Always use 32-bit IMUL for AMD Bulldozer in 32-bit mode - skip prefix 0x48 and change 0x49 to 0x41
uint8_t* prefix = reinterpret_cast<uint8_t*>(begin);