Revision: 539
http://www.exim.org/viewvc/pcre2?view=rev&revision=539
Author: zherczeg
Date: 2016-07-01 09:56:59 +0100 (Fri, 01 Jul 2016)
Log Message:
-----------
Fix register overwite in JIT when SSE2 acceleration is enabled.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/src/pcre2_jit_compile.c
code/trunk/src/pcre2_jit_test.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2016-06-29 16:52:05 UTC (rev 538)
+++ code/trunk/ChangeLog 2016-07-01 08:56:59 UTC (rev 539)
@@ -166,7 +166,9 @@
stack size via pcre2test is possible). This avoids having to manually set a
large stack size when testing with clang.
+42. Fix register overwite in JIT when SSE2 acceleration is enabled.
+
Version 10.21 12-January-2016
-----------------------------
Modified: code/trunk/src/pcre2_jit_compile.c
===================================================================
--- code/trunk/src/pcre2_jit_compile.c 2016-06-29 16:52:05 UTC (rev 538)
+++ code/trunk/src/pcre2_jit_compile.c 2016-07-01 08:56:59 UTC (rev 539)
@@ -4027,12 +4027,12 @@
if (load_twice)
{
- OP1(SLJIT_MOV, TMP3, 0, TMP2, 0);
+ OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP2, 0);
instruction[3] = 0xc0 | (tmp2_ind << 3) | 1;
sljit_emit_op_custom(compiler, instruction, 4);
OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, TMP3, 0);
+ OP1(SLJIT_MOV, TMP2, 0, RETURN_ADDR, 0);
}
OP2(SLJIT_ASHR, TMP1, 0, TMP1, 0, TMP2, 0);
Modified: code/trunk/src/pcre2_jit_test.c
===================================================================
--- code/trunk/src/pcre2_jit_test.c 2016-06-29 16:52:05 UTC (rev 538)
+++ code/trunk/src/pcre2_jit_test.c 2016-07-01 08:56:59 UTC (rev 539)
@@ -692,6 +692,7 @@
{ PCRE2_FIRSTLINE | PCRE2_DOTALL, PCRE2_NEWLINE_LF, 0, 0 | F_NOMATCH, "ab.", "ab" },
{ MU | PCRE2_FIRSTLINE, A, 0, 1 | F_NOMATCH, "^[a-d0-9]", "\nxx\nd" },
{ PCRE2_FIRSTLINE | PCRE2_DOTALL, PCRE2_NEWLINE_ANY, 0, 0, "....a", "012\n0a" },
+ { MU | PCRE2_FIRSTLINE, A, 0, 0, "[aC]", "a" },
/* Recurse. */
{ MU, A, 0, 0, "(a)(?1)", "aa" },
