walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

JIT compiler update.

This commit is contained in:
Zoltán Herczeg 2014-11-09 07:23:55 +00:00
parent a9f31c3377
commit 1bbc86fe67
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pcre2_jit_match.c
View File

@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifdef SUPPORT_JIT #ifdef SUPPORT_JIT
static int jit_machine_stack_exec(jit_arguments *arguments, jit_function executable_func) static SLJIT_NOINLINE int jit_machine_stack_exec(jit_arguments *arguments, jit_function executable_func)
{ {
sljit_ub local_space[MACHINE_STACK_SIZE]; sljit_ub local_space[MACHINE_STACK_SIZE];
struct sljit_stack local_stack; struct sljit_stack local_stack;

9
src/sljit/sljitConfigInternal.h
View File

@ -243,6 +243,15 @@
#endif #endif
#endif /* !SLJIT_INLINE */ #endif /* !SLJIT_INLINE */
#ifndef SLJIT_NOINLINE
/* Not inline functions. */
#if defined(__GNUC__)
#define SLJIT_NOINLINE __attribute__ ((noinline))
#else
#define SLJIT_NOINLINE
#endif
#endif /* !SLJIT_INLINE */
#ifndef SLJIT_CONST #ifndef SLJIT_CONST
/* Const variables. */ /* Const variables. */
#define SLJIT_CONST const #define SLJIT_CONST const

2
src/sljit/sljitLir.c
View File

@ -1325,6 +1325,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compile
CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_REWRITABLE_JUMP | SLJIT_INT_OP))); CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_REWRITABLE_JUMP | SLJIT_INT_OP)));
CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_CALL3); CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_CALL3);
CHECK_ARGUMENT((type & 0xff) < SLJIT_JUMP || !(type & SLJIT_INT_OP)); CHECK_ARGUMENT((type & 0xff) < SLJIT_JUMP || !(type & SLJIT_INT_OP));
CHECK_ARGUMENT((type & 0xff) <= SLJIT_CALL0 || ((type & 0xff) - SLJIT_CALL0) <= compiler->scratches);
#endif #endif
#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
if (SLJIT_UNLIKELY(!!compiler->verbose)) if (SLJIT_UNLIKELY(!!compiler->verbose))
@ -1390,6 +1391,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_ijump(struct sljit_compil
#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
CHECK_ARGUMENT(type >= SLJIT_JUMP && type <= SLJIT_CALL3); CHECK_ARGUMENT(type >= SLJIT_JUMP && type <= SLJIT_CALL3);
CHECK_ARGUMENT(type <= SLJIT_CALL0 || (type - SLJIT_CALL0) <= compiler->scratches);
FUNCTION_CHECK_SRC(src, srcw); FUNCTION_CHECK_SRC(src, srcw);
#endif #endif
#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)

8
src/sljit/sljitUtils.c
View File

@ -211,6 +211,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(slj
SYSTEM_INFO si; SYSTEM_INFO si;
#endif #endif
SLJIT_UNUSED_ARG(allocator_data);
if (limit > max_limit || limit < 1) if (limit > max_limit || limit < 1)
return NULL; return NULL;
@ -239,14 +240,14 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(slj
#ifdef _WIN32 #ifdef _WIN32
base.ptr = VirtualAlloc(NULL, max_limit, MEM_RESERVE, PAGE_READWRITE); base.ptr = VirtualAlloc(NULL, max_limit, MEM_RESERVE, PAGE_READWRITE);
if (!base.ptr) { if (!base.ptr) {
SLJIT_FREE(stack); SLJIT_FREE(stack, allocator_data);
return NULL; return NULL;
} }
stack->base = base.uw; stack->base = base.uw;
stack->limit = stack->base; stack->limit = stack->base;
stack->max_limit = stack->base + max_limit; stack->max_limit = stack->base + max_limit;
if (sljit_stack_resize(stack, stack->base + limit)) { if (sljit_stack_resize(stack, stack->base + limit)) {
sljit_free_stack(stack); sljit_free_stack(stack, allocator_data);
return NULL; return NULL;
} }
#else #else
@ -255,7 +256,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(slj
#else #else
if (dev_zero < 0) { if (dev_zero < 0) {
if (open_dev_zero()) { if (open_dev_zero()) {
SLJIT_FREE(stack); SLJIT_FREE(stack, allocator_data);
return NULL; return NULL;
} }
} }
@ -277,6 +278,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(slj
SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_free_stack(struct sljit_stack* stack, void *allocator_data) SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL sljit_free_stack(struct sljit_stack* stack, void *allocator_data)
{ {
SLJIT_UNUSED_ARG(allocator_data);
#ifdef _WIN32 #ifdef _WIN32
VirtualFree((void*)stack->base, 0, MEM_RELEASE); VirtualFree((void*)stack->base, 0, MEM_RELEASE);
#else #else