Fixes

src/bytecode_machine.hpp

@@ -161,11 +161,11 @@ namespace randomx {
 		}
 
 		static void exe_IROR_R(RANDOMX_EXE_ARGS) {
-			*ibc.idst = rotr(*ibc.idst, *ibc.isrc & 63);
+			*ibc.idst = rotr64(*ibc.idst, *ibc.isrc & 63);
 		}
 
 		static void exe_IROL_R(RANDOMX_EXE_ARGS) {
-			*ibc.idst = rotl(*ibc.idst, *ibc.isrc & 63);
+			*ibc.idst = rotl64(*ibc.idst, *ibc.isrc & 63);
 		}
 
 		static void exe_ISWAP_R(RANDOMX_EXE_ARGS) {
@@ -225,7 +225,7 @@ namespace randomx {
 		}
 
 		static void exe_CFROUND(RANDOMX_EXE_ARGS) {
-			rx_set_rounding_mode(rotr(*ibc.isrc, ibc.imm) % 4);
+			rx_set_rounding_mode(rotr64(*ibc.isrc, ibc.imm) % 4);
 		}
 
 		static void exe_ISTORE(RANDOMX_EXE_ARGS) {

src/common.hpp

@@ -59,13 +59,13 @@ namespace randomx {
 	//static_assert(RANDOMX_JUMP_OFFSET >= 0, "RANDOMX_JUMP_OFFSET must be greater than or equal to 0.");
 	//static_assert(RANDOMX_JUMP_BITS + RANDOMX_JUMP_OFFSET <= 16, "RANDOMX_JUMP_BITS + RANDOMX_JUMP_OFFSET must not exceed 16.");
 
-	//constexpr int wtSum = RANDOMX_FREQ_IADD_RS + RANDOMX_FREQ_IADD_M + RANDOMX_FREQ_ISUB_R + \
-	//	RANDOMX_FREQ_ISUB_M + RANDOMX_FREQ_IMUL_R + RANDOMX_FREQ_IMUL_M + RANDOMX_FREQ_IMULH_R + \
-	//	RANDOMX_FREQ_IMULH_M + RANDOMX_FREQ_ISMULH_R + RANDOMX_FREQ_ISMULH_M + RANDOMX_FREQ_IMUL_RCP + \
-	//	RANDOMX_FREQ_INEG_R + RANDOMX_FREQ_IXOR_R + RANDOMX_FREQ_IXOR_M + RANDOMX_FREQ_IROR_R + RANDOMX_FREQ_IROL_R + RANDOMX_FREQ_ISWAP_R + \
-	//	RANDOMX_FREQ_FSWAP_R + RANDOMX_FREQ_FADD_R + RANDOMX_FREQ_FADD_M + RANDOMX_FREQ_FSUB_R + RANDOMX_FREQ_FSUB_M + \
-	//	RANDOMX_FREQ_FSCAL_R + RANDOMX_FREQ_FMUL_R + RANDOMX_FREQ_FDIV_M + RANDOMX_FREQ_FSQRT_R + RANDOMX_FREQ_CBRANCH + \
-	//	RANDOMX_FREQ_CFROUND + RANDOMX_FREQ_ISTORE + RANDOMX_FREQ_NOP;
+	/*constexpr int wtSum = RANDOMX_FREQ_IADD_RS + RANDOMX_FREQ_IADD_M + RANDOMX_FREQ_ISUB_R + \
+		RANDOMX_FREQ_ISUB_M + RANDOMX_FREQ_IMUL_R + RANDOMX_FREQ_IMUL_M + RANDOMX_FREQ_IMULH_R + \
+		RANDOMX_FREQ_IMULH_M + RANDOMX_FREQ_ISMULH_R + RANDOMX_FREQ_ISMULH_M + RANDOMX_FREQ_IMUL_RCP + \
+		RANDOMX_FREQ_INEG_R + RANDOMX_FREQ_IXOR_R + RANDOMX_FREQ_IXOR_M + RANDOMX_FREQ_IROR_R + RANDOMX_FREQ_IROL_R + RANDOMX_FREQ_ISWAP_R + \
+		RANDOMX_FREQ_FSWAP_R + RANDOMX_FREQ_FADD_R + RANDOMX_FREQ_FADD_M + RANDOMX_FREQ_FSUB_R + RANDOMX_FREQ_FSUB_M + \
+		RANDOMX_FREQ_FSCAL_R + RANDOMX_FREQ_FMUL_R + RANDOMX_FREQ_FDIV_M + RANDOMX_FREQ_FSQRT_R + RANDOMX_FREQ_CBRANCH + \
+		RANDOMX_FREQ_CFROUND + RANDOMX_FREQ_ISTORE + RANDOMX_FREQ_NOP;*/
 
 	//static_assert(wtSum == 256,	"Sum of instruction frequencies must be 256.");
 

src/instructions_portable.cpp

@@ -51,14 +51,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	#include <intrin.h>
 	#include <stdlib.h>
 
-	uint64_t rotl(uint64_t x, unsigned int c) {
+	uint64_t rotl64(uint64_t x, unsigned int c) {
 		return _rotl64(x, c);
 	}
-	uint64_t rotr(uint64_t x, unsigned int c) {
+	uint64_t rotr64(uint64_t x, unsigned int c) {
 		return _rotr64(x, c);
 	}
-	#define HAVE_ROTL
-	#define HAVE_ROTR
+	#define HAVE_ROTL64
+	#define HAVE_ROTR64
 
 	#if EVAL_DEFINE(__MACHINEARM64_X64(1))
 		uint64_t mulh(uint64_t a, uint64_t b) {
@@ -88,18 +88,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	}
 #endif
 
-#ifndef HAVE_ROTR
-	uint64_t rotr(uint64_t a, unsigned int b) {
+#ifndef HAVE_ROTR64
+	uint64_t rotr64(uint64_t a, unsigned int b) {
 		return (a >> b) | (a << (-b & 63));
 	}
-	#define HAVE_ROTR
+	#define HAVE_ROTR64
 #endif
 
-#ifndef HAVE_ROTL
-	uint64_t rotl(uint64_t a, unsigned int b) {
+#ifndef HAVE_ROTL64
+	uint64_t rotl64(uint64_t a, unsigned int b) {
 		return (a << b) | (a >> (-b & 63));
 	}
-	#define HAVE_ROTL
+	#define HAVE_ROTL64
 #endif
 
 #ifndef HAVE_MULH

src/intrin_portable.h

@@ -601,5 +601,5 @@ FORCE_INLINE rx_vec_i128 rx_aesdec_vec_i128(rx_vec_i128 v, rx_vec_i128 rkey) {
 double loadDoublePortable(const void* addr);
 uint64_t mulh(uint64_t, uint64_t);
 int64_t smulh(int64_t, int64_t);
-uint64_t rotl(uint64_t, unsigned int);
-uint64_t rotr(uint64_t, unsigned int);
+uint64_t rotl64(uint64_t, unsigned int);
+uint64_t rotr64(uint64_t, unsigned int);

src/superscalar.cpp

@@ -859,7 +859,7 @@ namespace randomx {
 				r[instr.dst] *= r[instr.src];
 				break;
 			case SuperscalarInstructionType::IROR_C:
-				r[instr.dst] = rotr(r[instr.dst], instr.getImm32());
+				r[instr.dst] = rotr64(r[instr.dst], instr.getImm32());
 				break;
 			case SuperscalarInstructionType::IADD_C7:
 			case SuperscalarInstructionType::IADD_C8: