Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5210 

997830f3 disable asm w/ x64 instructions set on i386 (naughtyfox)
This commit is contained in:
Riccardo Spagni 2019-03-03 18:34:48 +02:00
parent 5aac057dc6 997830f31b
commit b8af6ee471
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/CMakeLists.txt
View File

@ -48,7 +48,7 @@ set(crypto_sources
CryptonightR_JIT.c
tree-hash.c)
if(ARCH_ID STREQUAL "i386" OR ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64")
if(ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64")
list(APPEND crypto_sources CryptonightR_template.S)
endif()

6
src/crypto/CryptonightR_JIT.c
View File

@ -12,7 +12,7 @@
#include "CryptonightR_template.h"
static const uint8_t prologue[] = {
#if defined __i386 || defined __x86_64__
#if defined __x86_64__
0x4C, 0x8B, 0xD7, // mov r10, rdi
0x53, // push rbx
0x55, // push rbp
@ -31,7 +31,7 @@ static const uint8_t prologue[] = {
};
static const uint8_t epilogue[] = {
#if defined __i386 || defined __x86_64__
#if defined __x86_64__
0x49, 0x8B, 0xE3, // mov rsp, r11
0x41, 0x89, 0x1A, // mov DWORD PTR [r10], ebx
0x41, 0x89, 0x72, 0x04, // mov DWORD PTR [r10+4], esi
@ -54,7 +54,7 @@ static const uint8_t epilogue[] = {
int v4_generate_JIT_code(const struct V4_Instruction* code, v4_random_math_JIT_func buf, const size_t buf_size)
{
#if defined __i386 || defined __x86_64__
#if defined __x86_64__
uint8_t* JIT_code = (uint8_t*) buf;
const uint8_t* JIT_code_end = JIT_code + buf_size;

2
src/crypto/CryptonightR_JIT.h
View File

@ -9,7 +9,7 @@
// - Call the generated code instead of "v4_random_math(code, r)", omit the "code" parameter
typedef void (*v4_random_math_JIT_func)(uint32_t* r)
#if defined __i386 || defined __x86_64__
#if defined __x86_64__
__attribute__((sysv_abi))
#endif
;