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

Improve char range match in JIT.

This commit is contained in:
Zoltán Herczeg 2017-06-08 12:07:05 +00:00
parent 42549d089b
commit 1381c3fe28
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/pcre2_jit_compile.c
View File

@ -5783,8 +5783,9 @@ uint16_t char_list[MAX_CLASS_CHARS_SIZE];
uint8_t byte; uint8_t byte;
sljit_s32 type; sljit_s32 type;
int i, j, k, len, c; int i, j, k, len, c;
struct sljit_jump *jump;
jump_list *found = NULL; if (!sljit_has_cpu_feature(SLJIT_HAS_CMOV))
return FALSE;
if (invert) if (invert)
nclass = !nclass; nclass = !nclass;
@ -5831,23 +5832,28 @@ for (i = 0; i < 32; i++)
} }
} }
jump = NULL; i = 0;
j = 0; j = 0;
for (i = 0; i < len; i++) if (char_list[0] == 0)
{
i++;
OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0);
OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_ZERO);
}
else
OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
while (i < len)
{ {
if ((char_list[i] & 0x100) != 0) if ((char_list[i] & 0x100) != 0)
j++; j++;
else else
{ {
type = SLJIT_EQUAL; OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, char_list[i]);
if (!nclass && j == 0 && i + 1 == len) CMOV(SLJIT_ZERO, TMP2, TMP1, 0);
type = SLJIT_NOT_EQUAL;
jump = CMP(type, TMP1, 0, SLJIT_IMM, char_list[i]);
add_jump(compiler, (nclass || type == SLJIT_NOT_EQUAL) ? backtracks : &found, jump);
} }
i++;
} }
if (j != 0) if (j != 0)
@ -5858,17 +5864,13 @@ if (j != 0)
if ((char_list[i] & 0x100) != 0) if ((char_list[i] & 0x100) != 0)
{ {
j--; j--;
OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, char_list[i] & 0xff);
type = SLJIT_EQUAL; CMOV(SLJIT_ZERO, TMP2, TMP1, 0);
if (!nclass && j == 0)
type = SLJIT_NOT_EQUAL;
jump = CMP(type, TMP1, 0, SLJIT_IMM, char_list[i] & 0xff);
add_jump(compiler, (nclass || type == SLJIT_NOT_EQUAL) ? backtracks : &found, jump);
} }
} }
set_jumps(found, LABEL()); type = nclass ? SLJIT_NOT_EQUAL : SLJIT_EQUAL;
add_jump(compiler, backtracks, CMP(type, TMP2, 0, SLJIT_IMM, 0));
return TRUE; return TRUE;
} }