Minor JIT compiler update.

This commit is contained in:
Zoltán Herczeg 2016-07-17 04:39:51 +00:00
parent 063f45de11
commit 41ebeb4290
3 changed files with 4 additions and 13 deletions

View File

@ -82,7 +82,7 @@
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* If SLJIT_STD_MACROS_DEFINED is not defined, the application should /* If SLJIT_STD_MACROS_DEFINED is not defined, the application should
define SLJIT_MALLOC, SLJIT_FREE, SLJIT_MEMMOVE, and NULL. */ define SLJIT_MALLOC, SLJIT_FREE, SLJIT_MEMCPY, and NULL. */
#ifndef SLJIT_STD_MACROS_DEFINED #ifndef SLJIT_STD_MACROS_DEFINED
/* Disabled by default. */ /* Disabled by default. */
#define SLJIT_STD_MACROS_DEFINED 0 #define SLJIT_STD_MACROS_DEFINED 0

View File

@ -210,10 +210,6 @@
#define SLJIT_FREE(ptr, allocator_data) free(ptr) #define SLJIT_FREE(ptr, allocator_data) free(ptr)
#endif #endif
#ifndef SLJIT_MEMMOVE
#define SLJIT_MEMMOVE(dest, src, len) memmove(dest, src, len)
#endif
#ifndef SLJIT_MEMCPY #ifndef SLJIT_MEMCPY
#define SLJIT_MEMCPY(dest, src, len) memcpy(dest, src, len) #define SLJIT_MEMCPY(dest, src, len) memcpy(dest, src, len)
#endif #endif

View File

@ -298,11 +298,6 @@ static SLJIT_INLINE void sljit_unaligned_store_sw(void *addr, sljit_sw value)
SLJIT_MEMCPY(addr, &value, sizeof(value)); SLJIT_MEMCPY(addr, &value, sizeof(value));
} }
static SLJIT_INLINE void sljit_unaligned_store_uw(void *addr, sljit_uw value)
{
SLJIT_MEMCPY(addr, &value, sizeof(value));
}
/******************************************************/ /******************************************************/
/* Utility functions */ /* Utility functions */
/******************************************************/ /******************************************************/
@ -506,7 +501,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
len = *buf_ptr++; len = *buf_ptr++;
if (len > 0) { if (len > 0) {
/* The code is already generated. */ /* The code is already generated. */
SLJIT_MEMMOVE(code_ptr, buf_ptr, len); SLJIT_MEMCPY(code_ptr, buf_ptr, len);
code_ptr += len; code_ptr += len;
buf_ptr += len; buf_ptr += len;
} }
@ -2276,7 +2271,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_custom(struct sljit_compiler *c
inst = (sljit_u8*)ensure_buf(compiler, 1 + size); inst = (sljit_u8*)ensure_buf(compiler, 1 + size);
FAIL_IF(!inst); FAIL_IF(!inst);
INC_SIZE(size); INC_SIZE(size);
SLJIT_MEMMOVE(inst, instruction, size); SLJIT_MEMCPY(inst, instruction, size);
return SLJIT_SUCCESS; return SLJIT_SUCCESS;
} }
@ -2956,7 +2951,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_ad
#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
sljit_unaligned_store_sw((void*)addr, new_addr - (addr + 4)); sljit_unaligned_store_sw((void*)addr, new_addr - (addr + 4));
#else #else
sljit_unaligned_store_uw((void*)addr, new_addr); sljit_unaligned_store_sw((void*)addr, (sljit_sw) new_addr);
#endif #endif
} }