--- embedaddon/pcre/pcre_jit_test.c	2012/02/21 23:05:51	1.1.1.1
+++ embedaddon/pcre/pcre_jit_test.c	2012/02/21 23:50:25	1.1.1.2
@@ -6,10 +6,10 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                   Main Library written by Philip Hazel
-           Copyright (c) 1997-2011 University of Cambridge
+           Copyright (c) 1997-2012 University of Cambridge
 
   This JIT compiler regression test program was written by Zoltan Herczeg
-                      Copyright (c) 2010-2011
+                      Copyright (c) 2010-2012
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -51,24 +51,47 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PCRE_BUG 0x80000000
 
 /*
- Hungarian utf8 characters
- \xc3\xa9 = 0xe9 = 233 (e') \xc3\x89 = 0xc9 = 201 (E')
- \xc3\xa1 = 0xe1 = 225 (a') \xc3\x81 = 0xc1 = 193 (A')
- \xe6\x92\xad = 0x64ad = 25773 (a valid kanji)
- \xc2\x85 = 0x85 (NExt Line = NEL)
- \xc2\xa1 = 0xa1 (Inverted Exclamation Mark)
- \xe2\x80\xa8 = 0x2028 (Line Separator)
- \xc8\xba = 570 \xe2\xb1\xa5 = 11365 (lowercase length != uppercase length)
- \xcc\x8d = 781 (Something with Mark property)
+ Letter characters:
+   \xe6\x92\xad = 0x64ad = 25773 (kanji)
+ Non-letter characters:
+   \xc2\xa1 = 0xa1 =  (Inverted Exclamation Mark)
+   \xf3\xa9\xb7\x80 = 0xe9dc0 = 957888
+   \xed\xa0\x80 = 55296 = 0xd800 (Invalid UTF character)
+   \xed\xb0\x80 = 56320 = 0xdc00 (Invalid UTF character)
+ Newlines:
+   \xc2\x85 = 0x85 = 133 (NExt Line = NEL)
+   \xe2\x80\xa8 = 0x2028 = 8232 (Line Separator)
+ Othercase pairs:
+   \xc3\xa9 = 0xe9 = 233 (e')
+      \xc3\x89 = 0xc9 = 201 (E')
+   \xc3\xa1 = 0xe1 = 225 (a')
+      \xc3\x81 = 0xc1 = 193 (A')
+   \xc8\xba = 0x23a = 570
+      \xe2\xb1\xa5 = 0x2c65 = 11365
+   \xe1\xbd\xb8 = 0x1f78 = 8056
+      \xe1\xbf\xb8 = 0x1ff8 = 8184
+   \xf0\x90\x90\x80 = 0x10400 = 66560
+      \xf0\x90\x90\xa8 = 0x10428 = 66600
+ Mark property:
+   \xcc\x8d = 0x30d = 781
+ Special:
+   \xdf\xbf = 0x7ff = 2047 (highest 2 byte character)
+   \xe0\xa0\x80 = 0x800 = 2048 (lowest 2 byte character)
+   \xef\xbf\xbf = 0xffff = 65535 (highest 3 byte character)
+   \xf0\x90\x80\x80 = 0x10000 = 65536 (lowest 4 byte character)
+   \xf4\x8f\xbf\xbf = 0x10ffff = 1114111 (highest allowed utf character)
 */
 
-static void setstack(pcre_extra *extra);
 static int regression_tests(void);
 
 int main(void)
 {
 	int jit = 0;
+#ifdef SUPPORT_PCRE8
 	pcre_config(PCRE_CONFIG_JIT, &jit);
+#else
+	pcre16_config(PCRE_CONFIG_JIT, &jit);
+#endif
 	if (!jit) {
 		printf("JIT must be enabled to run pcre_jit_test\n");
 		return 1;
@@ -76,28 +99,27 @@ int main(void)
 	return regression_tests();
 }
 
-static pcre_jit_stack* callback(void *arg)
-{
-	return (pcre_jit_stack *)arg;
-}
+/* --------------------------------------------------------------------------------------- */
 
-static void setstack(pcre_extra *extra)
-{
-	static pcre_jit_stack *stack;
-	if (stack) pcre_jit_stack_free(stack);
-	stack = pcre_jit_stack_alloc(1, 1024 * 1024);
-	pcre_assign_jit_stack(extra, callback, stack);
-}
+#if !(defined SUPPORT_PCRE8) && !(defined SUPPORT_PCRE16)
+#error SUPPORT_PCRE8 or SUPPORT_PCRE16 must be defined
+#endif
 
-/* --------------------------------------------------------------------------------------- */
+#define MUA	(PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF)
+#define MUAP	(PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
+#define CMUA	(PCRE_CASELESS | PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF)
+#define CMUAP	(PCRE_CASELESS | PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
+#define MA	(PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF)
+#define MAP	(PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
+#define CMA	(PCRE_CASELESS | PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF)
 
-#define MUA     (PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF)
-#define MUAP    (PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
-#define CMUA    (PCRE_CASELESS | PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF)
-#define CMUAP   (PCRE_CASELESS | PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
-#define MA      (PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF)
-#define MAP     (PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF | PCRE_UCP)
-#define CMA     (PCRE_CASELESS | PCRE_MULTILINE | PCRE_NEWLINE_ANYCRLF)
+#define OFFSET_MASK	0x00ffff
+#define F_NO8		0x010000
+#define F_NO16		0x020000
+#define F_NOMATCH	0x040000
+#define F_DIFF		0x080000
+#define F_FORCECONV	0x100000
+#define F_PROPERTY	0x200000
 
 struct regression_test_case {
 	int flags;
@@ -124,7 +146,7 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "\\W(\\W)?\\w", "\n\n+bc" },
 	{ MUA, 0, "[axd]", "sAXd" },
 	{ CMUA, 0, "[axd]", "sAXd" },
-	{ CMUA, 0, "[^axd]", "DxA" },
+	{ CMUA, 0 | F_NOMATCH, "[^axd]", "DxA" },
 	{ MUA, 0, "[a-dA-C]", "\xe6\x92\xad\xc3\xa9.B" },
 	{ MUA, 0, "[^a-dA-C]", "\xe6\x92\xad\xc3\xa9" },
 	{ CMUA, 0, "[^\xc3\xa9]", "\xc3\xa9\xc3\x89." },
@@ -137,12 +159,16 @@ static struct regression_test_case regression_test_cas
 	{ PCRE_CASELESS, 0, "a1", "Aa1" },
 	{ MA, 0, "\\Ca", "cda" },
 	{ CMA, 0, "\\Ca", "CDA" },
-	{ MA, 0, "\\Cx", "cda" },
-	{ CMA, 0, "\\Cx", "CDA" },
+	{ MA, 0 | F_NOMATCH, "\\Cx", "cda" },
+	{ CMA, 0 | F_NOMATCH, "\\Cx", "CDA" },
+	{ CMUAP, 0, "\xf0\x90\x90\x80\xf0\x90\x90\xa8", "\xf0\x90\x90\xa8\xf0\x90\x90\x80" },
+	{ CMUAP, 0, "\xf0\x90\x90\x80{2}", "\xf0\x90\x90\x80#\xf0\x90\x90\xa8\xf0\x90\x90\x80" },
+	{ CMUAP, 0, "\xf0\x90\x90\xa8{2}", "\xf0\x90\x90\x80#\xf0\x90\x90\xa8\xf0\x90\x90\x80" },
+	{ CMUAP, 0, "\xe1\xbd\xb8\xe1\xbf\xb8", "\xe1\xbf\xb8\xe1\xbd\xb8" },
 
 	/* Assertions. */
 	{ MUA, 0, "\\b[^A]", "A_B#" },
-	{ MA, 0, "\\b\\W", "\n*" },
+	{ MA, 0 | F_NOMATCH, "\\b\\W", "\n*" },
 	{ MUA, 0, "\\B[^,]\\b[^s]\\b", "#X" },
 	{ MAP, 0, "\\B", "_\xa1" },
 	{ MAP, 0, "\\b_\\b[,A]\\B", "_," },
@@ -150,27 +176,28 @@ static struct regression_test_case regression_test_cas
 	{ MUAP, 0, "\\B", "_\xc2\xa1\xc3\xa1\xc2\x85" },
 	{ MUAP, 0, "\\b[^A]\\B[^c]\\b[^_]\\B", "_\xc3\xa1\xe2\x80\xa8" },
 	{ MUAP, 0, "\\b\\w+\\B", "\xc3\x89\xc2\xa1\xe6\x92\xad\xc3\x81\xc3\xa1" },
-	{ MUA, 0, "\\b.", "\xcd\xbe" },
-	{ MA, 0, "\\R^", "\n" },
-	{ MA, 1, "^", "\n" },
+	{ MUA, 0 | F_NOMATCH, "\\b.", "\xcd\xbe" },
+	{ CMUAP, 0, "\\By", "\xf0\x90\x90\xa8y" },
+	{ MA, 0 | F_NOMATCH, "\\R^", "\n" },
+	{ MA, 1 | F_NOMATCH, "^", "\n" },
 	{ 0, 0, "^ab", "ab" },
-	{ 0, 0, "^ab", "aab" },
+	{ 0, 0 | F_NOMATCH, "^ab", "aab" },
 	{ PCRE_MULTILINE | PCRE_NEWLINE_CRLF, 0, "^a", "\r\raa\n\naa\r\naa" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF, 0, "^-", "\xe2\x80\xa8--\xc2\x85-\r\n-" },
 	{ PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0, "^-", "a--b--\x85--" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY, 0, "^-", "a--\xe2\x80\xa8--" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY, 0, "^-", "a--\xc2\x85--" },
 	{ 0, 0, "ab$", "ab" },
-	{ 0, 0, "ab$", "ab\r\n" },
+	{ 0, 0 | F_NOMATCH, "ab$", "ab\r\n" },
 	{ PCRE_MULTILINE | PCRE_NEWLINE_CRLF, 0, "a$", "\r\raa\n\naa\r\naa" },
 	{ PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0, "a$", "aaa" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANYCRLF, 0, "#$", "#\xc2\x85###\r#" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY, 0, "#$", "#\xe2\x80\xa9" },
-	{ PCRE_NOTBOL | PCRE_NEWLINE_ANY, 0, "^a", "aa\naa" },
+	{ PCRE_NOTBOL | PCRE_NEWLINE_ANY, 0 | F_NOMATCH, "^a", "aa\naa" },
 	{ PCRE_NOTBOL | PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0, "^a", "aa\naa" },
-	{ PCRE_NOTEOL | PCRE_NEWLINE_ANY, 0, "a$", "aa\naa" },
-	{ PCRE_NOTEOL | PCRE_NEWLINE_ANY, 0, "a$", "aa\r\n" },
-	{ PCRE_UTF8 | PCRE_DOLLAR_ENDONLY | PCRE_NEWLINE_ANY, 0, "\\p{Any}{2,}$", "aa\r\n" },
+	{ PCRE_NOTEOL | PCRE_NEWLINE_ANY, 0 | F_NOMATCH, "a$", "aa\naa" },
+	{ PCRE_NOTEOL | PCRE_NEWLINE_ANY, 0 | F_NOMATCH, "a$", "aa\r\n" },
+	{ PCRE_UTF8 | PCRE_DOLLAR_ENDONLY | PCRE_NEWLINE_ANY, 0 | F_PROPERTY, "\\p{Any}{2,}$", "aa\r\n" },
 	{ PCRE_NOTEOL | PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0, "a$", "aa\naa" },
 	{ PCRE_NEWLINE_CR, 0, ".\\Z", "aaa" },
 	{ PCRE_NEWLINE_CR | PCRE_UTF8, 0, "a\\Z", "aaa\r" },
@@ -190,11 +217,11 @@ static struct regression_test_case regression_test_cas
 	{ PCRE_NEWLINE_ANY | PCRE_UTF8, 0, ".\\Z", "aaa\xc2\x85" },
 	{ PCRE_NEWLINE_ANY | PCRE_UTF8, 0, ".\\Z", "aaa\xe2\x80\xa8" },
 	{ MA, 0, "\\Aa", "aaa" },
-	{ MA, 1, "\\Aa", "aaa" },
+	{ MA, 1 | F_NOMATCH, "\\Aa", "aaa" },
 	{ MA, 1, "\\Ga", "aaa" },
-	{ MA, 1, "\\Ga", "aba" },
+	{ MA, 1 | F_NOMATCH, "\\Ga", "aba" },
 	{ MA, 0, "a\\z", "aaa" },
-	{ MA, 0, "a\\z", "aab" },
+	{ MA, 0 | F_NOMATCH, "a\\z", "aab" },
 
 	/* Brackets. */
 	{ MUA, 0, "(ab|bb|cd)", "bacde" },
@@ -267,6 +294,11 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "\\b\\w+\\B", "x,a_cd" },
 	{ MUAP, 0, "\\b[^\xc2\xa1]+\\B", "\xc3\x89\xc2\xa1\xe6\x92\xad\xc3\x81\xc3\xa1" },
 	{ CMUA, 0, "[^b]+(a*)([^c]?d{3})", "aaaaddd" },
+	{ CMUAP, 0, "\xe1\xbd\xb8{2}", "\xe1\xbf\xb8#\xe1\xbf\xb8\xe1\xbd\xb8" },
+	{ CMUA, 0, "[^\xf0\x90\x90\x80]{2,4}@", "\xf0\x90\x90\xa8\xf0\x90\x90\x80###\xf0\x90\x90\x80@@@" },
+	{ CMUA, 0, "[^\xe1\xbd\xb8][^\xc3\xa9]", "\xe1\xbd\xb8\xe1\xbf\xb8\xc3\xa9\xc3\x89#" },
+	{ MUA, 0, "[^\xe1\xbd\xb8][^\xc3\xa9]", "\xe1\xbd\xb8\xe1\xbf\xb8\xc3\xa9\xc3\x89#" },
+	{ MUA, 0, "[^\xe1\xbd\xb8]{3,}?", "##\xe1\xbd\xb8#\xe1\xbd\xb8#\xc3\x89#\xe1\xbd\xb8" },
 
 	/* Basic character sets. */
 	{ MUA, 0, "(?:\\s)+(?:\\S)+", "ab \t\xc3\xa9\xe6\x92\xad " },
@@ -278,24 +310,24 @@ static struct regression_test_case regression_test_cas
 
 	/* Unicode properties. */
 	{ MUAP, 0, "[1-5\xc3\xa9\\w]", "\xc3\xa1_" },
-	{ MUAP, 0, "[\xc3\x81\\p{Ll}]", "A_\xc3\x89\xc3\xa1" },
+	{ MUAP, 0 | F_PROPERTY, "[\xc3\x81\\p{Ll}]", "A_\xc3\x89\xc3\xa1" },
 	{ MUAP, 0, "[\\Wd-h_x-z]+", "a\xc2\xa1#_yhzdxi" },
-	{ MUAP, 0, "[\\P{Any}]", "abc" },
-	{ MUAP, 0, "[^\\p{Any}]", "abc" },
-	{ MUAP, 0, "[\\P{Any}\xc3\xa1-\xc3\xa8]", "abc" },
-	{ MUAP, 0, "[^\\p{Any}\xc3\xa1-\xc3\xa8]", "abc" },
-	{ MUAP, 0, "[\xc3\xa1-\xc3\xa8\\P{Any}]", "abc" },
-	{ MUAP, 0, "[^\xc3\xa1-\xc3\xa8\\p{Any}]", "abc" },
-	{ MUAP, 0, "[\xc3\xa1-\xc3\xa8\\p{Any}]", "abc" },
-	{ MUAP, 0, "[^\xc3\xa1-\xc3\xa8\\P{Any}]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[\\P{Any}]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[^\\p{Any}]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[\\P{Any}\xc3\xa1-\xc3\xa8]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[^\\p{Any}\xc3\xa1-\xc3\xa8]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[\xc3\xa1-\xc3\xa8\\P{Any}]", "abc" },
+	{ MUAP, 0 | F_NOMATCH | F_PROPERTY, "[^\xc3\xa1-\xc3\xa8\\p{Any}]", "abc" },
+	{ MUAP, 0 | F_PROPERTY, "[\xc3\xa1-\xc3\xa8\\p{Any}]", "abc" },
+	{ MUAP, 0 | F_PROPERTY, "[^\xc3\xa1-\xc3\xa8\\P{Any}]", "abc" },
 	{ MUAP, 0, "[b-\xc3\xa9\\s]", "a\xc\xe6\x92\xad" },
 	{ CMUAP, 0, "[\xc2\x85-\xc2\x89\xc3\x89]", "\xc2\x84\xc3\xa9" },
 	{ MUAP, 0, "[^b-d^&\\s]{3,}", "db^ !a\xe2\x80\xa8_ae" },
-	{ MUAP, 0, "[^\\S\\P{Any}][\\sN]{1,3}[\\P{N}]{4}", "\xe2\x80\xaa\xa N\x9\xc3\xa9_0" },
-	{ MUA, 0, "[^\\P{L}\x9!D-F\xa]{2,3}", "\x9,.DF\xa.CG\xc3\x81" },
+	{ MUAP, 0 | F_PROPERTY, "[^\\S\\P{Any}][\\sN]{1,3}[\\P{N}]{4}", "\xe2\x80\xaa\xa N\x9\xc3\xa9_0" },
+	{ MUA, 0 | F_PROPERTY, "[^\\P{L}\x9!D-F\xa]{2,3}", "\x9,.DF\xa.CG\xc3\x81" },
 	{ CMUAP, 0, "[\xc3\xa1-\xc3\xa9_\xe2\x80\xa0-\xe2\x80\xaf]{1,5}[^\xe2\x80\xa0-\xe2\x80\xaf]", "\xc2\xa1\xc3\x89\xc3\x89\xe2\x80\xaf_\xe2\x80\xa0" },
-	{ MUAP, 0, "[\xc3\xa2-\xc3\xa6\xc3\x81-\xc3\x84\xe2\x80\xa8-\xe2\x80\xa9\xe6\x92\xad\\p{Zs}]{2,}", "\xe2\x80\xa7\xe2\x80\xa9\xe6\x92\xad \xe6\x92\xae" },
-	{ MUAP, 0, "[\\P{L&}]{2}[^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}]{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" },
+	{ MUAP, 0 | F_PROPERTY, "[\xc3\xa2-\xc3\xa6\xc3\x81-\xc3\x84\xe2\x80\xa8-\xe2\x80\xa9\xe6\x92\xad\\p{Zs}]{2,}", "\xe2\x80\xa7\xe2\x80\xa9\xe6\x92\xad \xe6\x92\xae" },
+	{ MUAP, 0 | F_PROPERTY, "[\\P{L&}]{2}[^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}]{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" },
 	{ PCRE_UCP, 0, "[a-b\\s]{2,5}[^a]", "AB  baaa" },
 
 	/* Possible empty brackets. */
@@ -312,8 +344,8 @@ static struct regression_test_case regression_test_cas
 
 	/* Start offset. */
 	{ MUA, 3, "(\\d|(?:\\w)*\\w)+", "0ac01Hb" },
-	{ MUA, 4, "(\\w\\W\\w)+", "ab#d" },
-	{ MUA, 2, "(\\w\\W\\w)+", "ab#d" },
+	{ MUA, 4 | F_NOMATCH, "(\\w\\W\\w)+", "ab#d" },
+	{ MUA, 2 | F_NOMATCH, "(\\w\\W\\w)+", "ab#d" },
 	{ MUA, 1, "(\\w\\W\\w)+", "ab#d" },
 
 	/* Newline. */
@@ -327,7 +359,7 @@ static struct regression_test_case regression_test_cas
 	{ PCRE_NEWLINE_ANYCRLF, 0, ".(.)", "a\rb\nc\r\n\xc2\x85\xe2\x80\xa8" },
 	{ PCRE_NEWLINE_ANYCRLF | PCRE_UTF8, 0, ".(.)", "a\rb\nc\r\n\xc2\x85\xe2\x80\xa8" },
 	{ PCRE_NEWLINE_ANY | PCRE_UTF8, 0, "(.).", "a\rb\nc\r\n\xc2\x85\xe2\x80\xa9$de" },
-	{ PCRE_NEWLINE_ANYCRLF | PCRE_UTF8, 0, ".(.).", "\xe2\x80\xa8\nb\r" },
+	{ PCRE_NEWLINE_ANYCRLF | PCRE_UTF8, 0 | F_NOMATCH, ".(.).", "\xe2\x80\xa8\nb\r" },
 	{ PCRE_NEWLINE_ANY, 0, "(.)(.)", "#\x85#\r#\n#\r\n#\x84" },
 	{ PCRE_NEWLINE_ANY | PCRE_UTF8, 0, "(.+)#", "#\rMn\xc2\x85#\n###" },
 	{ PCRE_BSR_ANYCRLF, 0, "\\R", "\r" },
@@ -335,7 +367,7 @@ static struct regression_test_case regression_test_cas
 	{ PCRE_BSR_UNICODE | PCRE_UTF8, 0, "\\R", "ab\xe2\x80\xa8#c" },
 	{ PCRE_BSR_UNICODE | PCRE_UTF8, 0, "\\R", "ab\r\nc" },
 	{ PCRE_NEWLINE_CRLF | PCRE_BSR_UNICODE | PCRE_UTF8, 0, "(\\R.)+", "\xc2\x85\r\n#\xe2\x80\xa8\n\r\n\r" },
-	{ MUA, 0, "\\R+", "ab" },
+	{ MUA, 0 | F_NOMATCH, "\\R+", "ab" },
 	{ MUA, 0, "\\R+", "ab\r\n\r" },
 	{ MUA, 0, "\\R*", "ab\r\n\r" },
 	{ MUA, 0, "\\R*", "\r\n\r" },
@@ -343,15 +375,15 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "\\R{2,4}", "\r\nab\n\n\n\r\r\r" },
 	{ MUA, 0, "\\R{2,}", "\r\nab\n\n\n\r\r\r" },
 	{ MUA, 0, "\\R{0,3}", "\r\n\r\n\r\n\r\n\r\n" },
-	{ MUA, 0, "\\R+\\R\\R", "\r\n\r\n" },
+	{ MUA, 0 | F_NOMATCH, "\\R+\\R\\R", "\r\n\r\n" },
 	{ MUA, 0, "\\R+\\R\\R", "\r\r\r" },
 	{ MUA, 0, "\\R*\\R\\R", "\n\r" },
-	{ MUA, 0, "\\R{2,4}\\R\\R", "\r\r\r" },
+	{ MUA, 0 | F_NOMATCH, "\\R{2,4}\\R\\R", "\r\r\r" },
 	{ MUA, 0, "\\R{2,4}\\R\\R", "\r\r\r\r" },
 
 	/* Atomic groups (no fallback from "next" direction). */
-	{ MUA, 0, "(?>ab)ab", "bab" },
-	{ MUA, 0, "(?>(ab))ab", "bab" },
+	{ MUA, 0 | F_NOMATCH, "(?>ab)ab", "bab" },
+	{ MUA, 0 | F_NOMATCH, "(?>(ab))ab", "bab" },
 	{ MUA, 0, "(?>ab)+abc(?>de)*def(?>gh)?ghe(?>ij)+?k(?>lm)*?n(?>op)?\?op",
 			"bababcdedefgheijijklmlmnop" },
 	{ MUA, 0, "(?>a(b)+a|(ab)?\?(b))an", "abban" },
@@ -379,13 +411,13 @@ static struct regression_test_case regression_test_cas
 	{ CMA, 0, "(?>((?>a{32}|b+|(a*))?(?>c+|d*)?\?)+e)+?f", "aaccebbdde bbdaaaccebbdee bbdaaaccebbdeef" },
 	{ MUA, 0, "(?>(?:(?>aa|a||x)+?b|(?>aa|a||(x))+?c)?(?>[ad]{0,2})*?d)+d", "aaacdbaabdcabdbaaacd aacaabdbdcdcaaaadaabcbaadd" },
 	{ MUA, 0, "(?>(?:(?>aa|a||(x))+?b|(?>aa|a||x)+?c)?(?>[ad]{0,2})*?d)+d", "aaacdbaabdcabdbaaacd aacaabdbdcdcaaaadaabcbaadd" },
-	{ MUA, 0, "\\X", "\xcc\x8d\xcc\x8d" },
-	{ MUA, 0, "\\X", "\xcc\x8d\xcc\x8d#\xcc\x8d\xcc\x8d" },
-	{ MUA, 0, "\\X+..", "\xcc\x8d#\xcc\x8d#\xcc\x8d\xcc\x8d" },
-	{ MUA, 0, "\\X{2,4}", "abcdef" },
-	{ MUA, 0, "\\X{2,4}?", "abcdef" },
-	{ MUA, 0, "\\X{2,4}..", "#\xcc\x8d##" },
-	{ MUA, 0, "\\X{2,4}..", "#\xcc\x8d#\xcc\x8d##" },
+	{ MUA, 0 | F_NOMATCH | F_PROPERTY, "\\X", "\xcc\x8d\xcc\x8d" },
+	{ MUA, 0 | F_PROPERTY, "\\X", "\xcc\x8d\xcc\x8d#\xcc\x8d\xcc\x8d" },
+	{ MUA, 0 | F_PROPERTY, "\\X+..", "\xcc\x8d#\xcc\x8d#\xcc\x8d\xcc\x8d" },
+	{ MUA, 0 | F_PROPERTY, "\\X{2,4}", "abcdef" },
+	{ MUA, 0 | F_PROPERTY, "\\X{2,4}?", "abcdef" },
+	{ MUA, 0 | F_NOMATCH | F_PROPERTY, "\\X{2,4}..", "#\xcc\x8d##" },
+	{ MUA, 0 | F_PROPERTY, "\\X{2,4}..", "#\xcc\x8d#\xcc\x8d##" },
 	{ MUA, 0, "(c(ab)?+ab)+", "cabcababcab" },
 	{ MUA, 0, "(?>(a+)b)+aabab", "aaaabaaabaabab" },
 
@@ -420,7 +452,7 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "((b*))++m", "bxbbxbbbxbbm" },
 	{ MUA, 0, "((b*))*+m", "bxbbxbbbxm" },
 	{ MUA, 0, "((b*))*+m", "bxbbxbbbxbbm" },
-	{ MUA, 0, "(?>(b{2,4}))(?:(?:(aa|c))++m|(?:(aa|c))+n)", "bbaacaaccaaaacxbbbmbn" },
+	{ MUA, 0 | F_NOMATCH, "(?>(b{2,4}))(?:(?:(aa|c))++m|(?:(aa|c))+n)", "bbaacaaccaaaacxbbbmbn" },
 	{ MUA, 0, "((?:b)++a)+(cd)*+m", "bbababbacdcdnbbababbacdcdm" },
 	{ MUA, 0, "((?:(b))++a)+((c)d)*+m", "bbababbacdcdnbbababbacdcdm" },
 	{ MUA, 0, "(?:(?:(?:ab)*+k)++(?:n(?:cd)++)*+)*+m", "ababkkXababkkabkncXababkkabkncdcdncdXababkkabkncdcdncdkkabkncdXababkkabkncdcdncdkkabkncdm" },
@@ -444,11 +476,12 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "(?:(aa|bb)(\\1{0,3}?)){2}(dd|)(\\3{0,3}?)b(\\1{0,3}?)(\\1{0,3})", "aaaaaaaaaaaaaaabaaaaa" },
 	{ MUA, 0, "(a(?:\\1|)a){3}b", "aaaaaaaaaaab" },
 	{ MA, 0, "(a?)b(\\1\\1*\\1+\\1?\\1*?\\1+?\\1??\\1*+\\1++\\1?+\\1{4}\\1{3,5}\\1{4,}\\1{0,5}\\1{3,5}?\\1{4,}?\\1{0,5}?\\1{3,5}+\\1{4,}+\\1{0,5}+#){2}d", "bb#b##d" },
-	{ MUAP, 0, "(\\P{N})\\1{2,}", ".www." },
-	{ MUAP, 0, "(\\P{N})\\1{0,2}", "wwwww." },
-	{ MUAP, 0, "(\\P{N})\\1{1,2}ww", "wwww" },
-	{ MUAP, 0, "(\\P{N})\\1{1,2}ww", "wwwww" },
-	{ PCRE_UCP, 0, "(\\P{N})\\1{2,}", ".www." },
+	{ MUAP, 0 | F_PROPERTY, "(\\P{N})\\1{2,}", ".www." },
+	{ MUAP, 0 | F_PROPERTY, "(\\P{N})\\1{0,2}", "wwwww." },
+	{ MUAP, 0 | F_PROPERTY, "(\\P{N})\\1{1,2}ww", "wwww" },
+	{ MUAP, 0 | F_PROPERTY, "(\\P{N})\\1{1,2}ww", "wwwww" },
+	{ PCRE_UCP, 0 | F_PROPERTY, "(\\P{N})\\1{2,}", ".www." },
+	{ CMUAP, 0, "(\xf0\x90\x90\x80)\\1", "\xf0\x90\x90\xa8\xf0\x90\x90\xa8" },
 
 	/* Assertions. */
 	{ MUA, 0, "(?=xx|yy|zz)\\w{4}", "abczzdefg" },
@@ -464,9 +497,9 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "(?>a(?>(b+))a(?=(..)))*?k", "acabbcabbaabacabaabbakk" },
 	{ MUA, 0, "((?(?=(a))a)+k)", "bbak" },
 	{ MUA, 0, "((?(?=a)a)+k)", "bbak" },
-	{ MUA, 0, "(?=(?>(a))m)amk", "a k" },
-	{ MUA, 0, "(?!(?>(a))m)amk", "a k" },
-	{ MUA, 0, "(?>(?=(a))am)amk", "a k" },
+	{ MUA, 0 | F_NOMATCH, "(?=(?>(a))m)amk", "a k" },
+	{ MUA, 0 | F_NOMATCH, "(?!(?>(a))m)amk", "a k" },
+	{ MUA, 0 | F_NOMATCH, "(?>(?=(a))am)amk", "a k" },
 	{ MUA, 0, "(?=(?>a|(?=(?>(b+))a|c)[a-c]+)*?m)[a-cm]+k", "aaam bbam baaambaam abbabba baaambaamk" },
 	{ MUA, 0, "(?> ?\?\\b(?(?=\\w{1,4}(a))m)\\w{0,8}bc){2,}?", "bca ssbc mabd ssbc mabc" },
 	{ MUA, 0, "(?:(?=ab)?[^n][^n])+m", "ababcdabcdcdabnababcdabcdcdabm" },
@@ -477,19 +510,19 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "((?!a)?\?(?!([^a]))?\?)+$", "acbab" },
 
 	/* Not empty, ACCEPT, FAIL */
-	{ MUA | PCRE_NOTEMPTY, 0, "a*", "bcx" },
+	{ MUA | PCRE_NOTEMPTY, 0 | F_NOMATCH, "a*", "bcx" },
 	{ MUA | PCRE_NOTEMPTY, 0, "a*", "bcaad" },
 	{ MUA | PCRE_NOTEMPTY, 0, "a*?", "bcaad" },
 	{ MUA | PCRE_NOTEMPTY_ATSTART, 0, "a*", "bcaad" },
 	{ MUA, 0, "a(*ACCEPT)b", "ab" },
-	{ MUA | PCRE_NOTEMPTY, 0, "a*(*ACCEPT)b", "bcx" },
+	{ MUA | PCRE_NOTEMPTY, 0 | F_NOMATCH, "a*(*ACCEPT)b", "bcx" },
 	{ MUA | PCRE_NOTEMPTY, 0, "a*(*ACCEPT)b", "bcaad" },
 	{ MUA | PCRE_NOTEMPTY, 0, "a*?(*ACCEPT)b", "bcaad" },
-	{ MUA | PCRE_NOTEMPTY, 0, "(?:z|a*(*ACCEPT)b)", "bcx" },
+	{ MUA | PCRE_NOTEMPTY, 0 | F_NOMATCH, "(?:z|a*(*ACCEPT)b)", "bcx" },
 	{ MUA | PCRE_NOTEMPTY, 0, "(?:z|a*(*ACCEPT)b)", "bcaad" },
 	{ MUA | PCRE_NOTEMPTY, 0, "(?:z|a*?(*ACCEPT)b)", "bcaad" },
 	{ MUA | PCRE_NOTEMPTY_ATSTART, 0, "a*(*ACCEPT)b", "bcx" },
-	{ MUA | PCRE_NOTEMPTY_ATSTART, 0, "a*(*ACCEPT)b", "" },
+	{ MUA | PCRE_NOTEMPTY_ATSTART, 0 | F_NOMATCH, "a*(*ACCEPT)b", "" },
 	{ MUA, 0, "((a(*ACCEPT)b))", "ab" },
 	{ MUA, 0, "(a(*FAIL)a|a)", "aaa" },
 	{ MUA, 0, "(?=ab(*ACCEPT)b)a", "ab" },
@@ -506,7 +539,7 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "(?(?!(b))a*|b*)+k", "ababbalbbadabak" },
 	{ MUA, 0, "(?(?!(b))(?:aaaaaa|a)|(?:bbbbbb|b))+aaaak", "aaaaaaaaaaaaaa bbbbbbbbbbbbbbb aaaaaaak" },
 	{ MUA, 0, "(?(?!b)(?:aaaaaa|a)|(?:bbbbbb|b))+aaaak", "aaaaaaaaaaaaaa bbbbbbbbbbbbbbb aaaaaaak" },
-	{ MUA | PCRE_BUG, 0, "(?(?!(b))(?:aaaaaa|a)|(?:bbbbbb|b))+bbbbk", "aaaaaaaaaaaaaa bbbbbbbbbbbbbbb bbbbbbbk" },
+	{ MUA, 0 | F_DIFF, "(?(?!(b))(?:aaaaaa|a)|(?:bbbbbb|b))+bbbbk", "aaaaaaaaaaaaaa bbbbbbbbbbbbbbb bbbbbbbk" },
 	{ MUA, 0, "(?(?!b)(?:aaaaaa|a)|(?:bbbbbb|b))+bbbbk", "aaaaaaaaaaaaaa bbbbbbbbbbbbbbb bbbbbbbk" },
 	{ MUA, 0, "(?(?=a)a*|b*)+k", "ababbalbbadabak" },
 	{ MUA, 0, "(?(?!b)a*|b*)+k", "ababbalbbadabak" },
@@ -520,11 +553,11 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "((?=\\w{5})\\w(?(?=\\w*k)\\d|[a-f_])*\\w\\s)+", "mol m10kk m088k _f_a_ mbkkl" },
 	{ MUA, 0, "(c)?\?(?(1)a|b)", "cdcaa" },
 	{ MUA, 0, "(c)?\?(?(1)a|b)", "cbb" },
-	{ MUA | PCRE_BUG, 0, "(?(?=(a))(aaaa|a?))+aak", "aaaaab aaaaak" },
+	{ MUA, 0 | F_DIFF, "(?(?=(a))(aaaa|a?))+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?=a)(aaaa|a?))+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?!(b))(aaaa|a?))+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?!b)(aaaa|a?))+aak", "aaaaab aaaaak" },
-	{ MUA | PCRE_BUG, 0, "(?(?=(a))a*)+aak", "aaaaab aaaaak" },
+	{ MUA, 0 | F_DIFF, "(?(?=(a))a*)+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?=a)a*)+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?!(b))a*)+aak", "aaaaab aaaaak" },
 	{ MUA, 0, "(?(?!b)a*)+aak", "aaaaab aaaaak" },
@@ -537,26 +570,26 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "(?:\\Ka)*aaaab", "aaaaaaaa aaaaaaabb" },
 	{ MUA, 0, "(?>\\Ka\\Ka)*aaaab", "aaaaaaaa aaaaaaaaaabb" },
 	{ MUA, 0, "a+\\K(?<=\\Gaa)a", "aaaaaa" },
-	{ MUA | PCRE_NOTEMPTY, 0, "a\\K(*ACCEPT)b", "aa" },
+	{ MUA | PCRE_NOTEMPTY, 0 | F_NOMATCH, "a\\K(*ACCEPT)b", "aa" },
 	{ MUA | PCRE_NOTEMPTY_ATSTART, 0, "a\\K(*ACCEPT)b", "aa" },
 
 	/* First line. */
-	{ MUA | PCRE_FIRSTLINE, 0, "\\p{Any}a", "bb\naaa" },
-	{ MUA | PCRE_FIRSTLINE, 0, "\\p{Any}a", "bb\r\naaa" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_PROPERTY, "\\p{Any}a", "bb\naaa" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH | F_PROPERTY, "\\p{Any}a", "bb\r\naaa" },
 	{ MUA | PCRE_FIRSTLINE, 0, "(?<=a)", "a" },
-	{ MUA | PCRE_FIRSTLINE, 0, "[^a][^b]", "ab" },
-	{ MUA | PCRE_FIRSTLINE, 0, "a", "\na" },
-	{ MUA | PCRE_FIRSTLINE, 0, "[abc]", "\na" },
-	{ MUA | PCRE_FIRSTLINE, 0, "^a", "\na" },
-	{ MUA | PCRE_FIRSTLINE, 0, "^(?<=\n)", "\na" },
-	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0, "#", "\xc2\x85#" },
-	{ PCRE_MULTILINE | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0, "#", "\x85#" },
-	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0, "^#", "\xe2\x80\xa8#" },
-	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0, "\\p{Any}", "\r\na" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH, "[^a][^b]", "ab" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH, "a", "\na" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH, "[abc]", "\na" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH, "^a", "\na" },
+	{ MUA | PCRE_FIRSTLINE, 0 | F_NOMATCH, "^(?<=\n)", "\na" },
+	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0 | F_NOMATCH, "#", "\xc2\x85#" },
+	{ PCRE_MULTILINE | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0 | F_NOMATCH, "#", "\x85#" },
+	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_ANY | PCRE_FIRSTLINE, 0 | F_NOMATCH, "^#", "\xe2\x80\xa8#" },
+	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0 | F_PROPERTY, "\\p{Any}", "\r\na" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0, ".", "\r" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0, "a", "\ra" },
-	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0, "ba", "bbb\r\nba" },
-	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0, "\\p{Any}{4}|a", "\r\na" },
+	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0 | F_NOMATCH, "ba", "bbb\r\nba" },
+	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 0 | F_NOMATCH | F_PROPERTY, "\\p{Any}{4}|a", "\r\na" },
 	{ PCRE_MULTILINE | PCRE_UTF8 | PCRE_NEWLINE_CRLF | PCRE_FIRSTLINE, 1, ".", "\r\n" },
 
 	/* Recurse. */
@@ -564,7 +597,7 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "((a))(?1)", "aa" },
 	{ MUA, 0, "(b|a)(?1)", "aa" },
 	{ MUA, 0, "(b|(a))(?1)", "aa" },
-	{ MUA, 0, "((a)(b)(?:a*))(?1)", "aba" },
+	{ MUA, 0 | F_NOMATCH, "((a)(b)(?:a*))(?1)", "aba" },
 	{ MUA, 0, "((a)(b)(?:a*))(?1)", "abab" },
 	{ MUA, 0, "((a+)c(?2))b(?1)", "aacaabaca" },
 	{ MUA, 0, "((?2)b|(a)){2}(?1)", "aabab" },
@@ -572,10 +605,10 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "(?1)(((a(*ACCEPT)))b)", "axaa" },
 	{ MUA, 0, "(?1)(?(DEFINE) (((ac(*ACCEPT)))b) )", "akaac" },
 	{ MUA, 0, "(a+)b(?1)b\\1", "abaaabaaaaa" },
-	{ MUA, 0, "(?(DEFINE)(aa|a))(?1)ab", "aab" },
+	{ MUA, 0 | F_NOMATCH, "(?(DEFINE)(aa|a))(?1)ab", "aab" },
 	{ MUA, 0, "(?(DEFINE)(a\\Kb))(?1)+ababc", "abababxabababc" },
 	{ MUA, 0, "(a\\Kb)(?1)+ababc", "abababxababababc" },
-	{ MUA, 0, "(a\\Kb)(?1)+ababc", "abababxababababxc" },
+	{ MUA, 0 | F_NOMATCH, "(a\\Kb)(?1)+ababc", "abababxababababxc" },
 	{ MUA, 0, "b|<(?R)*>", "<<b>" },
 	{ MUA, 0, "(a\\K){0}(?:(?1)b|ac)", "ac" },
 	{ MUA, 0, "(?(DEFINE)(a(?2)|b)(b(?1)|(a)))(?:(?1)|(?2))m", "ababababnababababaam" },
@@ -586,133 +619,559 @@ static struct regression_test_case regression_test_cas
 	{ MUA, 0, "((?(R)(?:aaaa|a)|(?:(aaaa)|(a)))+)(?1)$", "aaaaaaaaaa aaaa" },
 	{ MUA, 0, "(?P<Name>a(?(R&Name)a|b))(?1)", "aab abb abaa" },
 
+	/* 16 bit specific tests. */
+	{ CMA, 0 | F_FORCECONV, "\xc3\xa1", "\xc3\x81\xc3\xa1" },
+	{ CMA, 0 | F_FORCECONV, "\xe1\xbd\xb8", "\xe1\xbf\xb8\xe1\xbd\xb8" },
+	{ CMA, 0 | F_FORCECONV, "[\xc3\xa1]", "\xc3\x81\xc3\xa1" },
+	{ CMA, 0 | F_FORCECONV, "[\xe1\xbd\xb8]", "\xe1\xbf\xb8\xe1\xbd\xb8" },
+	{ CMA, 0 | F_FORCECONV, "[a-\xed\xb0\x80]", "A" },
+	{ CMA, 0 | F_NO8 | F_FORCECONV, "[a-\\x{dc00}]", "B" },
+	{ CMA, 0 | F_NO8 | F_NOMATCH | F_FORCECONV, "[b-\\x{dc00}]", "a" },
+	{ CMA, 0 | F_NO8 | F_FORCECONV, "\xed\xa0\x80\\x{d800}\xed\xb0\x80\\x{dc00}", "\xed\xa0\x80\xed\xa0\x80\xed\xb0\x80\xed\xb0\x80" },
+	{ CMA, 0 | F_NO8 | F_FORCECONV, "[\xed\xa0\x80\\x{d800}]{1,2}?[\xed\xb0\x80\\x{dc00}]{1,2}?#", "\xed\xa0\x80\xed\xa0\x80\xed\xb0\x80\xed\xb0\x80#" },
+	{ CMA, 0 | F_FORCECONV, "[\xed\xa0\x80\xed\xb0\x80#]{0,3}(?<=\xed\xb0\x80.)", "\xed\xa0\x80#\xed\xa0\x80##\xed\xb0\x80\xed\xa0\x80" },
+	{ CMA, 0 | F_FORCECONV, "[\xed\xa0\x80-\xed\xb3\xbf]", "\xed\x9f\xbf\xed\xa0\x83" },
+	{ CMA, 0 | F_FORCECONV, "[\xed\xa0\x80-\xed\xb3\xbf]", "\xed\xb4\x80\xed\xb3\xb0" },
+	{ CMA, 0 | F_NO8 | F_FORCECONV, "[\\x{d800}-\\x{dcff}]", "\xed\x9f\xbf\xed\xa0\x83" },
+	{ CMA, 0 | F_NO8 | F_FORCECONV, "[\\x{d800}-\\x{dcff}]", "\xed\xb4\x80\xed\xb3\xb0" },
+	{ CMA, 0 | F_FORCECONV, "[\xed\xa0\x80-\xef\xbf\xbf]+[\x1-\xed\xb0\x80]+#", "\xed\xa0\x85\xc3\x81\xed\xa0\x85\xef\xbf\xb0\xc2\x85\xed\xa9\x89#" },
+	{ CMA, 0 | F_FORCECONV, "[\xed\xa0\x80][\xed\xb0\x80]{2,}", "\xed\xa0\x80\xed\xb0\x80\xed\xa0\x80\xed\xb0\x80\xed\xb0\x80\xed\xb0\x80" },
+	{ MA, 0 | F_FORCECONV, "[^\xed\xb0\x80]{3,}?", "##\xed\xb0\x80#\xed\xb0\x80#\xc3\x89#\xed\xb0\x80" },
+	{ MA, 0 | F_NO8 | F_FORCECONV, "[^\\x{dc00}]{3,}?", "##\xed\xb0\x80#\xed\xb0\x80#\xc3\x89#\xed\xb0\x80" },
+	{ CMA, 0 | F_FORCECONV, ".\\B.", "\xed\xa0\x80\xed\xb0\x80" },
+	{ CMA, 0 | F_FORCECONV, "\\D+(?:\\d+|.)\\S+(?:\\s+|.)\\W+(?:\\w+|.)\xed\xa0\x80\xed\xa0\x80", "\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80" },
+	{ CMA, 0 | F_FORCECONV, "\\d*\\s*\\w*\xed\xa0\x80\xed\xa0\x80", "\xed\xa0\x80\xed\xa0\x80" },
+	{ CMA, 0 | F_FORCECONV | F_NOMATCH, "\\d*?\\D*?\\s*?\\S*?\\w*?\\W*?##", "\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80\xed\xa0\x80#" },
+	{ CMA | PCRE_EXTENDED, 0 | F_FORCECONV, "\xed\xa0\x80 \xed\xb0\x80 !", "\xed\xa0\x80\xed\xb0\x80!" },
+	{ CMA, 0 | F_FORCECONV, "\xed\xa0\x80+#[^#]+\xed\xa0\x80", "\xed\xa0\x80#a\xed\xa0\x80" },
+	{ CMA, 0 | F_FORCECONV, "(\xed\xa0\x80+)#\\1", "\xed\xa0\x80\xed\xa0\x80#\xed\xa0\x80\xed\xa0\x80" },
+	{ PCRE_MULTILINE | PCRE_NEWLINE_ANY, 0 | F_NO8 | F_FORCECONV, "^-", "a--\xe2\x80\xa8--" },
+	{ PCRE_BSR_UNICODE, 0 | F_NO8 | F_FORCECONV, "\\R", "ab\xe2\x80\xa8" },
+	{ 0, 0 | F_NO8 | F_FORCECONV, "\\v", "ab\xe2\x80\xa9" },
+	{ 0, 0 | F_NO8 | F_FORCECONV, "\\h", "ab\xe1\xa0\x8e" },
+	{ 0, 0 | F_NO8 | F_FORCECONV, "\\v+?\\V+?#", "\xe2\x80\xa9\xe2\x80\xa9\xef\xbf\xbf\xef\xbf\xbf#" },
+	{ 0, 0 | F_NO8 | F_FORCECONV, "\\h+?\\H+?#", "\xe1\xa0\x8e\xe1\xa0\x8e\xef\xbf\xbf\xef\xbf\xbf#" },
+
 	/* Deep recursion. */
 	{ MUA, 0, "((((?:(?:(?:\\w)+)?)*|(?>\\w)+?)+|(?>\\w)?\?)*)?\\s", "aaaaa+ " },
 	{ MUA, 0, "(?:((?:(?:(?:\\w*?)+)??|(?>\\w)?|\\w*+)*)+)+?\\s", "aa+ " },
 	{ MUA, 0, "((a?)+)+b", "aaaaaaaaaaaaa b" },
 
 	/* Deep recursion: Stack limit reached. */
-	{ MA, 0, "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaaaaaaaaa" },
-	{ MA, 0, "(?:a+)+b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
-	{ MA, 0, "(?:a+?)+?b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
-	{ MA, 0, "(?:a*)*b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
-	{ MA, 0, "(?:a*?)*?b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
+	{ MA, 0 | F_NOMATCH, "a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?a?aaaaaaaaaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaaaaaaaaa" },
+	{ MA, 0 | F_NOMATCH, "(?:a+)+b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
+	{ MA, 0 | F_NOMATCH, "(?:a+?)+?b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
+	{ MA, 0 | F_NOMATCH, "(?:a*)*b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
+	{ MA, 0 | F_NOMATCH, "(?:a*?)*?b", "aaaaaaaaaaaaaaaaaaaaaaaa b" },
 
 	{ 0, 0, NULL, NULL }
 };
 
+static const unsigned char *tables(int mode)
+{
+	/* The purpose of this function to allow valgrind
+	for reporting invalid reads and writes. */
+	static unsigned char *tables_copy;
+	const char *errorptr;
+	int erroroffset;
+	const unsigned char *default_tables;
+#ifdef SUPPORT_PCRE8
+	pcre *regex;
+	char null_str[1] = { 0 };
+#else
+	pcre16 *regex;
+	PCRE_UCHAR16 null_str[1] = { 0 };
+#endif
+
+	if (mode) {
+		if (tables_copy)
+			free(tables_copy);
+		tables_copy = NULL;
+		return NULL;
+	}
+
+	if (tables_copy)
+		return tables_copy;
+
+	default_tables = NULL;
+#ifdef SUPPORT_PCRE8
+	regex = pcre_compile(null_str, 0, &errorptr, &erroroffset, NULL);
+	if (regex) {
+		pcre_fullinfo(regex, NULL, PCRE_INFO_DEFAULT_TABLES, &default_tables);
+		pcre_free(regex);
+	}
+#else
+	regex = pcre16_compile(null_str, 0, &errorptr, &erroroffset, NULL);
+	if (regex) {
+		pcre16_fullinfo(regex, NULL, PCRE_INFO_DEFAULT_TABLES, &default_tables);
+		pcre16_free(regex);
+	}
+#endif
+	/* Shouldn't ever happen. */
+	if (!default_tables)
+		return NULL;
+
+	/* Unfortunately this value cannot get from pcre_fullinfo.
+	Since this is a test program, this is acceptable at the moment. */
+	tables_copy = (unsigned char *)malloc(1088);
+	if (!tables_copy)
+		return NULL;
+
+	memcpy(tables_copy, default_tables, 1088);
+	return tables_copy;
+}
+
+#ifdef SUPPORT_PCRE8
+static pcre_jit_stack* callback8(void *arg)
+{
+	return (pcre_jit_stack *)arg;
+}
+#endif
+
+#ifdef SUPPORT_PCRE16
+static pcre16_jit_stack* callback16(void *arg)
+{
+	return (pcre16_jit_stack *)arg;
+}
+#endif
+
+#ifdef SUPPORT_PCRE8
+static void setstack8(pcre_extra *extra)
+{
+	static pcre_jit_stack *stack;
+
+	if (!extra) {
+		if (stack)
+			pcre_jit_stack_free(stack);
+		stack = NULL;
+		return;
+	}
+
+	if (!stack)
+		stack = pcre_jit_stack_alloc(1, 1024 * 1024);
+	/* Extra can be NULL. */
+	pcre_assign_jit_stack(extra, callback8, stack);
+}
+#endif /* SUPPORT_PCRE8 */
+
+#ifdef SUPPORT_PCRE16
+static void setstack16(pcre16_extra *extra)
+{
+	static pcre16_jit_stack *stack;
+
+	if (!extra) {
+		if (stack)
+			pcre16_jit_stack_free(stack);
+		stack = NULL;
+		return;
+	}
+
+	if (!stack)
+		stack = pcre16_jit_stack_alloc(1, 1024 * 1024);
+	/* Extra can be NULL. */
+	pcre16_assign_jit_stack(extra, callback16, stack);
+}
+#endif /* SUPPORT_PCRE8 */
+
+#ifdef SUPPORT_PCRE16
+
+static int convert_utf8_to_utf16(const char *input, PCRE_UCHAR16 *output, int *offsetmap, int max_length)
+{
+	unsigned char *iptr = (unsigned char*)input;
+	unsigned short *optr = (unsigned short *)output;
+	unsigned int c;
+
+	if (max_length == 0)
+		return 0;
+
+	while (*iptr && max_length > 1) {
+		c = 0;
+		if (offsetmap)
+			*offsetmap++ = (int)(iptr - (unsigned char*)input);
+
+		if (!(*iptr & 0x80))
+			c = *iptr++;
+		else if (!(*iptr & 0x20)) {
+			c = ((iptr[0] & 0x1f) << 6) | (iptr[1] & 0x3f);
+			iptr += 2;
+		} else if (!(*iptr & 0x10)) {
+			c = ((iptr[0] & 0x0f) << 12) | ((iptr[1] & 0x3f) << 6) | (iptr[2] & 0x3f);
+			iptr += 3;
+		} else if (!(*iptr & 0x08)) {
+			c = ((iptr[0] & 0x07) << 18) | ((iptr[1] & 0x3f) << 12) | ((iptr[2] & 0x3f) << 6) | (iptr[3] & 0x3f);
+			iptr += 4;
+		}
+
+		if (c < 65536) {
+			*optr++ = c;
+			max_length--;
+		} else if (max_length <= 2) {
+			*optr = '\0';
+			return (int)(optr - (unsigned short *)output);
+		} else {
+			c -= 0x10000;
+			*optr++ = 0xd800 | ((c >> 10) & 0x3ff);
+			*optr++ = 0xdc00 | (c & 0x3ff);
+			max_length -= 2;
+			if (offsetmap)
+				offsetmap++;
+		}
+	}
+	if (offsetmap)
+		*offsetmap = (int)(iptr - (unsigned char*)input);
+	*optr = '\0';
+	return (int)(optr - (unsigned short *)output);
+}
+
+static int copy_char8_to_char16(const char *input, PCRE_UCHAR16 *output, int max_length)
+{
+	unsigned char *iptr = (unsigned char*)input;
+	unsigned short *optr = (unsigned short *)output;
+
+	if (max_length == 0)
+		return 0;
+
+	while (*iptr && max_length > 1) {
+		*optr++ = *iptr++;
+		max_length--;
+	}
+	*optr = '\0';
+	return (int)(optr - (unsigned short *)output);
+}
+
+#define REGTEST_MAX_LENGTH 4096
+static PCRE_UCHAR16 regtest_buf[REGTEST_MAX_LENGTH];
+static int regtest_offsetmap[REGTEST_MAX_LENGTH];
+
+#endif /* SUPPORT_PCRE16 */
+
+static int check_ascii(const char *input)
+{
+	const unsigned char *ptr = (unsigned char *)input;
+	while (*ptr) {
+		if (*ptr > 127)
+			return 0;
+		ptr++;
+	}
+	return 1;
+}
+
 static int regression_tests(void)
 {
-	pcre *re;
 	struct regression_test_case *current = regression_test_cases;
 	const char *error;
-	pcre_extra *extra;
-	int utf8 = 0, ucp = 0;
-	int ovector1[32];
-	int ovector2[32];
-	int return_value1, return_value2;
+	const char *cpu_info;
 	int i, err_offs;
-	int total = 0, succesful = 0;
+	int is_successful, is_ascii_pattern, is_ascii_input;
+	int total = 0;
+	int successful = 0;
 	int counter = 0;
-	int disabled_flags = PCRE_BUG;
+#ifdef SUPPORT_PCRE8
+	pcre *re8;
+	pcre_extra *extra8;
+	int ovector8_1[32];
+	int ovector8_2[32];
+	int return_value8_1, return_value8_2;
+	int utf8 = 0, ucp8 = 0;
+	int disabled_flags8 = 0;
+#endif
+#ifdef SUPPORT_PCRE16
+	pcre16 *re16;
+	pcre16_extra *extra16;
+	int ovector16_1[32];
+	int ovector16_2[32];
+	int return_value16_1, return_value16_2;
+	int utf16 = 0, ucp16 = 0;
+	int disabled_flags16 = 0;
+	int length16;
+#endif
 
 	/* This test compares the behaviour of interpreter and JIT. Although disabling
-	utf8 or ucp may make tests fail, if the pcre_exec result is the SAME, it is
+	utf or ucp may make tests fail, if the pcre_exec result is the SAME, it is
 	still considered successful from pcre_jit_test point of view. */
 
+#ifdef SUPPORT_PCRE8
+	pcre_config(PCRE_CONFIG_JITTARGET, &cpu_info);
+#else
+	pcre16_config(PCRE_CONFIG_JITTARGET, &cpu_info);
+#endif
+
+	printf("Running JIT regression tests\n");
+	printf("  target CPU of SLJIT compiler: %s\n", cpu_info);
+
+#ifdef SUPPORT_PCRE8
 	pcre_config(PCRE_CONFIG_UTF8, &utf8);
-	pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &ucp);
+	pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &ucp8);
 	if (!utf8)
-		disabled_flags |= PCRE_UTF8;
-	if (!ucp)
-		disabled_flags |= PCRE_UCP;
+		disabled_flags8 |= PCRE_UTF8;
+	if (!ucp8)
+		disabled_flags8 |= PCRE_UCP;
+	printf("  in  8 bit mode with utf8  %s and ucp %s:\n", utf8 ? "enabled" : "disabled", ucp8 ? "enabled" : "disabled");
+#endif
+#ifdef SUPPORT_PCRE16
+	pcre16_config(PCRE_CONFIG_UTF16, &utf16);
+	pcre16_config(PCRE_CONFIG_UNICODE_PROPERTIES, &ucp16);
+	if (!utf16)
+		disabled_flags16 |= PCRE_UTF8;
+	if (!ucp16)
+		disabled_flags16 |= PCRE_UCP;
+	printf("  in 16 bit mode with utf16 %s and ucp %s:\n", utf16 ? "enabled" : "disabled", ucp16 ? "enabled" : "disabled");
+#endif
 
-	printf("Running JIT regression tests with utf8 %s and ucp %s:\n", utf8 ? "enabled" : "disabled", ucp ? "enabled" : "disabled");
 	while (current->pattern) {
 		/* printf("\nPattern: %s :\n", current->pattern); */
 		total++;
+		if (current->start_offset & F_PROPERTY) {
+			is_ascii_pattern = 0;
+			is_ascii_input = 0;
+		} else {
+			is_ascii_pattern = check_ascii(current->pattern);
+			is_ascii_input = check_ascii(current->input);
+		}
 
 		error = NULL;
-		re = pcre_compile(current->pattern, current->flags & ~(PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART | disabled_flags), &error, &err_offs, NULL);
+#ifdef SUPPORT_PCRE8
+		re8 = NULL;
+		if (!(current->start_offset & F_NO8))
+			re8 = pcre_compile(current->pattern,
+				current->flags & ~(PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART | disabled_flags8),
+				&error, &err_offs, tables(0));
 
-		if (!re) {
-			if (utf8 && ucp)
-				printf("\nCannot compile pattern: %s\n", current->pattern);
-			else {
-				/* Some patterns cannot be compiled when either of utf8
-				or ucp is disabled. We just skip them. */
-				printf(".");
-				succesful++;
+		extra8 = NULL;
+		if (re8) {
+			error = NULL;
+			extra8 = pcre_study(re8, PCRE_STUDY_JIT_COMPILE, &error);
+			if (!extra8) {
+				printf("\n8 bit: Cannot study pattern: %s\n", current->pattern);
+				pcre_free(re8);
+				re8 = NULL;
 			}
-			current++;
-			continue;
-		}
+			if (!(extra8->flags & PCRE_EXTRA_EXECUTABLE_JIT)) {
+				printf("\n8 bit: JIT compiler does not support: %s\n", current->pattern);
+				pcre_free_study(extra8);
+				pcre_free(re8);
+				re8 = NULL;
+			}
+		} else if (((utf8 && ucp8) || is_ascii_pattern) && !(current->start_offset & F_NO8))
+			printf("\n8 bit: Cannot compile pattern: %s\n", current->pattern);
+#endif
+#ifdef SUPPORT_PCRE16
+		if ((current->flags & PCRE_UTF8) || (current->start_offset & F_FORCECONV))
+			convert_utf8_to_utf16(current->pattern, regtest_buf, NULL, REGTEST_MAX_LENGTH);
+		else
+			copy_char8_to_char16(current->pattern, regtest_buf, REGTEST_MAX_LENGTH);
 
-		error = NULL;
-		extra = pcre_study(re, PCRE_STUDY_JIT_COMPILE, &error);
-		if (!extra) {
-			printf("\nCannot study pattern: %s\n", current->pattern);
-			current++;
-			continue;
-		}
+		re16 = NULL;
+		if (!(current->start_offset & F_NO16))
+			re16 = pcre16_compile(regtest_buf,
+				current->flags & ~(PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART | disabled_flags16),
+				&error, &err_offs, tables(0));
 
-		if (!(extra->flags & PCRE_EXTRA_EXECUTABLE_JIT)) {
-			printf("\nJIT compiler does not support: %s\n", current->pattern);
-			current++;
-			continue;
-		}
+		extra16 = NULL;
+		if (re16) {
+			error = NULL;
+			extra16 = pcre16_study(re16, PCRE_STUDY_JIT_COMPILE, &error);
+			if (!extra16) {
+				printf("\n16 bit: Cannot study pattern: %s\n", current->pattern);
+				pcre16_free(re16);
+				re16 = NULL;
+			}
+			if (!(extra16->flags & PCRE_EXTRA_EXECUTABLE_JIT)) {
+				printf("\n16 bit: JIT compiler does not support: %s\n", current->pattern);
+				pcre16_free_study(extra16);
+				pcre16_free(re16);
+				re16 = NULL;
+			}
+		} else if (((utf16 && ucp16) || is_ascii_pattern) && !(current->start_offset & F_NO16))
+			printf("\n16 bit: Cannot compile pattern: %s\n", current->pattern);
+#endif
 
 		counter++;
-		if ((counter & 0x3) != 0)
-			setstack(extra);
+		if ((counter & 0x3) != 0) {
+#ifdef SUPPORT_PCRE8
+			setstack8(NULL);
+#endif
+#ifdef SUPPORT_PCRE16
+			setstack16(NULL);
+#endif
+		}
 
+#ifdef SUPPORT_PCRE8
+		return_value8_1 = -1000;
+		return_value8_2 = -1000;
 		for (i = 0; i < 32; ++i)
-			ovector1[i] = -2;
-		return_value1 = pcre_exec(re, extra, current->input, strlen(current->input), current->start_offset, current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector1, 32);
+			ovector8_1[i] = -2;
+		for (i = 0; i < 32; ++i)
+			ovector8_2[i] = -2;
+		if (re8) {
+			setstack8(extra8);
+			return_value8_1 = pcre_exec(re8, extra8, current->input, strlen(current->input), current->start_offset & OFFSET_MASK,
+				current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector8_1, 32);
+			return_value8_2 = pcre_exec(re8, NULL, current->input, strlen(current->input), current->start_offset & OFFSET_MASK,
+				current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector8_2, 32);
+		}
+#endif
 
+#ifdef SUPPORT_PCRE16
+		return_value16_1 = -1000;
+		return_value16_2 = -1000;
 		for (i = 0; i < 32; ++i)
-			ovector2[i] = -2;
-		return_value2 = pcre_exec(re, NULL, current->input, strlen(current->input), current->start_offset, current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector2, 32);
+			ovector16_1[i] = -2;
+		for (i = 0; i < 32; ++i)
+			ovector16_2[i] = -2;
+		if (re16) {
+			setstack16(extra16);
+			if ((current->flags & PCRE_UTF8) || (current->start_offset & F_FORCECONV))
+				length16 = convert_utf8_to_utf16(current->input, regtest_buf, regtest_offsetmap, REGTEST_MAX_LENGTH);
+			else
+				length16 = copy_char8_to_char16(current->input, regtest_buf, REGTEST_MAX_LENGTH);
+			return_value16_1 = pcre16_exec(re16, extra16, regtest_buf, length16, current->start_offset & OFFSET_MASK,
+				current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector16_1, 32);
+			return_value16_2 = pcre16_exec(re16, NULL, regtest_buf, length16, current->start_offset & OFFSET_MASK,
+				current->flags & (PCRE_NOTBOL | PCRE_NOTEOL | PCRE_NOTEMPTY | PCRE_NOTEMPTY_ATSTART), ovector16_2, 32);
+		}
+#endif
 
-		/* If PCRE_BUG is set, just run the test, but do not compare the results.
+		/* If F_DIFF is set, just run the test, but do not compare the results.
 		Segfaults can still be captured. */
-		if (!(current->flags & PCRE_BUG)) {
-			if (return_value1 != return_value2) {
-				printf("\nReturn value differs(%d:%d): '%s' @ '%s'\n", return_value1, return_value2, current->pattern, current->input);
-				current++;
-				continue;
-			}
 
-			if (return_value1 >= 0) {
-				return_value1 *= 2;
-				err_offs = 0;
-				for (i = 0; i < return_value1; ++i)
-					if (ovector1[i] != ovector2[i]) {
-						printf("\nOvector[%d] value differs(%d:%d): '%s' @ '%s' \n", i, ovector1[i], ovector2[i], current->pattern, current->input);
-						err_offs = 1;
+		is_successful = 1;
+		if (!(current->start_offset & F_DIFF)) {
+#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
+			if (utf8 == utf16 && !(current->start_offset & F_FORCECONV)) {
+				/* All results must be the same. */
+				if (return_value8_1 != return_value8_2 || return_value8_1 != return_value16_1 || return_value8_1 != return_value16_2) {
+					printf("\n8 and 16 bit: Return value differs(%d:%d:%d:%d): [%d] '%s' @ '%s'\n",
+						return_value8_1, return_value8_2, return_value16_1, return_value16_2,
+						total, current->pattern, current->input);
+					is_successful = 0;
+				} else if (return_value8_1 >= 0) {
+					return_value8_1 *= 2;
+					/* Transform back the results. */
+					if (current->flags & PCRE_UTF8) {
+						for (i = 0; i < return_value8_1; ++i) {
+							if (ovector16_1[i] >= 0)
+								ovector16_1[i] = regtest_offsetmap[ovector16_1[i]];
+							if (ovector16_2[i] >= 0)
+								ovector16_2[i] = regtest_offsetmap[ovector16_2[i]];
+						}
 					}
-				if (err_offs) {
-					current++;
-					continue;
+
+					for (i = 0; i < return_value8_1; ++i)
+						if (ovector8_1[i] != ovector8_2[i] || ovector8_1[i] != ovector16_1[i] || ovector8_1[i] != ovector16_2[i]) {
+							printf("\n8 and 16 bit: Ovector[%d] value differs(%d:%d:%d:%d): [%d] '%s' @ '%s' \n",
+								i, ovector8_1[i], ovector8_2[i], ovector16_1[i], ovector16_2[i],
+								total, current->pattern, current->input);
+							is_successful = 0;
+						}
 				}
+			} else {
+#endif /* SUPPORT_PCRE8 && SUPPORT_PCRE16 */
+				/* Only the 8 bit and 16 bit results must be equal. */
+#ifdef SUPPORT_PCRE8
+				if (return_value8_1 != return_value8_2) {
+					printf("\n8 bit: Return value differs(%d:%d): [%d] '%s' @ '%s'\n",
+						return_value8_1, return_value8_2, total, current->pattern, current->input);
+					is_successful = 0;
+				} else if (return_value8_1 >= 0) {
+					return_value8_1 *= 2;
+					for (i = 0; i < return_value8_1; ++i)
+						if (ovector8_1[i] != ovector8_2[i]) {
+							printf("\n8 bit: Ovector[%d] value differs(%d:%d): [%d] '%s' @ '%s'\n",
+								i, ovector8_1[i], ovector8_2[i], total, current->pattern, current->input);
+							is_successful = 0;
+						}
+				}
+#endif
+
+#ifdef SUPPORT_PCRE16
+				if (return_value16_1 != return_value16_2) {
+					printf("\n16 bit: Return value differs(%d:%d): [%d] '%s' @ '%s'\n",
+						return_value16_1, return_value16_2, total, current->pattern, current->input);
+					is_successful = 0;
+				} else if (return_value16_1 >= 0) {
+					return_value16_1 *= 2;
+					for (i = 0; i < return_value16_1; ++i)
+						if (ovector16_1[i] != ovector16_2[i]) {
+							printf("\n16 bit: Ovector[%d] value differs(%d:%d): [%d] '%s' @ '%s'\n",
+								i, ovector16_1[i], ovector16_2[i], total, current->pattern, current->input);
+							is_successful = 0;
+						}
+				}
+#endif
+
+#if defined SUPPORT_PCRE8 && defined SUPPORT_PCRE16
 			}
+#endif /* SUPPORT_PCRE8 && SUPPORT_PCRE16 */
 		}
 
-		pcre_free_study(extra);
-		pcre_free(re);
+		if (is_successful) {
+#ifdef SUPPORT_PCRE8
+			if (!(current->start_offset & F_NO8) && ((utf8 && ucp8) || is_ascii_input)) {
+				if (return_value8_1 < 0 && !(current->start_offset & F_NOMATCH)) {
+					printf("8 bit: Test should match: [%d] '%s' @ '%s'\n",
+						total, current->pattern, current->input);
+					is_successful = 0;
+				}
 
-		/* printf("[%d-%d]%s", ovector1[0], ovector1[1], (current->flags & PCRE_CASELESS) ? "C" : ""); */
+				if (return_value8_1 >= 0 && (current->start_offset & F_NOMATCH)) {
+					printf("8 bit: Test should not match: [%d] '%s' @ '%s'\n",
+						total, current->pattern, current->input);
+					is_successful = 0;
+				}
+			}
+#endif
+#ifdef SUPPORT_PCRE16
+			if (!(current->start_offset & F_NO16) && ((utf16 && ucp16) || is_ascii_input)) {
+				if (return_value16_1 < 0 && !(current->start_offset & F_NOMATCH)) {
+					printf("16 bit: Test should match: [%d] '%s' @ '%s'\n",
+						total, current->pattern, current->input);
+					is_successful = 0;
+				}
+
+				if (return_value16_1 >= 0 && (current->start_offset & F_NOMATCH)) {
+					printf("16 bit: Test should not match: [%d] '%s' @ '%s'\n",
+						total, current->pattern, current->input);
+					is_successful = 0;
+				}
+			}
+#endif
+		}
+
+		if (is_successful)
+			successful++;
+
+#ifdef SUPPORT_PCRE8
+		if (re8) {
+			pcre_free_study(extra8);
+			pcre_free(re8);
+		}
+#endif
+#ifdef SUPPORT_PCRE16
+		if (re16) {
+			pcre16_free_study(extra16);
+			pcre16_free(re16);
+		}
+#endif
+
+		/* printf("[%d-%d|%d-%d]%s", ovector8_1[0], ovector8_1[1], ovector16_1[0], ovector16_1[1], (current->flags & PCRE_CASELESS) ? "C" : ""); */
 		printf(".");
 		fflush(stdout);
 		current++;
-		succesful++;
 	}
+	tables(1);
+#ifdef SUPPORT_PCRE8
+	setstack8(NULL);
+#endif
+#ifdef SUPPORT_PCRE16
+	setstack16(NULL);
+#endif
 
-	if (total == succesful) {
+	if (total == successful) {
 		printf("\nAll JIT regression tests are successfully passed.\n");
 		return 0;
 	} else {
-		printf("\nSuccessful test ratio: %d%%\n", succesful * 100 / total);
+		printf("\nSuccessful test ratio: %d%% (%d failed)\n", successful * 100 / total, total - successful);
 		return 1;
 	}
 }