/[pcre]/code/trunk/pcre_jit_compile.c

Diff of /code/trunk/pcre_jit_compile.c

Parent Directory | Revision Log | View Patch Patch

-revision 678 by ph10,
Sun Aug 28 15:23:03 2011 UTC
+revision 1316 by zherczeg,
Sun Apr 28 08:54:42 2013 UTC
 Line 6
  and semantics are as close as possible to those of the Perl 5 language.
                         Written by Philip Hazel
-            Copyright (c) 1997-2008 University of Cambridge
+            Copyright (c) 1997-2013 University of Cambridge
    The machine code generator part (this module) was written by Zoltan Herczeg
-                       Copyright (c) 2010-2011
+                       Copyright (c) 2010-2013
  -----------------------------------------------------------------------------
  Redistribution and use in source and binary forms, with or without
 Line 46 
 POSSIBILITY OF SUCH DAMAGE.
  #include "pcre_internal.h"
- #ifdef SUPPORT_JIT
+ #if defined SUPPORT_JIT
  /* All-in-one: Since we use the JIT compiler only from here,
  we just include it. This way we don't need to touch the build
  system files. */
+ #define SLJIT_MALLOC(size) (PUBL(malloc))(size)
+ #define SLJIT_FREE(ptr) (PUBL(free))(ptr)
  #define SLJIT_CONFIG_AUTO 1
+ #define SLJIT_CONFIG_STATIC 1
  #define SLJIT_VERBOSE 0
  #define SLJIT_DEBUG 0
  #include "sljit/sljitLir.c"
  #if defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED
- #error "Unsupported architecture"
+ #error Unsupported architecture
  #endif
- /* Allocate memory on the stack. Fast, but limited size. */
+ /* Defines for debugging purposes. */
- #define LOCAL_SPACE_SIZE 32768
+ /* 1 - Use unoptimized capturing brackets.
+- Enable capture_last_ptr (includes option 1). */
+ /* #define DEBUG_FORCE_UNOPTIMIZED_CBRAS 2 */
+ /* 1 - Always have a control head. */
+ /* #define DEBUG_FORCE_CONTROL_HEAD 1 */
+ /* Allocate memory for the regex stack on the real machine stack.
+ Fast, but limited size. */
+ #define MACHINE_STACK_SIZE 32768
+ /* Growth rate for stack allocated by the OS. Should be the multiply
+ of page size. */
  #define STACK_GROWTH_RATE 8192
  /* Enable to check that the allocation could destroy temporaries. */
-Line 79 
 The code generator follows the recursive
+Line 94 
 The code generator follows the recursive
  expressions. The basic blocks of regular expressions are condition checkers
  whose execute different commands depending on the result of the condition check.
  The relationship between the operators can be horizontal (concatenation) and
- vertical (sub-expression) (See struct fallback_common for more details).
+ vertical (sub-expression) (See struct backtrack_common for more details).
    'ab' - 'a' and 'b' regexps are concatenated
    'a+' - 'a' is the sub-expression of the '+' operator
  The condition checkers are boolean (true/false) checkers. Machine code is generated
  for the checker itself and for the actions depending on the result of the checker.
- The 'true' case is called as the hot path (expected path), and the other is called as
+ The 'true' case is called as the matching path (expected path), and the other is called as
- the 'fallback' path. Branch instructions are expesive for all CPUs, so we avoid taken
+ the 'backtrack' path. Branch instructions are expesive for all CPUs, so we avoid taken
- branches on the hot path.
+ branches on the matching path.
   Greedy star operator (*) :
-    Hot path: match happens.
+    Matching path: match happens.
-    Fallback path: match failed.
+    Backtrack path: match failed.
   Non-greedy star operator (*?) :
-    Hot path: no need to perform a match.
+    Matching path: no need to perform a match.
-    Fallback path: match is required.
+    Backtrack path: match is required.
  The following example shows how the code generated for a capturing bracket
  with two alternatives. Let A, B, C, D are arbirary regular expressions, and
-Line 105 
 we have the following regular expression
+Line 120 
 we have the following regular expression
  The generated code will be the following:
-  A hot path
+  A matching path
-  '(' hot path (pushing arguments to the stack)
+  '(' matching path (pushing arguments to the stack)
-  B hot path
+  B matching path
-  ')' hot path (pushing arguments to the stack)
+  ')' matching path (pushing arguments to the stack)
-  D hot path
+  D matching path
   return with successful match
-  D fallback path
+  D backtrack path
-  ')' fallback path (If we arrived from "C" jump to the fallback of "C")
+  ')' backtrack path (If we arrived from "C" jump to the backtrack of "C")
-  B fallback path
+  B backtrack path
   C expected path
-  jump to D hot path
+  jump to D matching path
-  C fallback path
+  C backtrack path
-  A fallback path
+  A backtrack path
-  Notice, that the order of fallback code paths are the opposite of the fast
+  Notice, that the order of backtrack code paths are the opposite of the fast
   code paths. In this way the topmost value on the stack is always belong
-  to the current fallback code path. The fallback code path must check
+  to the current backtrack code path. The backtrack path must check
   whether there is a next alternative. If so, it needs to jump back to
-  the hot path eventually. Otherwise it needs to clear out its own stack
+  the matching path eventually. Otherwise it needs to clear out its own stack
-  frame and continue the execution on the fallback code paths.
+  frame and continue the execution on the backtrack code paths.
  */
  /*
  Saved stack frames:
- Atomic blocks and asserts require reloading the values of local variables
+ Atomic blocks and asserts require reloading the values of private data
- when the fallback mechanism performed. Because of OP_RECURSE, the locals
+ when the backtrack mechanism performed. Because of OP_RECURSE, the data
  are not necessarly known in compile time, thus we need a dynamic restore
  mechanism.
  The stack frames are stored in a chain list, and have the following format:
  ([ capturing bracket offset ][ start value ][ end value ])+ ... [ 0 ] [ previous head ]
- Thus we can restore the locals to a particular point in the stack.
+ Thus we can restore the private data to a particular point in the stack.
  */
  typedef struct jit_arguments {
    /* Pointers first. */
    struct sljit_stack *stack;
-   PCRE_SPTR str;
+   const pcre_uchar *str;
-   PCRE_SPTR begin;
+   const pcre_uchar *begin;
-   PCRE_SPTR end;
+   const pcre_uchar *end;
    int *offsets;
-   uschar *ptr;
+   pcre_uchar *uchar_ptr;
+   pcre_uchar *mark_ptr;
+   void *callout_data;
    /* Everything else after. */
-   int offsetcount;
+   pcre_uint32 limit_match;
-   int calllimit;
+   int real_offset_count;
-   uschar notbol;
+   int offset_count;
-   uschar noteol;
+   pcre_uint8 notbol;
-   uschar notempty;
+   pcre_uint8 noteol;
-   uschar notempty_atstart;
+   pcre_uint8 notempty;
+   pcre_uint8 notempty_atstart;
  } jit_arguments;
- typedef struct executable_function {
+ typedef struct executable_functions {
-   void *executable_func;
+   void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];
-   pcre_jit_callback callback;
+   PUBL(jit_callback) callback;
    void *userdata;
- } executable_function;
+   pcre_uint32 top_bracket;
+   pcre_uint32 limit_match;
+   sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];
+ } executable_functions;
  typedef struct jump_list {
    struct sljit_jump *jump;
    struct jump_list *next;
  } jump_list;
- enum stub_types { stack_alloc, max_index };
  typedef struct stub_list {
-   enum stub_types type;
-   int data;
    struct sljit_jump *start;
-   struct sljit_label *leave;
+   struct sljit_label *quit;
    struct stub_list *next;
  } stub_list;
+ enum frame_types {
+   no_frame = -1,
+   no_stack = -2
+ };
+ enum control_types {
+   type_mark = 0,
+   type_then_trap = 1
+ };
  typedef int (SLJIT_CALL *jit_function)(jit_arguments *args);
  /* The following structure is the key data type for the recursive
- code generator. It is allocated by compile_hotpath, and contains
+ code generator. It is allocated by compile_matchingpath, and contains
- the aguments for compile_fallbackpath. Must be the first member
+ the aguments for compile_backtrackingpath. Must be the first member
  of its descendants. */
- typedef struct fallback_common {
+ typedef struct backtrack_common {
    /* Concatenation stack. */
-   struct fallback_common *prev;
+   struct backtrack_common *prev;
-   jump_list *nextfallbacks;
+   jump_list *nextbacktracks;
    /* Internal stack (for component operators). */
-   struct fallback_common *top;
+   struct backtrack_common *top;
-   jump_list *topfallbacks;
+   jump_list *topbacktracks;
    /* Opcode pointer. */
-   uschar *cc;
+   pcre_uchar *cc;
- } fallback_common;
+ } backtrack_common;
- typedef struct assert_fallback {
+ typedef struct assert_backtrack {
-   fallback_common common;
+   backtrack_common common;
    jump_list *condfailed;
-   /* Less than 0 (-1) if a frame is not needed. */
+   /* Less than 0 if a frame is not needed. */
    int framesize;
    /* Points to our private memory word on the stack. */
-   int localptr;
+   int private_data_ptr;
    /* For iterators. */
-   struct sljit_label *hotpath;
+   struct sljit_label *matchingpath;
- } assert_fallback;
+ } assert_backtrack;
- typedef struct bracket_fallback {
+ typedef struct bracket_backtrack {
-   fallback_common common;
+   backtrack_common common;
    /* Where to coninue if an alternative is successfully matched. */
-   struct sljit_label *althotpath;
+   struct sljit_label *alternative_matchingpath;
    /* For rmin and rmax iterators. */
-   struct sljit_label *recursivehotpath;
+   struct sljit_label *recursive_matchingpath;
    /* For greedy ? operator. */
-   struct sljit_label *zerohotpath;
+   struct sljit_label *zero_matchingpath;
    /* Contains the branches of a failed condition. */
    union {
      /* Both for OP_COND, OP_SCOND. */
      jump_list *condfailed;
-     assert_fallback *assert;
+     assert_backtrack *assert;
-     /* For OP_ONCE. -1 if not needed. */
+     /* For OP_ONCE. Less than 0 if not needed. */
      int framesize;
    } u;
    /* Points to our private memory word on the stack. */
-   int localptr;
+   int private_data_ptr;
- } bracket_fallback;
+ } bracket_backtrack;
- typedef struct bracketpos_fallback {
+ typedef struct bracketpos_backtrack {
-   fallback_common common;
+   backtrack_common common;
    /* Points to our private memory word on the stack. */
-   int localptr;
+   int private_data_ptr;
    /* Reverting stack is needed. */
    int framesize;
    /* Allocated stack size. */
    int stacksize;
- } bracketpos_fallback;
+ } bracketpos_backtrack;
- typedef struct braminzero_fallback {
+ typedef struct braminzero_backtrack {
-   fallback_common common;
+   backtrack_common common;
-   struct sljit_label *hotpath;
+   struct sljit_label *matchingpath;
- } braminzero_fallback;
+ } braminzero_backtrack;
- typedef struct iterator_fallback {
+ typedef struct iterator_backtrack {
-   fallback_common common;
+   backtrack_common common;
    /* Next iteration. */
-   struct sljit_label *hotpath;
+   struct sljit_label *matchingpath;
- } iterator_fallback;
+ } iterator_backtrack;
  typedef struct recurse_entry {
    struct recurse_entry *next;
-Line 256 
 typedef struct recurse_entry {
+Line 283 
 typedef struct recurse_entry {
    /* Collects the calls until the function is not created. */
    jump_list *calls;
    /* Points to the starting opcode. */
-   int start;
+   sljit_sw start;
  } recurse_entry;
- typedef struct recurse_fallback {
+ typedef struct recurse_backtrack {
-   fallback_common common;
+   backtrack_common common;
- } recurse_fallback;
+   BOOL inlined_pattern;
+ } recurse_backtrack;
+ #define OP_THEN_TRAP OP_TABLE_LENGTH
+ typedef struct then_trap_backtrack {
+   backtrack_common common;
+   /* If then_trap is not NULL, this structure contains the real
+   then_trap for the backtracking path. */
+   struct then_trap_backtrack *then_trap;
+   /* Points to the starting opcode. */
+   sljit_sw start;
+   /* Exit point for the then opcodes of this alternative. */
+   jump_list *quit;
+   /* Frame size of the current alternative. */
+   int framesize;
+ } then_trap_backtrack;
+ #define MAX_RANGE_SIZE 6
  typedef struct compiler_common {
+   /* The sljit ceneric compiler. */
    struct sljit_compiler *compiler;
-   uschar *start;
+   /* First byte code. */
-   int localsize;
+   pcre_uchar *start;
-   int *localptrs;
+   /* Maps private data offset to each opcode. */
-   const uschar *fcc;
+   sljit_si *private_data_ptrs;
-   sljit_w lcc;
+   /* Tells whether the capturing bracket is optimized. */
-   int cbraptr;
+   pcre_uint8 *optimized_cbracket;
+   /* Tells whether the starting offset is a target of then. */
+   pcre_uint8 *then_offsets;
+   /* Current position where a THEN must jump. */
+   then_trap_backtrack *then_trap;
+   /* Starting offset of private data for capturing brackets. */
+   int cbra_ptr;
+   /* Output vector starting point. Must be divisible by 2. */
+   int ovector_start;
+   /* Last known position of the requested byte. */
+   int req_char_ptr;
+   /* Head of the last recursion. */
+   int recursive_head_ptr;
+   /* First inspected character for partial matching. */
+   int start_used_ptr;
+   /* Starting pointer for partial soft matches. */
+   int hit_start;
+   /* End pointer of the first line. */
+   int first_line_end;
+   /* Points to the marked string. */
+   int mark_ptr;
+   /* Recursive control verb management chain. */
+   int control_head_ptr;
+   /* Points to the last matched capture block index. */
+   int capture_last_ptr;
+   /* Points to the starting position of the current match. */
+   int start_ptr;
+   /* Flipped and lower case tables. */
+   const pcre_uint8 *fcc;
+   sljit_sw lcc;
+   /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */
+   int mode;
+   /* \K is found in the pattern. */
+   BOOL has_set_som;
+   /* (*SKIP:arg) is found in the pattern. */
+   BOOL has_skip_arg;
+   /* (*THEN) is found in the pattern. */
+   BOOL has_then;
+   /* Needs to know the start position anytime. */
+   BOOL needs_start_ptr;
+   /* Currently in recurse or negative assert. */
+   BOOL local_exit;
+   /* Currently in a positive assert. */
+   BOOL positive_assert;
+   /* Newline control. */
    int nltype;
    int newline;
    int bsr_nltype;
+   /* Dollar endonly. */
    int endonly;
-   sljit_w ctypes;
+   /* Tables. */
-   struct sljit_label *acceptlabel;
+   sljit_sw ctypes;
+   int digits[2 + MAX_RANGE_SIZE];
+   /* Named capturing brackets. */
+   sljit_uw name_table;
+   sljit_sw name_count;
+   sljit_sw name_entry_size;
+   /* Labels and jump lists. */
+   struct sljit_label *partialmatchlabel;
+   struct sljit_label *quit_label;
+   struct sljit_label *forced_quit_label;
+   struct sljit_label *accept_label;
    stub_list *stubs;
    recurse_entry *entries;
    recurse_entry *currententry;
+   jump_list *partialmatch;
+   jump_list *quit;
+   jump_list *positive_assert_quit;
+   jump_list *forced_quit;
    jump_list *accept;
    jump_list *calllimit;
    jump_list *stackalloc;
-Line 290 
 typedef struct compiler_common {
+Line 397 
 typedef struct compiler_common {
    jump_list *vspace;
    jump_list *casefulcmp;
    jump_list *caselesscmp;
+   jump_list *reset_match;
    BOOL jscript_compat;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   BOOL utf8;
+   BOOL utf;
  #ifdef SUPPORT_UCP
-   BOOL useucp;
+   BOOL use_ucp;
+ #endif
+ #ifndef COMPILE_PCRE32
+   jump_list *utfreadchar;
  #endif
-   jump_list *utf8readchar;
+ #ifdef COMPILE_PCRE8
-   jump_list *utf8readtype8;
+   jump_list *utfreadtype8;
  #endif
+ #endif /* SUPPORT_UTF */
  #ifdef SUPPORT_UCP
    jump_list *getucd;
  #endif
-Line 310 
 typedef struct compare_context {
+Line 422 
 typedef struct compare_context {
    int length;
    int sourcereg;
  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-   int byteptr;
+   int ucharptr;
    union {
-     int asint;
+     sljit_si asint;
-     short asshort;
+     sljit_uh asushort;
+ #if defined COMPILE_PCRE8
      sljit_ub asbyte;
-     sljit_ub asbytes[4];
+     sljit_ub asuchars[4];
+ #elif defined COMPILE_PCRE16
+     sljit_uh asuchars[2];
+ #elif defined COMPILE_PCRE32
+     sljit_ui asuchars[1];
+ #endif
    } c;
    union {
-     int asint;
+     sljit_si asint;
-     short asshort;
+     sljit_uh asushort;
+ #if defined COMPILE_PCRE8
      sljit_ub asbyte;
-     sljit_ub asbytes[4];
+     sljit_ub asuchars[4];
+ #elif defined COMPILE_PCRE16
+     sljit_uh asuchars[2];
+ #elif defined COMPILE_PCRE32
+     sljit_ui asuchars[1];
+ #endif
    } oc;
  #endif
  } compare_context;
- enum {
+ /* Undefine sljit macros. */
-   frame_end = 0,
+ #undef CMP
-   frame_setmaxindex = -1,
-   frame_setstrbegin = -2
- };
  /* Used for accessing the elements of the stack. */
- #define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_w))
+ #define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_sw))
- #define TMP1          SLJIT_TEMPORARY_REG1
+ #define TMP1          SLJIT_SCRATCH_REG1
- #define TMP2          SLJIT_TEMPORARY_REG3
+ #define TMP2          SLJIT_SCRATCH_REG3
  #define TMP3          SLJIT_TEMPORARY_EREG2
- #define STR_PTR       SLJIT_GENERAL_REG1
+ #define STR_PTR       SLJIT_SAVED_REG1
- #define STR_END       SLJIT_GENERAL_REG2
+ #define STR_END       SLJIT_SAVED_REG2
- #define STACK_TOP     SLJIT_TEMPORARY_REG2
+ #define STACK_TOP     SLJIT_SCRATCH_REG2
- #define STACK_LIMIT   SLJIT_GENERAL_REG3
+ #define STACK_LIMIT   SLJIT_SAVED_REG3
- #define ARGUMENTS     SLJIT_GENERAL_EREG1
+ #define ARGUMENTS     SLJIT_SAVED_EREG1
- #define MAX_INDEX     SLJIT_GENERAL_EREG2
+ #define COUNT_MATCH   SLJIT_SAVED_EREG2
  #define RETURN_ADDR   SLJIT_TEMPORARY_EREG1
- /* Locals layout. */
+ /* Local space layout. */
  /* These two locals can be used by the current opcode. */
- #define LOCALS0          (0 * sizeof(sljit_w))
+ #define LOCALS0          (0 * sizeof(sljit_sw))
- #define LOCALS1          (1 * sizeof(sljit_w))
+ #define LOCALS1          (1 * sizeof(sljit_sw))
  /* Two local variables for possessive quantifiers (char1 cannot use them). */
- #define POSSESSIVE0      (2 * sizeof(sljit_w))
+ #define POSSESSIVE0      (2 * sizeof(sljit_sw))
- #define POSSESSIVE1      (3 * sizeof(sljit_w))
+ #define POSSESSIVE1      (3 * sizeof(sljit_sw))
- /* Head of the saved local variables */
- #define LOCALS_HEAD      (4 * sizeof(sljit_w))
- /* Head of the last recursion. */
- #define RECURSIVE_HEAD   (5 * sizeof(sljit_w))
- /* Number of recursions. */
- #define CALL_COUNT       (6 * sizeof(sljit_w))
  /* Max limit of recursions. */
- #define CALL_LIMIT       (7 * sizeof(sljit_w))
+ #define LIMIT_MATCH      (4 * sizeof(sljit_sw))
- /* Last known position of the requested byte. */
- #define REQ_BYTE_PTR     (8 * sizeof(sljit_w))
- /* End pointer of the first line. */
- #define FIRSTLINE_END    (9 * sizeof(sljit_w))
  /* The output vector is stored on the stack, and contains pointers
  to characters. The vector data is divided into two groups: the first
  group contains the start / end character pointers, and the second is
  the start pointers when the end of the capturing group has not yet reached. */
- #define OVECTOR_START    (10 * sizeof(sljit_w))
+ #define OVECTOR_START    (common->ovector_start)
- #define OVECTOR(i)       (OVECTOR_START + (i) * sizeof(sljit_w))
+ #define OVECTOR(i)       (OVECTOR_START + (i) * sizeof(sljit_sw))
- #define OVECTOR_PRIV(i)  (common->cbraptr + (i) * sizeof(sljit_w))
+ #define OVECTOR_PRIV(i)  (common->cbra_ptr + (i) * sizeof(sljit_sw))
- #define PRIV(cc)         (common->localptrs[(cc) - common->start])
+ #define PRIVATE_DATA(cc) (common->private_data_ptrs[(cc) - common->start])
+ #if defined COMPILE_PCRE8
+ #define MOV_UCHAR  SLJIT_MOV_UB
+ #define MOVU_UCHAR SLJIT_MOVU_UB
+ #elif defined COMPILE_PCRE16
+ #define MOV_UCHAR  SLJIT_MOV_UH
+ #define MOVU_UCHAR SLJIT_MOVU_UH
+ #elif defined COMPILE_PCRE32
+ #define MOV_UCHAR  SLJIT_MOV_UI
+ #define MOVU_UCHAR SLJIT_MOVU_UI
+ #else
+ #error Unsupported compiling mode
+ #endif
  /* Shortcuts. */
  #define DEFINE_COMPILER \
-Line 389 
 the start pointers when the end of the c
+Line 513 
 the start pointers when the end of the c
    sljit_set_label(sljit_emit_jump(compiler, (type)), (label))
  #define JUMPHERE(jump) \
    sljit_set_label((jump), sljit_emit_label(compiler))
+ #define SET_LABEL(jump, label) \
+   sljit_set_label((jump), (label))
  #define CMP(type, src1, src1w, src2, src2w) \
    sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w))
  #define CMPTO(type, src1, src1w, src2, src2w, label) \
    sljit_set_label(sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w)), (label))
- #define COND_VALUE(op, dst, dstw, type) \
+ #define OP_FLAGS(op, dst, dstw, src, srcw, type) \
-   sljit_emit_cond_value(compiler, (op), (dst), (dstw), (type))
+   sljit_emit_op_flags(compiler, (op), (dst), (dstw), (src), (srcw), (type))
+ #define GET_LOCAL_BASE(dst, dstw, offset) \
+   sljit_get_local_base(compiler, (dst), (dstw), (offset))
- static uschar* bracketend(uschar* cc)
+ static pcre_uchar* bracketend(pcre_uchar* cc)
  {
  SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
  do cc += GET(cc, 1); while (*cc == OP_ALT);
-Line 405 
 cc += 1 + LINK_SIZE;
+Line 533 
 cc += 1 + LINK_SIZE;
  return cc;
  }
  /* Functions whose might need modification for all new supported opcodes:
   next_opcode
-  get_localspace
+  check_opcode_types
-  set_localptrs
+  set_private_data_ptrs
   get_framesize
   init_frame
-  get_localsize
+  get_private_data_copy_length
-  copy_locals
+  copy_private_data
-  compile_hotpath
+  compile_matchingpath
-  compile_fallbackpath
+  compile_backtrackingpath
  */
- static uschar *next_opcode(compiler_common *common, uschar *cc)
+ static pcre_uchar *next_opcode(compiler_common *common, pcre_uchar *cc)
  {
  SLJIT_UNUSED_ARG(common);
  switch(*cc)
-Line 435 
 switch(*cc)
+Line 563 
 switch(*cc)
    case OP_WORDCHAR:
    case OP_ANY:
    case OP_ALLANY:
+   case OP_NOTPROP:
+   case OP_PROP:
    case OP_ANYNL:
    case OP_NOT_HSPACE:
    case OP_HSPACE:
-Line 447 
 switch(*cc)
+Line 577 
 switch(*cc)
    case OP_CIRCM:
    case OP_DOLL:
    case OP_DOLLM:
-   case OP_TYPESTAR:
-   case OP_TYPEMINSTAR:
-   case OP_TYPEPLUS:
-   case OP_TYPEMINPLUS:
-   case OP_TYPEQUERY:
-   case OP_TYPEMINQUERY:
-   case OP_TYPEPOSSTAR:
-   case OP_TYPEPOSPLUS:
-   case OP_TYPEPOSQUERY:
    case OP_CRSTAR:
    case OP_CRMINSTAR:
    case OP_CRPLUS:
    case OP_CRMINPLUS:
    case OP_CRQUERY:
    case OP_CRMINQUERY:
+   case OP_CRRANGE:
+   case OP_CRMINRANGE:
+   case OP_CLASS:
+   case OP_NCLASS:
+   case OP_REF:
+   case OP_REFI:
+   case OP_RECURSE:
+   case OP_CALLOUT:
+   case OP_ALT:
+   case OP_KET:
+   case OP_KETRMAX:
+   case OP_KETRMIN:
+   case OP_KETRPOS:
+   case OP_REVERSE:
+   case OP_ASSERT:
+   case OP_ASSERT_NOT:
+   case OP_ASSERTBACK:
+   case OP_ASSERTBACK_NOT:
+   case OP_ONCE:
+   case OP_ONCE_NC:
+   case OP_BRA:
+   case OP_BRAPOS:
+   case OP_CBRA:
+   case OP_CBRAPOS:
+   case OP_COND:
+   case OP_SBRA:
+   case OP_SBRAPOS:
+   case OP_SCBRA:
+   case OP_SCBRAPOS:
+   case OP_SCOND:
+   case OP_CREF:
+   case OP_NCREF:
+   case OP_RREF:
+   case OP_NRREF:
    case OP_DEF:
    case OP_BRAZERO:
    case OP_BRAMINZERO:
    case OP_BRAPOSZERO:
+   case OP_PRUNE:
+   case OP_SKIP:
+   case OP_THEN:
+   case OP_COMMIT:
    case OP_FAIL:
    case OP_ACCEPT:
    case OP_ASSERT_ACCEPT:
+   case OP_CLOSE:
    case OP_SKIPZERO:
-   return cc + 1;
+   return cc + PRIV(OP_lengths)[*cc];
    case OP_CHAR:
    case OP_CHARI:
    case OP_NOT:
    case OP_NOTI:
    case OP_STAR:
    case OP_MINSTAR:
    case OP_PLUS:
    case OP_MINPLUS:
    case OP_QUERY:
    case OP_MINQUERY:
+   case OP_UPTO:
+   case OP_MINUPTO:
+   case OP_EXACT:
    case OP_POSSTAR:
    case OP_POSPLUS:
    case OP_POSQUERY:
+   case OP_POSUPTO:
    case OP_STARI:
    case OP_MINSTARI:
    case OP_PLUSI:
    case OP_MINPLUSI:
    case OP_QUERYI:
    case OP_MINQUERYI:
+   case OP_UPTOI:
+   case OP_MINUPTOI:
+   case OP_EXACTI:
    case OP_POSSTARI:
    case OP_POSPLUSI:
    case OP_POSQUERYI:
+   case OP_POSUPTOI:
    case OP_NOTSTAR:
    case OP_NOTMINSTAR:
    case OP_NOTPLUS:
    case OP_NOTMINPLUS:
    case OP_NOTQUERY:
    case OP_NOTMINQUERY:
+   case OP_NOTUPTO:
+   case OP_NOTMINUPTO:
+   case OP_NOTEXACT:
    case OP_NOTPOSSTAR:
    case OP_NOTPOSPLUS:
    case OP_NOTPOSQUERY:
+   case OP_NOTPOSUPTO:
    case OP_NOTSTARI:
    case OP_NOTMINSTARI:
    case OP_NOTPLUSI:
    case OP_NOTMINPLUSI:
    case OP_NOTQUERYI:
    case OP_NOTMINQUERYI:
-   case OP_NOTPOSSTARI:
-   case OP_NOTPOSPLUSI:
-   case OP_NOTPOSQUERYI:
-   cc += 2;
- #ifdef SUPPORT_UTF8
-   if (common->utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
- #endif
-   return cc;
-   case OP_UPTO:
-   case OP_MINUPTO:
-   case OP_EXACT:
-   case OP_POSUPTO:
-   case OP_UPTOI:
-   case OP_MINUPTOI:
-   case OP_EXACTI:
-   case OP_POSUPTOI:
-   case OP_NOTUPTO:
-   case OP_NOTMINUPTO:
-   case OP_NOTEXACT:
-   case OP_NOTPOSUPTO:
    case OP_NOTUPTOI:
    case OP_NOTMINUPTOI:
    case OP_NOTEXACTI:
+   case OP_NOTPOSSTARI:
+   case OP_NOTPOSPLUSI:
+   case OP_NOTPOSQUERYI:
    case OP_NOTPOSUPTOI:
-   cc += 4;
+   cc += PRIV(OP_lengths)[*cc];
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
-   if (common->utf8 && cc[-1] >= 0xc0) cc += _pcre_utf8_table4[cc[-1] & 0x3f];
+   if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
  #endif
    return cc;
-   case OP_NOTPROP:
+   /* Special cases. */
-   case OP_PROP:
+   case OP_TYPESTAR:
+   case OP_TYPEMINSTAR:
+   case OP_TYPEPLUS:
+   case OP_TYPEMINPLUS:
+   case OP_TYPEQUERY:
+   case OP_TYPEMINQUERY:
    case OP_TYPEUPTO:
    case OP_TYPEMINUPTO:
    case OP_TYPEEXACT:
+   case OP_TYPEPOSSTAR:
+   case OP_TYPEPOSPLUS:
+   case OP_TYPEPOSQUERY:
    case OP_TYPEPOSUPTO:
-   case OP_REF:
+   return cc + PRIV(OP_lengths)[*cc] - 1;
-   case OP_REFI:
-   case OP_CREF:
-   case OP_CLOSE:
-   cc += 3;
-   return cc;
-   case OP_CRRANGE:
-   case OP_CRMINRANGE:
-   return cc + 5;
-   case OP_CLASS:
+   case OP_ANYBYTE:
-   case OP_NCLASS:
+ #ifdef SUPPORT_UTF
-   return cc + 33;
+   if (common->utf) return NULL;
+ #endif
+   return cc + 1;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
    case OP_XCLASS:
    return cc + GET(cc, 1);
  #endif
-   case OP_RECURSE:
+   case OP_MARK:
-   case OP_ASSERT:
+   case OP_PRUNE_ARG:
-   case OP_ASSERT_NOT:
+   case OP_SKIP_ARG:
-   case OP_ASSERTBACK:
+   case OP_THEN_ARG:
-   case OP_ASSERTBACK_NOT:
+   return cc + 1 + 2 + cc[1];
-   case OP_REVERSE:
-   case OP_ONCE:
-   case OP_BRA:
-   case OP_BRAPOS:
-   case OP_COND:
-   case OP_SBRA:
-   case OP_SBRAPOS:
-   case OP_SCOND:
-   case OP_ALT:
-   case OP_KET:
-   case OP_KETRMAX:
-   case OP_KETRMIN:
-   case OP_KETRPOS:
-   return cc + 1 + LINK_SIZE;
-   case OP_CBRA:
-   case OP_CBRAPOS:
-   case OP_SCBRA:
-   case OP_SCBRAPOS:
-   return cc + 1 + LINK_SIZE + 2;
    default:
+   /* All opcodes are supported now! */
+   SLJIT_ASSERT_STOP();
    return NULL;
    }
  }
- static int get_localspace(compiler_common *common, uschar *cc, uschar *ccend)
+ static BOOL check_opcode_types(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)
  {
- int localspace = 0;
+ pcre_uchar *name;
- uschar *alternative;
+ pcre_uchar *name2;
+ unsigned int cbra_index;
+ int i;
  /* Calculate important variables (like stack size) and checks whether all opcodes are supported. */
  while (cc < ccend)
    {
    switch(*cc)
      {
-     case OP_ASSERT:
+     case OP_SET_SOM:
-     case OP_ASSERT_NOT:
+     common->has_set_som = TRUE;
-     case OP_ASSERTBACK:
+     cc += 1;
-     case OP_ASSERTBACK_NOT:
+     break;
-     case OP_ONCE:
-     case OP_BRAPOS:
+     case OP_REF:
-     case OP_SBRA:
+     case OP_REFI:
-     case OP_SBRAPOS:
+     common->optimized_cbracket[GET2(cc, 1)] = 0;
-     case OP_SCOND:
+     cc += 1 + IMM2_SIZE;
-     localspace += sizeof(sljit_w);
-     cc += 1 + LINK_SIZE;
      break;
      case OP_CBRAPOS:
      case OP_SCBRAPOS:
-     localspace += sizeof(sljit_w);
+     common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;
-     cc += 1 + LINK_SIZE + 2;
+     cc += 1 + LINK_SIZE + IMM2_SIZE;
      break;
      case OP_COND:
-     /* Might be a hidden SCOND. */
+     case OP_SCOND:
-     alternative = cc + GET(cc, 1);
+     /* Only AUTO_CALLOUT can insert this opcode. We do
-     if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
+        not intend to support this case. */
-       localspace += sizeof(sljit_w);
+     if (cc[1 + LINK_SIZE] == OP_CALLOUT)
+       return FALSE;
+     cc += 1 + LINK_SIZE;
+     break;
+     case OP_CREF:
+     i = GET2(cc, 1);
+     common->optimized_cbracket[i] = 0;
+     cc += 1 + IMM2_SIZE;
+     break;
+     case OP_NCREF:
+     cbra_index = GET2(cc, 1);
+     name = (pcre_uchar *)common->name_table;
+     name2 = name;
+     for (i = 0; i < common->name_count; i++)
+       {
+       if (GET2(name, 0) == cbra_index) break;
+       name += common->name_entry_size;
+       }
+     SLJIT_ASSERT(i != common->name_count);
+     for (i = 0; i < common->name_count; i++)
+       {
+       if (STRCMP_UC_UC(name2 + IMM2_SIZE, name + IMM2_SIZE) == 0)
+         common->optimized_cbracket[GET2(name2, 0)] = 0;
+       name2 += common->name_entry_size;
+       }
+     cc += 1 + IMM2_SIZE;
+     break;
+     case OP_RECURSE:
+     /* Set its value only once. */
+     if (common->recursive_head_ptr == 0)
+       {
+       common->recursive_head_ptr = common->ovector_start;
+       common->ovector_start += sizeof(sljit_sw);
+       }
      cc += 1 + LINK_SIZE;
      break;
+     case OP_CALLOUT:
+     if (common->capture_last_ptr == 0)
+       {
+       common->capture_last_ptr = common->ovector_start;
+       common->ovector_start += sizeof(sljit_sw);
+       }
+     cc += 2 + 2 * LINK_SIZE;
+     break;
+     case OP_THEN_ARG:
+     common->has_then = TRUE;
+     common->control_head_ptr = 1;
+     /* Fall through. */
+     case OP_PRUNE_ARG:
+     common->needs_start_ptr = TRUE;
+     /* Fall through. */
+     case OP_MARK:
+     if (common->mark_ptr == 0)
+       {
+       common->mark_ptr = common->ovector_start;
+       common->ovector_start += sizeof(sljit_sw);
+       }
+     cc += 1 + 2 + cc[1];
+     break;
+     case OP_THEN:
+     common->has_then = TRUE;
+     common->control_head_ptr = 1;
+     /* Fall through. */
+     case OP_PRUNE:
+     case OP_SKIP:
+     common->needs_start_ptr = TRUE;
+     cc += 1;
+     break;
+     case OP_SKIP_ARG:
+     common->control_head_ptr = 1;
+     common->has_skip_arg = TRUE;
+     cc += 1 + 2 + cc[1];
+     break;
      default:
      cc = next_opcode(common, cc);
      if (cc == NULL)
-       return -1;
+       return FALSE;
      break;
      }
    }
- return localspace;
+ return TRUE;
  }
- static void set_localptrs(compiler_common *common, int localptr, uschar *ccend)
+ static int get_class_iterator_size(pcre_uchar *cc)
  {
- uschar *cc = common->start;
+ switch(*cc)
- uschar *alternative;
+   {
+   case OP_CRSTAR:
+   case OP_CRPLUS:
+   return 2;
+   case OP_CRMINSTAR:
+   case OP_CRMINPLUS:
+   case OP_CRQUERY:
+   case OP_CRMINQUERY:
+   return 1;
+   case OP_CRRANGE:
+   case OP_CRMINRANGE:
+   if (GET2(cc, 1) == GET2(cc, 1 + IMM2_SIZE))
+     return 0;
+   return 2;
+   default:
+   return 0;
+   }
+ }
+ static BOOL detect_repeat(compiler_common *common, pcre_uchar *begin)
+ {
+ pcre_uchar *end = bracketend(begin);
+ pcre_uchar *next;
+ pcre_uchar *next_end;
+ pcre_uchar *max_end;
+ pcre_uchar type;
+ sljit_sw length = end - begin;
+ int min, max, i;
+ /* Detect fixed iterations first. */
+ if (end[-(1 + LINK_SIZE)] != OP_KET)
+   return FALSE;
+ /* Already detected repeat. */
+ if (common->private_data_ptrs[end - common->start - LINK_SIZE] != 0)
+   return TRUE;
+ next = end;
+ min = 1;
+ while (1)
+   {
+   if (*next != *begin)
+     break;
+   next_end = bracketend(next);
+   if (next_end - next != length || memcmp(begin, next, IN_UCHARS(length)) != 0)
+     break;
+   next = next_end;
+   min++;
+   }
+ if (min == 2)
+   return FALSE;
+ max = 0;
+ max_end = next;
+ if (*next == OP_BRAZERO || *next == OP_BRAMINZERO)
+   {
+   type = *next;
+   while (1)
+     {
+     if (next[0] != type || next[1] != OP_BRA || next[2 + LINK_SIZE] != *begin)
+       break;
+     next_end = bracketend(next + 2 + LINK_SIZE);
+     if (next_end - next != (length + 2 + LINK_SIZE) || memcmp(begin, next + 2 + LINK_SIZE, IN_UCHARS(length)) != 0)
+       break;
+     next = next_end;
+     max++;
+     }
+   if (next[0] == type && next[1] == *begin && max >= 1)
+     {
+     next_end = bracketend(next + 1);
+     if (next_end - next == (length + 1) && memcmp(begin, next + 1, IN_UCHARS(length)) == 0)
+       {
+       for (i = 0; i < max; i++, next_end += 1 + LINK_SIZE)
+         if (*next_end != OP_KET)
+           break;
+       if (i == max)
+         {
+         common->private_data_ptrs[max_end - common->start - LINK_SIZE] = next_end - max_end;
+         common->private_data_ptrs[max_end - common->start - LINK_SIZE + 1] = (type == OP_BRAZERO) ? OP_UPTO : OP_MINUPTO;
+         /* +2 the original and the last. */
+         common->private_data_ptrs[max_end - common->start - LINK_SIZE + 2] = max + 2;
+         if (min == 1)
+           return TRUE;
+         min--;
+         max_end -= (1 + LINK_SIZE) + GET(max_end, -LINK_SIZE);
+         }
+       }
+     }
+   }
+ if (min >= 3)
+   {
+   common->private_data_ptrs[end - common->start - LINK_SIZE] = max_end - end;
+   common->private_data_ptrs[end - common->start - LINK_SIZE + 1] = OP_EXACT;
+   common->private_data_ptrs[end - common->start - LINK_SIZE + 2] = min;
+   return TRUE;
+   }
+ return FALSE;
+ }
+ #define CASE_ITERATOR_PRIVATE_DATA_1 \
+     case OP_MINSTAR: \
+     case OP_MINPLUS: \
+     case OP_QUERY: \
+     case OP_MINQUERY: \
+     case OP_MINSTARI: \
+     case OP_MINPLUSI: \
+     case OP_QUERYI: \
+     case OP_MINQUERYI: \
+     case OP_NOTMINSTAR: \
+     case OP_NOTMINPLUS: \
+     case OP_NOTQUERY: \
+     case OP_NOTMINQUERY: \
+     case OP_NOTMINSTARI: \
+     case OP_NOTMINPLUSI: \
+     case OP_NOTQUERYI: \
+     case OP_NOTMINQUERYI:
+ #define CASE_ITERATOR_PRIVATE_DATA_2A \
+     case OP_STAR: \
+     case OP_PLUS: \
+     case OP_STARI: \
+     case OP_PLUSI: \
+     case OP_NOTSTAR: \
+     case OP_NOTPLUS: \
+     case OP_NOTSTARI: \
+     case OP_NOTPLUSI:
+ #define CASE_ITERATOR_PRIVATE_DATA_2B \
+     case OP_UPTO: \
+     case OP_MINUPTO: \
+     case OP_UPTOI: \
+     case OP_MINUPTOI: \
+     case OP_NOTUPTO: \
+     case OP_NOTMINUPTO: \
+     case OP_NOTUPTOI: \
+     case OP_NOTMINUPTOI:
+ #define CASE_ITERATOR_TYPE_PRIVATE_DATA_1 \
+     case OP_TYPEMINSTAR: \
+     case OP_TYPEMINPLUS: \
+     case OP_TYPEQUERY: \
+     case OP_TYPEMINQUERY:
+ #define CASE_ITERATOR_TYPE_PRIVATE_DATA_2A \
+     case OP_TYPESTAR: \
+     case OP_TYPEPLUS:
+ #define CASE_ITERATOR_TYPE_PRIVATE_DATA_2B \
+     case OP_TYPEUPTO: \
+     case OP_TYPEMINUPTO:
+ static void set_private_data_ptrs(compiler_common *common, int *private_data_start, pcre_uchar *ccend)
+ {
+ pcre_uchar *cc = common->start;
+ pcre_uchar *alternative;
+ pcre_uchar *end = NULL;
+ int private_data_ptr = *private_data_start;
+ int space, size, bracketlen;
  while (cc < ccend)
    {
+   space = 0;
+   size = 0;
+   bracketlen = 0;
+   if (private_data_ptr > SLJIT_MAX_LOCAL_SIZE)
+     return;
+   if (*cc == OP_ONCE || *cc == OP_ONCE_NC || *cc == OP_BRA || *cc == OP_CBRA || *cc == OP_COND)
+     if (detect_repeat(common, cc))
+       {
+       /* These brackets are converted to repeats, so no global
+       based single character repeat is allowed. */
+       if (cc >= end)
+         end = bracketend(cc);
+       }
    switch(*cc)
      {
+     case OP_KET:
+     if (common->private_data_ptrs[cc + 1 - common->start] != 0)
+       {
+       common->private_data_ptrs[cc - common->start] = private_data_ptr;
+       private_data_ptr += sizeof(sljit_sw);
+       cc += common->private_data_ptrs[cc + 1 - common->start];
+       }
+     cc += 1 + LINK_SIZE;
+     break;
      case OP_ASSERT:
      case OP_ASSERT_NOT:
      case OP_ASSERTBACK:
      case OP_ASSERTBACK_NOT:
      case OP_ONCE:
+     case OP_ONCE_NC:
      case OP_BRAPOS:
      case OP_SBRA:
      case OP_SBRAPOS:
      case OP_SCOND:
-     common->localptrs[cc - common->start] = localptr;
+     common->private_data_ptrs[cc - common->start] = private_data_ptr;
-     localptr += sizeof(sljit_w);
+     private_data_ptr += sizeof(sljit_sw);
-     cc += 1 + LINK_SIZE;
+     bracketlen = 1 + LINK_SIZE;
      break;
      case OP_CBRAPOS:
      case OP_SCBRAPOS:
-     common->localptrs[cc - common->start] = localptr;
+     common->private_data_ptrs[cc - common->start] = private_data_ptr;
-     localptr += sizeof(sljit_w);
+     private_data_ptr += sizeof(sljit_sw);
-     cc += 1 + LINK_SIZE + 2;
+     bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
      break;
      case OP_COND:
-Line 678 
 while (cc < ccend)
+Line 1088 
 while (cc < ccend)
      alternative = cc + GET(cc, 1);
      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
        {
-       common->localptrs[cc - common->start] = localptr;
+       common->private_data_ptrs[cc - common->start] = private_data_ptr;
-       localptr += sizeof(sljit_w);
+       private_data_ptr += sizeof(sljit_sw);
        }
-     cc += 1 + LINK_SIZE;
+     bracketlen = 1 + LINK_SIZE;
+     break;
+     case OP_BRA:
+     bracketlen = 1 + LINK_SIZE;
+     break;
+     case OP_CBRA:
+     case OP_SCBRA:
+     bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
+     break;
+     CASE_ITERATOR_PRIVATE_DATA_1
+     space = 1;
+     size = -2;
+     break;
+     CASE_ITERATOR_PRIVATE_DATA_2A
+     space = 2;
+     size = -2;
+     break;
+     CASE_ITERATOR_PRIVATE_DATA_2B
+     space = 2;
+     size = -(2 + IMM2_SIZE);
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_1
+     space = 1;
+     size = 1;
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
+     if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
+       space = 2;
+     size = 1;
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
+     if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
+       space = 2;
+     size = 1 + IMM2_SIZE;
+     break;
+     case OP_CLASS:
+     case OP_NCLASS:
+     size += 1 + 32 / sizeof(pcre_uchar);
+     space = get_class_iterator_size(cc + size);
      break;
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+     case OP_XCLASS:
+     size = GET(cc, 1);
+     space = get_class_iterator_size(cc + size);
+     break;
+ #endif
      default:
      cc = next_opcode(common, cc);
      SLJIT_ASSERT(cc != NULL);
      break;
      }
+   /* Character iterators, which are not inside a repeated bracket,
+      gets a private slot instead of allocating it on the stack. */
+   if (space > 0 && cc >= end)
+     {
+     common->private_data_ptrs[cc - common->start] = private_data_ptr;
+     private_data_ptr += sizeof(sljit_sw) * space;
+     }
+   if (size != 0)
+     {
+     if (size < 0)
+       {
+       cc += -size;
+ #ifdef SUPPORT_UTF
+       if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+       }
+     else
+       cc += size;
+     }
+   if (bracketlen > 0)
+     {
+     if (cc >= end)
+       {
+       end = bracketend(cc);
+       if (end[-1 - LINK_SIZE] == OP_KET)
+         end = NULL;
+       }
+     cc += bracketlen;
+     }
    }
+ *private_data_start = private_data_ptr;
  }
- /* Returns with -1 if no need for frame. */
+ /* Returns with a frame_types (always < 0) if no need for frame. */
- static int get_framesize(compiler_common *common, uschar *cc, BOOL recursive)
+ static int get_framesize(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL recursive, BOOL* needs_control_head)
  {
- uschar *ccend = bracketend(cc);
- uschar *end;
  int length = 0;
- BOOL possessive = FALSE;
+ int possessive = 0;
- BOOL needs_frame = FALSE;
+ BOOL stack_restore = FALSE;
- BOOL needs_maxindex = FALSE;
+ BOOL setsom_found = recursive;
- BOOL setsom_found = FALSE;
+ BOOL setmark_found = recursive;
+ /* The last capture is a local variable even for recursions. */
- if (!recursive && (*cc == OP_CBRAPOS || *cc == OP_SCBRAPOS))
+ BOOL capture_last_found = FALSE;
-   {
-   length = 3 + 2;
+ #if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
-   needs_maxindex = TRUE;
+ SLJIT_ASSERT(common->control_head_ptr != 0);
-   possessive = TRUE;
+ *needs_control_head = TRUE;
+ #else
+ *needs_control_head = FALSE;
+ #endif
+ if (ccend == NULL)
+   {
+   ccend = bracketend(cc) - (1 + LINK_SIZE);
+   if (!recursive && (*cc == OP_CBRAPOS || *cc == OP_SCBRAPOS))
+     {
+     possessive = length = (common->capture_last_ptr != 0) ? 5 : 3;
+     /* This is correct regardless of common->capture_last_ptr. */
+     capture_last_found = TRUE;
+     }
+   cc = next_opcode(common, cc);
    }
- cc = next_opcode(common, cc);
  SLJIT_ASSERT(cc != NULL);
  while (cc < ccend)
    switch(*cc)
      {
      case OP_SET_SOM:
-     case OP_RECURSE:
+     SLJIT_ASSERT(common->has_set_som);
+     stack_restore = TRUE;
      if (!setsom_found)
        {
        length += 2;
        setsom_found = TRUE;
        }
-     cc += (*cc == OP_SET_SOM) ? 1 : 1 + LINK_SIZE;
+     cc += 1;
      break;
-     case OP_ASSERT:
+     case OP_MARK:
-     case OP_ASSERT_NOT:
+     case OP_PRUNE_ARG:
-     case OP_ASSERTBACK:
+     case OP_THEN_ARG:
-     case OP_ASSERTBACK_NOT:
+     SLJIT_ASSERT(common->mark_ptr != 0);
-     case OP_ONCE:
+     stack_restore = TRUE;
-     if (needs_frame || length > 0)
+     if (!setmark_found)
        {
-       cc = bracketend(cc);
+       length += 2;
-       break;
+       setmark_found = TRUE;
        }
-     /* Check whether a frame must be created. */
+     if (common->control_head_ptr != 0)
-     end = bracketend(cc);
+       *needs_control_head = TRUE;
-     while (cc < end)
+     cc += 1 + 2 + cc[1];
-       {
+     break;
-       if (*cc == OP_SET_SOM || *cc == OP_CBRA || *cc == OP_CBRAPOS
-           || *cc == OP_SCBRA || *cc == OP_SCBRAPOS || *cc == OP_RECURSE)
+     case OP_RECURSE:
-         needs_frame = TRUE;
+     stack_restore = TRUE;
-       cc = next_opcode(common, cc);
+     if (common->has_set_som && !setsom_found)
-       SLJIT_ASSERT(cc != NULL);
+       {
+       length += 2;
+       setsom_found = TRUE;
+       }
+     if (common->mark_ptr != 0 && !setmark_found)
+       {
+       length += 2;
+       setmark_found = TRUE;
        }
+     if (common->capture_last_ptr != 0 && !capture_last_found)
+       {
+       length += 2;
+       capture_last_found = TRUE;
+       }
+     cc += 1 + LINK_SIZE;
      break;
      case OP_CBRA:
      case OP_CBRAPOS:
      case OP_SCBRA:
      case OP_SCBRAPOS:
-     if (!needs_maxindex)
+     stack_restore = TRUE;
+     if (common->capture_last_ptr != 0 && !capture_last_found)
        {
-       needs_maxindex = TRUE;
        length += 2;
+       capture_last_found = TRUE;
        }
      length += 3;
-     cc += 1 + LINK_SIZE + 2;
+     cc += 1 + LINK_SIZE + IMM2_SIZE;
      break;
      default:
+     stack_restore = TRUE;
+     /* Fall through. */
+     case OP_NOT_WORD_BOUNDARY:
+     case OP_WORD_BOUNDARY:
+     case OP_NOT_DIGIT:
+     case OP_DIGIT:
+     case OP_NOT_WHITESPACE:
+     case OP_WHITESPACE:
+     case OP_NOT_WORDCHAR:
+     case OP_WORDCHAR:
+     case OP_ANY:
+     case OP_ALLANY:
+     case OP_ANYBYTE:
+     case OP_NOTPROP:
+     case OP_PROP:
+     case OP_ANYNL:
+     case OP_NOT_HSPACE:
+     case OP_HSPACE:
+     case OP_NOT_VSPACE:
+     case OP_VSPACE:
+     case OP_EXTUNI:
+     case OP_EODN:
+     case OP_EOD:
+     case OP_CIRC:
+     case OP_CIRCM:
+     case OP_DOLL:
+     case OP_DOLLM:
+     case OP_CHAR:
+     case OP_CHARI:
+     case OP_NOT:
+     case OP_NOTI:
+     case OP_EXACT:
+     case OP_POSSTAR:
+     case OP_POSPLUS:
+     case OP_POSQUERY:
+     case OP_POSUPTO:
+     case OP_EXACTI:
+     case OP_POSSTARI:
+     case OP_POSPLUSI:
+     case OP_POSQUERYI:
+     case OP_POSUPTOI:
+     case OP_NOTEXACT:
+     case OP_NOTPOSSTAR:
+     case OP_NOTPOSPLUS:
+     case OP_NOTPOSQUERY:
+     case OP_NOTPOSUPTO:
+     case OP_NOTEXACTI:
+     case OP_NOTPOSSTARI:
+     case OP_NOTPOSPLUSI:
+     case OP_NOTPOSQUERYI:
+     case OP_NOTPOSUPTOI:
+     case OP_TYPEEXACT:
+     case OP_TYPEPOSSTAR:
+     case OP_TYPEPOSPLUS:
+     case OP_TYPEPOSQUERY:
+     case OP_TYPEPOSUPTO:
+     case OP_CLASS:
+     case OP_NCLASS:
+     case OP_XCLASS:
      cc = next_opcode(common, cc);
      SLJIT_ASSERT(cc != NULL);
      break;
      }
  /* Possessive quantifiers can use a special case. */
- if (SLJIT_UNLIKELY(possessive) && !needs_frame && length == 3 + 2)
+ if (SLJIT_UNLIKELY(possessive == length))
-   return -1;
+   return stack_restore ? no_frame : no_stack;
  if (length > 0)
-   return length + 2;
+   return length + 1;
- return needs_frame ? 0 : -1;
+ return stack_restore ? no_frame : no_stack;
  }
- static void init_frame(compiler_common *common, uschar *cc, int stackpos, int stacktop, BOOL recursive)
+ static void init_frame(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, int stackpos, int stacktop, BOOL recursive)
  {
- /* TMP2 must contain STACK_TOP - (-STACK(stackpos)) */
  DEFINE_COMPILER;
- uschar *ccend = bracketend(cc);
+ BOOL setsom_found = recursive;
- BOOL needs_maxindex = FALSE;
+ BOOL setmark_found = recursive;
- BOOL setsom_found = FALSE;
+ /* The last capture is a local variable even for recursions. */
+ BOOL capture_last_found = FALSE;
  int offset;
- if (stackpos < stacktop)
+ /* >= 1 + shortest item size (2) */
-   {
+ SLJIT_UNUSED_ARG(stacktop);
-   SLJIT_ASSERT(stackpos + 1 == stacktop);
+ SLJIT_ASSERT(stackpos >= stacktop + 2);
-   return;
-   }
  stackpos = STACK(stackpos);
- OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS_HEAD);
+ if (ccend == NULL)
- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS_HEAD, TMP2, 0);
+   {
- OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacktop), TMP1, 0);
+   ccend = bracketend(cc) - (1 + LINK_SIZE);
+   if (recursive || (*cc != OP_CBRAPOS && *cc != OP_SCBRAPOS))
+     cc = next_opcode(common, cc);
+   }
- if (recursive || (*cc != OP_CBRAPOS && *cc != OP_SCBRAPOS))
-   cc = next_opcode(common, cc);
  SLJIT_ASSERT(cc != NULL);
  while (cc < ccend)
    switch(*cc)
      {
      case OP_SET_SOM:
+     SLJIT_ASSERT(common->has_set_som);
+     if (!setsom_found)
+       {
+       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -OVECTOR(0));
+       stackpos += (int)sizeof(sljit_sw);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
+       stackpos += (int)sizeof(sljit_sw);
+       setsom_found = TRUE;
+       }
+     cc += 1;
+     break;
+     case OP_MARK:
+     case OP_PRUNE_ARG:
+     case OP_THEN_ARG:
+     SLJIT_ASSERT(common->mark_ptr != 0);
+     if (!setmark_found)
+       {
+       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->mark_ptr);
+       stackpos += (int)sizeof(sljit_sw);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
+       stackpos += (int)sizeof(sljit_sw);
+       setmark_found = TRUE;
+       }
+     cc += 1 + 2 + cc[1];
+     break;
      case OP_RECURSE:
-     if (!setsom_found)
+     if (common->has_set_som && !setsom_found)
        {
        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
-       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setstrbegin);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -OVECTOR(0));
-       stackpos += (int)sizeof(sljit_w);
+       stackpos += (int)sizeof(sljit_sw);
        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-       stackpos += (int)sizeof(sljit_w);
+       stackpos += (int)sizeof(sljit_sw);
        setsom_found = TRUE;
        }
-     cc += (*cc == OP_SET_SOM) ? 1 : 1 + LINK_SIZE;
+     if (common->mark_ptr != 0 && !setmark_found)
-     break;
+       {
+       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
-     case OP_ASSERT:
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->mark_ptr);
-     case OP_ASSERT_NOT:
+       stackpos += (int)sizeof(sljit_sw);
-     case OP_ASSERTBACK:
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-     case OP_ASSERTBACK_NOT:
+       stackpos += (int)sizeof(sljit_sw);
-     case OP_ONCE:
+       setmark_found = TRUE;
-     cc = bracketend(cc);
+       }
+     if (common->capture_last_ptr != 0 && !capture_last_found)
+       {
+       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->capture_last_ptr);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->capture_last_ptr);
+       stackpos += (int)sizeof(sljit_sw);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
+       stackpos += (int)sizeof(sljit_sw);
+       capture_last_found = TRUE;
+       }
+     cc += 1 + LINK_SIZE;
      break;
      case OP_CBRA:
      case OP_CBRAPOS:
      case OP_SCBRA:
      case OP_SCBRAPOS:
-     if (!needs_maxindex)
+     if (common->capture_last_ptr != 0 && !capture_last_found)
        {
-       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setmaxindex);
+       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->capture_last_ptr);
-       stackpos += (int)sizeof(sljit_w);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, -common->capture_last_ptr);
-       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, MAX_INDEX, 0);
+       stackpos += (int)sizeof(sljit_sw);
-       stackpos += (int)sizeof(sljit_w);
+       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-       needs_maxindex = TRUE;
+       stackpos += (int)sizeof(sljit_sw);
+       capture_last_found = TRUE;
        }
      offset = (GET2(cc, 1 + LINK_SIZE)) << 1;
      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, OVECTOR(offset));
-     stackpos += (int)sizeof(sljit_w);
+     stackpos += (int)sizeof(sljit_sw);
      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset));
      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));
      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
-     stackpos += (int)sizeof(sljit_w);
+     stackpos += (int)sizeof(sljit_sw);
      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP2, 0);
-     stackpos += (int)sizeof(sljit_w);
+     stackpos += (int)sizeof(sljit_sw);
-     cc += 1 + LINK_SIZE + 2;
+     cc += 1 + LINK_SIZE + IMM2_SIZE;
      break;
      default:
-Line 854 
 while (cc < ccend)
+Line 1483 
 while (cc < ccend)
      break;
      }
- OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_end);
+ OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, 0);
- SLJIT_ASSERT(stackpos == STACK(stacktop + 1));
+ SLJIT_ASSERT(stackpos == STACK(stacktop));
  }
- static SLJIT_INLINE int get_localsize(compiler_common *common, uschar *cc, uschar *ccend)
+ static SLJIT_INLINE int get_private_data_copy_length(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, BOOL needs_control_head)
  {
- int localsize = 2;
+ int private_data_length = needs_control_head ? 3 : 2;
- uschar *alternative;
+ int size;
- /* Calculate the sum of the local variables. */
+ pcre_uchar *alternative;
+ /* Calculate the sum of the private machine words. */
  while (cc < ccend)
    {
+   size = 0;
    switch(*cc)
      {
+     case OP_KET:
+     if (PRIVATE_DATA(cc) != 0)
+       private_data_length++;
+     cc += 1 + LINK_SIZE;
+     break;
      case OP_ASSERT:
      case OP_ASSERT_NOT:
      case OP_ASSERTBACK:
      case OP_ASSERTBACK_NOT:
      case OP_ONCE:
+     case OP_ONCE_NC:
      case OP_BRAPOS:
      case OP_SBRA:
      case OP_SBRAPOS:
      case OP_SCOND:
-     localsize++;
+     private_data_length++;
      cc += 1 + LINK_SIZE;
      break;
      case OP_CBRA:
      case OP_SCBRA:
-     localsize++;
+     if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-     cc += 1 + LINK_SIZE + 2;
+       private_data_length++;
+     cc += 1 + LINK_SIZE + IMM2_SIZE;
      break;
      case OP_CBRAPOS:
      case OP_SCBRAPOS:
-     localsize += 2;
+     private_data_length += 2;
-     cc += 1 + LINK_SIZE + 2;
+     cc += 1 + LINK_SIZE + IMM2_SIZE;
      break;
      case OP_COND:
      /* Might be a hidden SCOND. */
      alternative = cc + GET(cc, 1);
      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
-       localsize++;
+       private_data_length++;
      cc += 1 + LINK_SIZE;
      break;
+     CASE_ITERATOR_PRIVATE_DATA_1
+     if (PRIVATE_DATA(cc))
+       private_data_length++;
+     cc += 2;
+ #ifdef SUPPORT_UTF
+     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+     break;
+     CASE_ITERATOR_PRIVATE_DATA_2A
+     if (PRIVATE_DATA(cc))
+       private_data_length += 2;
+     cc += 2;
+ #ifdef SUPPORT_UTF
+     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+     break;
+     CASE_ITERATOR_PRIVATE_DATA_2B
+     if (PRIVATE_DATA(cc))
+       private_data_length += 2;
+     cc += 2 + IMM2_SIZE;
+ #ifdef SUPPORT_UTF
+     if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_1
+     if (PRIVATE_DATA(cc))
+       private_data_length++;
+     cc += 1;
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
+     if (PRIVATE_DATA(cc))
+       private_data_length += 2;
+     cc += 1;
+     break;
+     CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
+     if (PRIVATE_DATA(cc))
+       private_data_length += 2;
+     cc += 1 + IMM2_SIZE;
+     break;
+     case OP_CLASS:
+     case OP_NCLASS:
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+     case OP_XCLASS:
+     size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
+ #else
+     size = 1 + 32 / (int)sizeof(pcre_uchar);
+ #endif
+     if (PRIVATE_DATA(cc))
+       private_data_length += get_class_iterator_size(cc + size);
+     cc += size;
+     break;
      default:
      cc = next_opcode(common, cc);
      SLJIT_ASSERT(cc != NULL);
-Line 907 
 while (cc < ccend)
+Line 1604 
 while (cc < ccend)
      }
    }
  SLJIT_ASSERT(cc == ccend);
- return localsize;
+ return private_data_length;
  }
- static void copy_locals(compiler_common *common, uschar *cc, uschar *ccend,
+ static void copy_private_data(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend,
-   BOOL save, int stackptr, int stacktop)
+   BOOL save, int stackptr, int stacktop, BOOL needs_control_head)
  {
  DEFINE_COMPILER;
  int srcw[2];
- int count;
+ int count, size;
  BOOL tmp1next = TRUE;
  BOOL tmp1empty = TRUE;
  BOOL tmp2empty = TRUE;
- uschar *alternative;
+ pcre_uchar *alternative;
  enum {
    start,
    loop,
-Line 932 
 stacktop = STACK(stacktop - 1);
+Line 1629 
 stacktop = STACK(stacktop - 1);
  if (!save)
    {
-   stackptr += sizeof(sljit_w);
+   stackptr += (needs_control_head ? 2 : 1) * sizeof(sljit_sw);
    if (stackptr < stacktop)
      {
      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-     stackptr += sizeof(sljit_w);
+     stackptr += sizeof(sljit_sw);
      tmp1empty = FALSE;
      }
    if (stackptr < stacktop)
      {
      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-     stackptr += sizeof(sljit_w);
+     stackptr += sizeof(sljit_sw);
      tmp2empty = FALSE;
      }
    /* The tmp1next must be TRUE in either way. */
    }
- while (status != end)
+ do
    {
    count = 0;
    switch(status)
      {
      case start:
-     SLJIT_ASSERT(save);
+     SLJIT_ASSERT(save && common->recursive_head_ptr != 0);
      count = 1;
-     srcw[0] = RECURSIVE_HEAD;
+     srcw[0] = common->recursive_head_ptr;
+     if (needs_control_head)
+       {
+       SLJIT_ASSERT(common->control_head_ptr != 0);
+       count = 2;
+       srcw[1] = common->control_head_ptr;
+       }
      status = loop;
      break;
-Line 969 
 while (status != end)
+Line 1672 
 while (status != end)
      switch(*cc)
        {
+       case OP_KET:
+       if (PRIVATE_DATA(cc) != 0)
+         {
+         count = 1;
+         srcw[0] = PRIVATE_DATA(cc);
+         }
+       cc += 1 + LINK_SIZE;
+       break;
        case OP_ASSERT:
        case OP_ASSERT_NOT:
        case OP_ASSERTBACK:
        case OP_ASSERTBACK_NOT:
        case OP_ONCE:
+       case OP_ONCE_NC:
        case OP_BRAPOS:
        case OP_SBRA:
        case OP_SBRAPOS:
        case OP_SCOND:
        count = 1;
-       srcw[0] = PRIV(cc);
+       srcw[0] = PRIVATE_DATA(cc);
        SLJIT_ASSERT(srcw[0] != 0);
        cc += 1 + LINK_SIZE;
        break;
        case OP_CBRA:
        case OP_SCBRA:
-       count = 1;
+       if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
-       srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
+         {
-       cc += 1 + LINK_SIZE + 2;
+         count = 1;
+         srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
+         }
+       cc += 1 + LINK_SIZE + IMM2_SIZE;
        break;
        case OP_CBRAPOS:
        case OP_SCBRAPOS:
        count = 2;
+       srcw[0] = PRIVATE_DATA(cc);
        srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
-       srcw[0] = PRIV(cc);
+       SLJIT_ASSERT(srcw[0] != 0 && srcw[1] != 0);
-       SLJIT_ASSERT(srcw[0] != 0);
+       cc += 1 + LINK_SIZE + IMM2_SIZE;
-       cc += 1 + LINK_SIZE + 2;
        break;
        case OP_COND:
-Line 1006 
 while (status != end)
+Line 1722 
 while (status != end)
        if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
          {
          count = 1;
-         srcw[0] = PRIV(cc);
+         srcw[0] = PRIVATE_DATA(cc);
          SLJIT_ASSERT(srcw[0] != 0);
          }
        cc += 1 + LINK_SIZE;
        break;
+       CASE_ITERATOR_PRIVATE_DATA_1
+       if (PRIVATE_DATA(cc))
+         {
+         count = 1;
+         srcw[0] = PRIVATE_DATA(cc);
+         }
+       cc += 2;
+ #ifdef SUPPORT_UTF
+       if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+       break;
+       CASE_ITERATOR_PRIVATE_DATA_2A
+       if (PRIVATE_DATA(cc))
+         {
+         count = 2;
+         srcw[0] = PRIVATE_DATA(cc);
+         srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
+         }
+       cc += 2;
+ #ifdef SUPPORT_UTF
+       if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+       break;
+       CASE_ITERATOR_PRIVATE_DATA_2B
+       if (PRIVATE_DATA(cc))
+         {
+         count = 2;
+         srcw[0] = PRIVATE_DATA(cc);
+         srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
+         }
+       cc += 2 + IMM2_SIZE;
+ #ifdef SUPPORT_UTF
+       if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
+ #endif
+       break;
+       CASE_ITERATOR_TYPE_PRIVATE_DATA_1
+       if (PRIVATE_DATA(cc))
+         {
+         count = 1;
+         srcw[0] = PRIVATE_DATA(cc);
+         }
+       cc += 1;
+       break;
+       CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
+       if (PRIVATE_DATA(cc))
+         {
+         count = 2;
+         srcw[0] = PRIVATE_DATA(cc);
+         srcw[1] = srcw[0] + sizeof(sljit_sw);
+         }
+       cc += 1;
+       break;
+       CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
+       if (PRIVATE_DATA(cc))
+         {
+         count = 2;
+         srcw[0] = PRIVATE_DATA(cc);
+         srcw[1] = srcw[0] + sizeof(sljit_sw);
+         }
+       cc += 1 + IMM2_SIZE;
+       break;
+       case OP_CLASS:
+       case OP_NCLASS:
+ #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
+       case OP_XCLASS:
+       size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
+ #else
+       size = 1 + 32 / (int)sizeof(pcre_uchar);
+ #endif
+       if (PRIVATE_DATA(cc))
+         switch(get_class_iterator_size(cc + size))
+           {
+           case 1:
+           count = 1;
+           srcw[0] = PRIVATE_DATA(cc);
+           break;
+           case 2:
+           count = 2;
+           srcw[0] = PRIVATE_DATA(cc);
+           srcw[1] = srcw[0] + sizeof(sljit_sw);
+           break;
+           default:
+           SLJIT_ASSERT_STOP();
+           break;
+           }
+       cc += size;
+       break;
        default:
        cc = next_opcode(common, cc);
        SLJIT_ASSERT(cc != NULL);
-Line 1034 
 while (status != end)
+Line 1846 
 while (status != end)
          if (!tmp1empty)
            {
            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-           stackptr += sizeof(sljit_w);
+           stackptr += sizeof(sljit_sw);
            }
          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);
          tmp1empty = FALSE;
-Line 1045 
 while (status != end)
+Line 1857 
 while (status != end)
          if (!tmp2empty)
            {
            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-           stackptr += sizeof(sljit_w);
+           stackptr += sizeof(sljit_sw);
            }
          OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);
          tmp2empty = FALSE;
-Line 1062 
 while (status != end)
+Line 1874 
 while (status != end)
          if (!tmp1empty)
            {
            OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-           stackptr += sizeof(sljit_w);
+           stackptr += sizeof(sljit_sw);
            }
          tmp1next = FALSE;
          }
-Line 1074 
 while (status != end)
+Line 1886 
 while (status != end)
          if (!tmp2empty)
            {
            OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
-           stackptr += sizeof(sljit_w);
+           stackptr += sizeof(sljit_sw);
            }
          tmp1next = TRUE;
          }
        }
      }
    }
+ while (status != end);
  if (save)
    {
-Line 1089 
 if (save)
+Line 1902 
 if (save)
      if (!tmp1empty)
        {
        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-       stackptr += sizeof(sljit_w);
+       stackptr += sizeof(sljit_sw);
        }
      if (!tmp2empty)
        {
        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-       stackptr += sizeof(sljit_w);
+       stackptr += sizeof(sljit_sw);
        }
      }
    else
-Line 1102 
 if (save)
+Line 1915 
 if (save)
      if (!tmp2empty)
        {
        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
-       stackptr += sizeof(sljit_w);
+       stackptr += sizeof(sljit_sw);
        }
      if (!tmp1empty)
        {
        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
-       stackptr += sizeof(sljit_w);
+       stackptr += sizeof(sljit_sw);
        }
      }
    }
  SLJIT_ASSERT(cc == ccend && stackptr == stacktop && (save || (tmp1empty && tmp2empty)));
  }
- static SLJIT_INLINE BOOL ispowerof2(unsigned int value)
+ static SLJIT_INLINE pcre_uchar *set_then_offsets(compiler_common *common, pcre_uchar *cc, pcre_uint8 *current_offset)
+ {
+ pcre_uchar *end = bracketend(cc);
+ BOOL has_alternatives = cc[GET(cc, 1)] == OP_ALT;
+ /* Assert captures then. */
+ if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT)
+   current_offset = NULL;
+ /* Conditional block does not. */
+ if (*cc == OP_COND || *cc == OP_SCOND)
+   has_alternatives = FALSE;
+ cc = next_opcode(common, cc);
+ if (has_alternatives)
+   current_offset = common->then_offsets + (cc - common->start);
+ while (cc < end)
+   {
+   if ((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND))
+     cc = set_then_offsets(common, cc, current_offset);
+   else
+     {
+     if (*cc == OP_ALT && has_alternatives)
+       current_offset = common->then_offsets + (cc + 1 + LINK_SIZE - common->start);
+     if (*cc >= OP_THEN && *cc <= OP_THEN_ARG && current_offset != NULL)
+       *current_offset = 1;
+     cc = next_opcode(common, cc);
+     }
+   }
+ return end;
+ }
+ #undef CASE_ITERATOR_PRIVATE_DATA_1
+ #undef CASE_ITERATOR_PRIVATE_DATA_2A
+ #undef CASE_ITERATOR_PRIVATE_DATA_2B
+ #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_1
+ #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
+ #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
+ static SLJIT_INLINE BOOL is_powerof2(unsigned int value)
  {
  return (value & (value - 1)) == 0;
  }
-Line 1124 
 static SLJIT_INLINE void set_jumps(jump_
+Line 1977 
 static SLJIT_INLINE void set_jumps(jump_
  while (list)
    {
    /* sljit_set_label is clever enough to do nothing
-   if either the jump or the label is NULL */
+   if either the jump or the label is NULL. */
-   sljit_set_label(list->jump, label);
+   SET_LABEL(list->jump, label);
    list = list->next;
    }
  }
-Line 1141 
 if (list_item)
+Line 1994 
 if (list_item)
    }
  }
- static void add_stub(compiler_common *common, enum stub_types type, int data, struct sljit_jump *start)
+ static void add_stub(compiler_common *common, struct sljit_jump *start)
  {
  DEFINE_COMPILER;
  stub_list* list_item = sljit_alloc_memory(compiler, sizeof(stub_list));
  if (list_item)
    {
-   list_item->type = type;
-   list_item->data = data;
    list_item->start = start;
-   list_item->leave = LABEL();
+   list_item->quit = LABEL();
    list_item->next = common->stubs;
    common->stubs = list_item;
    }
-Line 1165 
 stub_list* list_item = common->stubs;
+Line 2016 
 stub_list* list_item = common->stubs;
  while (list_item)
    {
    JUMPHERE(list_item->start);
-   switch(list_item->type)
+   add_jump(compiler, &common->stackalloc, JUMP(SLJIT_FAST_CALL));
-     {
+   JUMPTO(SLJIT_JUMP, list_item->quit);
-     case stack_alloc:
-     add_jump(compiler, &common->stackalloc, JUMP(SLJIT_FAST_CALL));
-     break;
-     case max_index:
-     OP1(SLJIT_MOV, MAX_INDEX, 0, SLJIT_IMM, list_item->data);
-     break;
-     }
-   JUMPTO(SLJIT_JUMP, list_item->leave);
    list_item = list_item->next;
    }
  common->stubs = NULL;
  }
- static SLJIT_INLINE void decrease_call_count(compiler_common *common)
+ static SLJIT_INLINE void count_match(compiler_common *common)
  {
  DEFINE_COMPILER;
- OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_LOCALS_REG), CALL_COUNT, SLJIT_MEM1(SLJIT_LOCALS_REG), CALL_COUNT, SLJIT_IMM, 1);
+ OP2(SLJIT_SUB | SLJIT_SET_E, COUNT_MATCH, 0, COUNT_MATCH, 0, SLJIT_IMM, 1);
  add_jump(compiler, &common->calllimit, JUMP(SLJIT_C_ZERO));
  }
-Line 1194 
 static SLJIT_INLINE void allocate_stack(
+Line 2036 
 static SLJIT_INLINE void allocate_stack(
  /* May destroy all locals and registers except TMP2. */
  DEFINE_COMPILER;
- OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_w));
+ OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_sw));
  #ifdef DESTROY_REGISTERS
  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 12345);
  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
-Line 1202 
 OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
+Line 2044 
 OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, TMP1, 0);
  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, TMP1, 0);
  #endif
- add_stub(common, stack_alloc, 0, CMP(SLJIT_C_GREATER, STACK_TOP, 0, STACK_LIMIT, 0));
+ add_stub(common, CMP(SLJIT_C_GREATER, STACK_TOP, 0, STACK_LIMIT, 0));
  }
  static SLJIT_INLINE void free_stack(compiler_common *common, int size)
  {
  DEFINE_COMPILER;
- OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_w));
+ OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * sizeof(sljit_sw));
  }
  static SLJIT_INLINE void reset_ovector(compiler_common *common, int length)
-Line 1216 
 static SLJIT_INLINE void reset_ovector(c
+Line 2058 
 static SLJIT_INLINE void reset_ovector(c
  DEFINE_COMPILER;
  struct sljit_label *loop;
  int i;
  /* At this point we can freely use all temporary registers. */
+ SLJIT_ASSERT(length > 1);
  /* TMP1 returns with begin - 1. */
- OP1(SLJIT_MOV, MAX_INDEX, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_SUB, SLJIT_SCRATCH_REG1, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), SLJIT_OFFSETOF(jit_arguments, begin), SLJIT_IMM, IN_UCHARS(1));
- OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG1, 0, SLJIT_MEM1(SLJIT_GENERAL_REG1), SLJIT_OFFSETOF(jit_arguments, begin), SLJIT_IMM, 1);
+ if (length < 8)
+   {
+   for (i = 1; i < length; i++)
+     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(i), SLJIT_SCRATCH_REG1, 0);
+   }
+ else
+   {
+   GET_LOCAL_BASE(SLJIT_SCRATCH_REG2, 0, OVECTOR_START);
+   OP1(SLJIT_MOV, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, length - 1);
+   loop = LABEL();
+   OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_SCRATCH_REG2), sizeof(sljit_sw), SLJIT_SCRATCH_REG1, 0);
+   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, 1);
+   JUMPTO(SLJIT_C_NOT_ZERO, loop);
+   }
+ }
+ static SLJIT_INLINE void do_reset_match(compiler_common *common, int length)
+ {
+ DEFINE_COMPILER;
+ struct sljit_label *loop;
+ int i;
+ SLJIT_ASSERT(length > 1);
+ /* OVECTOR(1) contains the "string begin - 1" constant. */
+ if (length > 2)
+   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));
  if (length < 8)
    {
-   for (i = 0; i < length; i++)
+   for (i = 2; i < length; i++)
-     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(i), SLJIT_TEMPORARY_REG1, 0);
+     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(i), TMP1, 0);
    }
  else
    {
-   OP2(SLJIT_ADD, SLJIT_TEMPORARY_REG2, 0, SLJIT_LOCALS_REG, 0, SLJIT_IMM, OVECTOR_START - sizeof(sljit_w));
+   GET_LOCAL_BASE(TMP2, 0, OVECTOR_START + sizeof(sljit_sw));
-   OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, length);
+   OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, length - 2);
    loop = LABEL();
-   OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), sizeof(sljit_w), SLJIT_TEMPORARY_REG1, 0);
+   OP1(SLJIT_MOVU, SLJIT_MEM1(TMP2), sizeof(sljit_sw), TMP1, 0);
-   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_TEMPORARY_REG3, 0, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_SUB | SLJIT_SET_E, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 1);
    JUMPTO(SLJIT_C_NOT_ZERO, loop);
    }
+ OP1(SLJIT_MOV, STACK_TOP, 0, ARGUMENTS, 0);
+ if (common->mark_ptr != 0)
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr, SLJIT_IMM, 0);
+ if (common->control_head_ptr != 0)
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->control_head_ptr, SLJIT_IMM, 0);
+ OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(jit_arguments, stack));
+ OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_ptr);
+ OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), SLJIT_OFFSETOF(struct sljit_stack, base));
+ }
+ static sljit_sw SLJIT_CALL do_search_mark(sljit_sw *current, const pcre_uchar *skip_arg)
+ {
+ while (current != NULL)
+   {
+   switch (current[-2])
+     {
+     case type_then_trap:
+     break;
+     case type_mark:
+     if (STRCMP_UC_UC(skip_arg, (pcre_uchar *)current[-3]) == 0)
+       return current[-4];
+     break;
+     default:
+     SLJIT_ASSERT_STOP();
+     break;
+     }
+   current = (sljit_sw*)current[-1];
+   }
+ return -1;
  }
- static SLJIT_INLINE void copy_ovector(compiler_common *common)
+ static SLJIT_INLINE void copy_ovector(compiler_common *common, int topbracket)
  {
  DEFINE_COMPILER;
  struct sljit_label *loop;
- struct sljit_jump *earlyexit;
+ struct sljit_jump *early_quit;
  /* At this point we can freely use all registers. */
- OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG1, 0, ARGUMENTS, 0);
+ OP1(SLJIT_MOV, SLJIT_SAVED_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));
- OP1(SLJIT_MOV_SI, SLJIT_TEMPORARY_REG2, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, offsetcount));
+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1), STR_PTR, 0);
- OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));
- OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG1, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, begin));
+ OP1(SLJIT_MOV, SLJIT_SCRATCH_REG1, 0, ARGUMENTS, 0);
- OP2(SLJIT_ADD, SLJIT_GENERAL_REG1, 0, SLJIT_LOCALS_REG, 0, SLJIT_IMM, OVECTOR_START);
+ if (common->mark_ptr != 0)
+   OP1(SLJIT_MOV, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
+ OP1(SLJIT_MOV_SI, SLJIT_SCRATCH_REG2, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, offset_count));
+ if (common->mark_ptr != 0)
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_SCRATCH_REG3, 0);
+ OP2(SLJIT_SUB, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));
+ OP1(SLJIT_MOV, SLJIT_SCRATCH_REG1, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, begin));
+ GET_LOCAL_BASE(SLJIT_SAVED_REG1, 0, OVECTOR_START);
  /* Unlikely, but possible */
- earlyexit = CMP(SLJIT_C_EQUAL, SLJIT_TEMPORARY_REG2, 0, SLJIT_IMM, 0);
+ early_quit = CMP(SLJIT_C_EQUAL, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, 0);
  loop = LABEL();
- OP2(SLJIT_SUB, SLJIT_GENERAL_REG2, 0, SLJIT_MEM1(SLJIT_GENERAL_REG1), 0, SLJIT_TEMPORARY_REG1, 0);
+ OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), 0, SLJIT_SCRATCH_REG1, 0);
- OP2(SLJIT_ADD, SLJIT_GENERAL_REG1, 0, SLJIT_GENERAL_REG1, 0, SLJIT_IMM, sizeof(sljit_w));
+ OP2(SLJIT_ADD, SLJIT_SAVED_REG1, 0, SLJIT_SAVED_REG1, 0, SLJIT_IMM, sizeof(sljit_sw));
  /* Copy the integer value to the output buffer */
- OP1(SLJIT_MOVU_SI, SLJIT_MEM1(SLJIT_TEMPORARY_REG3), sizeof(int), SLJIT_GENERAL_REG2, 0);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
- OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_TEMPORARY_REG2, 0, SLJIT_TEMPORARY_REG2, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
+ OP1(SLJIT_MOVU_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG3), sizeof(int), SLJIT_SAVED_REG2, 0);
+ OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_SCRATCH_REG2, 0, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, 1);
  JUMPTO(SLJIT_C_NOT_ZERO, loop);
- JUMPHERE(earlyexit);
+ JUMPHERE(early_quit);
+ /* Calculate the return value, which is the maximum ovector value. */
+ if (topbracket > 1)
+   {
+   GET_LOCAL_BASE(SLJIT_SCRATCH_REG1, 0, OVECTOR_START + topbracket * 2 * sizeof(sljit_sw));
+   OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, topbracket + 1);
+   /* OVECTOR(0) is never equal to SLJIT_SAVED_REG3. */
+   loop = LABEL();
+   OP1(SLJIT_MOVU, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), -(2 * (sljit_sw)sizeof(sljit_sw)));
+   OP2(SLJIT_SUB, SLJIT_SCRATCH_REG2, 0, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, 1);
+   CMPTO(SLJIT_C_EQUAL, SLJIT_SCRATCH_REG3, 0, SLJIT_SAVED_REG3, 0, loop);
+   OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_SCRATCH_REG2, 0);
+   }
+ else
+   OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
+ }
+ static SLJIT_INLINE void return_with_partial_match(compiler_common *common, struct sljit_label *quit)
+ {
+ DEFINE_COMPILER;
+ struct sljit_jump *jump;
+ SLJIT_COMPILE_ASSERT(STR_END == SLJIT_SAVED_REG2, str_end_must_be_saved_reg2);
+ SLJIT_ASSERT(common->start_used_ptr != 0 && common->start_ptr != 0
+   && (common->mode == JIT_PARTIAL_SOFT_COMPILE ? common->hit_start != 0 : common->hit_start == 0));
+ OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, ARGUMENTS, 0);
+ OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_PARTIAL);
+ OP1(SLJIT_MOV_SI, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, real_offset_count));
+ CMPTO(SLJIT_C_SIG_LESS, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, 2, quit);
+ /* Store match begin and end. */
+ OP1(SLJIT_MOV, SLJIT_SAVED_REG1, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, begin));
+ OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, offsets));
+ jump = CMP(SLJIT_C_SIG_LESS, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, 3);
+ OP2(SLJIT_SUB, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_ptr : (common->hit_start + (int)sizeof(sljit_sw)), SLJIT_SAVED_REG1, 0);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ OP2(SLJIT_ASHR, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
+ OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG2), 2 * sizeof(int), SLJIT_SCRATCH_REG3, 0);
+ JUMPHERE(jump);
+ OP1(SLJIT_MOV, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_used_ptr : common->hit_start);
+ OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, STR_END, 0, SLJIT_SAVED_REG1, 0);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
+ OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG2), sizeof(int), SLJIT_SAVED_REG2, 0);
+ OP2(SLJIT_SUB, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_SAVED_REG1, 0);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ OP2(SLJIT_ASHR, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
+ OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG2), 0, SLJIT_SCRATCH_REG3, 0);
+ JUMPTO(SLJIT_JUMP, quit);
+ }
+ static SLJIT_INLINE void check_start_used_ptr(compiler_common *common)
+ {
+ /* May destroy TMP1. */
+ DEFINE_COMPILER;
+ struct sljit_jump *jump;
+ if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+   {
+   /* The value of -1 must be kept for start_used_ptr! */
+   OP2(SLJIT_ADD, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, SLJIT_IMM, 1);
+   /* Jumps if start_used_ptr < STR_PTR, or start_used_ptr == -1. Although overwriting
+   is not necessary if start_used_ptr == STR_PTR, it does not hurt as well. */
+   jump = CMP(SLJIT_C_LESS_EQUAL, TMP1, 0, STR_PTR, 0);
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);
+   JUMPHERE(jump);
+   }
+ else if (common->mode == JIT_PARTIAL_HARD_COMPILE)
+   {
+   jump = CMP(SLJIT_C_LESS_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);
+   JUMPHERE(jump);
+   }
  }
- static SLJIT_INLINE BOOL char_has_othercase(compiler_common *common, uschar* cc)
+ static SLJIT_INLINE BOOL char_has_othercase(compiler_common *common, pcre_uchar* cc)
  {
  /* Detects if the character has an othercase. */
  unsigned int c;
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8)
+ if (common->utf)
    {
    GETCHAR(c, cc);
    if (c > 127)
-Line 1277 
 if (common->utf8)
+Line 2270 
 if (common->utf8)
      return FALSE;
  #endif
      }
+ #ifndef COMPILE_PCRE8
+   return common->fcc[c] != c;
+ #endif
    }
  else
  #endif
    c = *cc;
- return common->fcc[c] != c;
+ return MAX_255(c) ? common->fcc[c] != c : FALSE;
  }
  static SLJIT_INLINE unsigned int char_othercase(compiler_common *common, unsigned int c)
  {
  /* Returns with the othercase. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8 && c > 127)
+ if (common->utf && c > 127)
    {
  #ifdef SUPPORT_UCP
    return UCD_OTHERCASE(c);
-Line 1297 
 if (common->utf8 && c > 127)
+Line 2293 
 if (common->utf8 && c > 127)
  #endif
    }
  #endif
- return common->fcc[c];
+ return TABLE_GET(c, common->fcc, c);
  }
- static unsigned int char_get_othercase_bit(compiler_common *common, uschar* cc)
+ static unsigned int char_get_othercase_bit(compiler_common *common, pcre_uchar* cc)
  {
  /* Detects if the character and its othercase has only 1 bit difference. */
  unsigned int c, oc, bit;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && defined COMPILE_PCRE8
  int n;
  #endif
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8)
+ if (common->utf)
    {
    GETCHAR(c, cc);
    if (c <= 127)
-Line 1326 
 if (common->utf8)
+Line 2322 
 if (common->utf8)
  else
    {
    c = *cc;
-   oc = common->fcc[c];
+   oc = TABLE_GET(c, common->fcc, c);
    }
  #else
  c = *cc;
- oc = common->fcc[c];
+ oc = TABLE_GET(c, common->fcc, c);
  #endif
  SLJIT_ASSERT(c != oc);
-Line 1341 
 if (c <= 127 && bit == 0x20)
+Line 2337 
 if (c <= 127 && bit == 0x20)
    return (0 << 8) | 0x20;
  /* Since c != oc, they must have at least 1 bit difference. */
- if (!ispowerof2(bit))
+ if (!is_powerof2(bit))
    return 0;
- #ifdef SUPPORT_UTF8
+ #if defined COMPILE_PCRE8
- if (common->utf8 && c > 127)
+ #ifdef SUPPORT_UTF
+ if (common->utf && c > 127)
    {
-   n = _pcre_utf8_table4[*cc & 0x3f];
+   n = GET_EXTRALEN(*cc);
    while ((bit & 0x3f) == 0)
      {
      n--;
-Line 1355 
 if (common->utf8 && c > 127)
+Line 2353 
 if (common->utf8 && c > 127)
      }
    return (n << 8) | bit;
    }
- #endif
+ #endif /* SUPPORT_UTF */
  return (0 << 8) | bit;
+ #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ #ifdef SUPPORT_UTF
+ if (common->utf && c > 65535)
+   {
+   if (bit >= (1 << 10))
+     bit >>= 10;
+   else
+     return (bit < 256) ? ((2 << 8) | bit) : ((3 << 8) | (bit >> 8));
+   }
+ #endif /* SUPPORT_UTF */
+ return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));
+ #endif /* COMPILE_PCRE[8|16|32] */
+ }
+ static void check_partial(compiler_common *common, BOOL force)
+ {
+ /* Checks whether a partial matching is occured. Does not modify registers. */
+ DEFINE_COMPILER;
+ struct sljit_jump *jump = NULL;
+ SLJIT_ASSERT(!force || common->mode != JIT_COMPILE);
+ if (common->mode == JIT_COMPILE)
+   return;
+ if (!force)
+   jump = CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);
+ else if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+   jump = CMP(SLJIT_C_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, SLJIT_IMM, -1);
+ if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->hit_start, SLJIT_IMM, 0);
+ else
+   {
+   if (common->partialmatchlabel != NULL)
+     JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
+   else
+     add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
+   }
+ if (jump != NULL)
+   JUMPHERE(jump);
+ }
+ static void check_str_end(compiler_common *common, jump_list **end_reached)
+ {
+ /* Does not affect registers. Usually used in a tight spot. */
+ DEFINE_COMPILER;
+ struct sljit_jump *jump;
+ if (common->mode == JIT_COMPILE)
+   {
+   add_jump(compiler, end_reached, CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+   return;
+   }
+ jump = CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0);
+ if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+   {
+   add_jump(compiler, end_reached, CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0));
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->hit_start, SLJIT_IMM, 0);
+   add_jump(compiler, end_reached, JUMP(SLJIT_JUMP));
+   }
+ else
+   {
+   add_jump(compiler, end_reached, CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0));
+   if (common->partialmatchlabel != NULL)
+     JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
+   else
+     add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
+   }
+ JUMPHERE(jump);
  }
- static SLJIT_INLINE void check_input_end(compiler_common *common, jump_list **fallbacks)
+ static void detect_partial_match(compiler_common *common, jump_list **backtracks)
  {
  DEFINE_COMPILER;
- add_jump(compiler, fallbacks, CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+ struct sljit_jump *jump;
+ if (common->mode == JIT_COMPILE)
+   {
+   add_jump(compiler, backtracks, CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+   return;
+   }
+ /* Partial matching mode. */
+ jump = CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0);
+ add_jump(compiler, backtracks, CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0));
+ if (common->mode == JIT_PARTIAL_SOFT_COMPILE)
+   {
+   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->hit_start, SLJIT_IMM, 0);
+   add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
+   }
+ else
+   {
+   if (common->partialmatchlabel != NULL)
+     JUMPTO(SLJIT_JUMP, common->partialmatchlabel);
+   else
+     add_jump(compiler, &common->partialmatch, JUMP(SLJIT_JUMP));
+   }
+ JUMPHERE(jump);
  }
  static void read_char(compiler_common *common)
-Line 1370 
 static void read_char(compiler_common *c
+Line 2466 
 static void read_char(compiler_common *c
  /* Reads the character into TMP1, updates STR_PTR.
  Does not check STR_END. TMP2 Destroyed. */
  DEFINE_COMPILER;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
  struct sljit_jump *jump;
  #endif
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
- if (common->utf8)
+ if (common->utf)
    {
-   /* Should not found a value between 128 and 192 here. */
+ #if defined COMPILE_PCRE8
-   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 192);
+   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-   add_jump(compiler, &common->utf8readchar, JUMP(SLJIT_FAST_CALL));
+ #elif defined COMPILE_PCRE16
+   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
+ #endif /* COMPILE_PCRE[8|16] */
+   add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
    JUMPHERE(jump);
    }
- #endif
+ #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
  }
  static void peek_char(compiler_common *common)
-Line 1392 
 static void peek_char(compiler_common *c
+Line 2491 
 static void peek_char(compiler_common *c
  /* Reads the character into TMP1, keeps STR_PTR.
  Does not check STR_END. TMP2 Destroyed. */
  DEFINE_COMPILER;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
  struct sljit_jump *jump;
  #endif
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
- if (common->utf8)
+ if (common->utf)
    {
-   /* Should not found a value between 128 and 192 here. */
+ #if defined COMPILE_PCRE8
-   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 192);
+   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-   add_jump(compiler, &common->utf8readchar, JUMP(SLJIT_FAST_CALL));
+ #elif defined COMPILE_PCRE16
+   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
+ #endif /* COMPILE_PCRE[8|16] */
+   add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
    JUMPHERE(jump);
    }
- #endif
+ #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
  }
  static void read_char8_type(compiler_common *common)
  {
  /* Reads the character type into TMP1, updates STR_PTR. Does not check STR_END. */
  DEFINE_COMPILER;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
  struct sljit_jump *jump;
  #endif
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8)
+ if (common->utf)
    {
-   OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
+   OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ #if defined COMPILE_PCRE8
    /* This can be an extra read in some situations, but hopefully
-   it is a clever early read in most cases. */
+   it is needed in most cases. */
+   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
+   jump = CMP(SLJIT_C_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
+   add_jump(compiler, &common->utfreadtype8, JUMP(SLJIT_FAST_CALL));
+   JUMPHERE(jump);
+ #elif defined COMPILE_PCRE16
+   OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+   jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
-   /* Should not found a value between 128 and 192 here. */
-   jump = CMP(SLJIT_C_LESS, TMP2, 0, SLJIT_IMM, 192);
-   add_jump(compiler, &common->utf8readtype8, JUMP(SLJIT_FAST_CALL));
    JUMPHERE(jump);
+   /* Skip low surrogate if necessary. */
+   OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xfc00);
+   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0xd800);
+   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+   OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
+ #elif defined COMPILE_PCRE32
+   OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+   jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
+   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
+   JUMPHERE(jump);
+ #endif /* COMPILE_PCRE[8|16|32] */
    return;
    }
+ #endif /* SUPPORT_UTF */
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ /* The ctypes array contains only 256 values. */
+ OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
+ jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
+ #endif
+ OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+ JUMPHERE(jump);
  #endif
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), common->ctypes);
  }
  static void skip_char_back(compiler_common *common)
  {
- /* Goes one character back. Only affects STR_PTR. Does not check begin. */
+ /* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */
  DEFINE_COMPILER;
- #ifdef SUPPORT_UTF8
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+ #if defined COMPILE_PCRE8
  struct sljit_label *label;
- if (common->utf8)
+ if (common->utf)
    {
    label = LABEL();
-   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xc0);
    CMPTO(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, label);
    return;
    }
- #endif
+ #elif defined COMPILE_PCRE16
- OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+ if (common->utf)
+   {
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
+   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+   /* Skip low surrogate if necessary. */
+   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
+   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
+   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+   return;
+   }
+ #endif /* COMPILE_PCRE[8|16] */
+ #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
+ OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
  }
- static void check_newlinechar(compiler_common *common, int nltype, jump_list **fallbacks, BOOL jumpiftrue)
+ static void check_newlinechar(compiler_common *common, int nltype, jump_list **backtracks, BOOL jumpiftrue)
  {
  /* Character comes in TMP1. Checks if it is a newline. TMP2 may be destroyed. */
  DEFINE_COMPILER;
-Line 1465 
 DEFINE_COMPILER;
+Line 2607 
 DEFINE_COMPILER;
  if (nltype == NLTYPE_ANY)
    {
    add_jump(compiler, &common->anynewline, JUMP(SLJIT_FAST_CALL));
-   add_jump(compiler, fallbacks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));
+   add_jump(compiler, backtracks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));
    }
  else if (nltype == NLTYPE_ANYCRLF)
    {
    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_CR);
-   COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);
+   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
-   COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_EQUAL);
+   OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
-   add_jump(compiler, fallbacks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));
+   add_jump(compiler, backtracks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));
    }
  else
    {
-   SLJIT_ASSERT(nltype == NLTYPE_FIXED && common->newline <= 255);
+   SLJIT_ASSERT(nltype == NLTYPE_FIXED && common->newline < 256);
-   add_jump(compiler, fallbacks, CMP(jumpiftrue ? SLJIT_C_EQUAL : SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline));
+   add_jump(compiler, backtracks, CMP(jumpiftrue ? SLJIT_C_EQUAL : SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline));
    }
  }
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- static void do_utf8readchar(compiler_common *common)
+ #if defined COMPILE_PCRE8
+ static void do_utfreadchar(compiler_common *common)
  {
- /* Fast decoding an utf8 character. TMP1 contains the first byte
+ /* Fast decoding a UTF-8 character. TMP1 contains the first byte
- of the character (>= 192). Return char value in TMP1, length - 1 in TMP2. */
+ of the character (>= 0xc0). Return char value in TMP1, length - 1 in TMP2. */
  DEFINE_COMPILER;
  struct sljit_jump *jump;
- sljit_emit_fast_enter(compiler, RETURN_ADDR, 0, 1, 5, 5, common->localsize);
+ sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
  /* Searching for the first zero. */
  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x20);
  jump = JUMP(SLJIT_C_NOT_ZERO);
- /* 2 byte sequence */
+ /* Two byte sequence. */
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 1);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1f);
  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 6);
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  JUMPHERE(jump);
  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x10);
  jump = JUMP(SLJIT_C_NOT_ZERO);
- /* 3 byte sequence */
+ /* Three byte sequence. */
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 1);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0f);
  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 12);
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 2);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 2);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(2));
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 2);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(2));
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  JUMPHERE(jump);
- OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x08);
+ /* Four byte sequence. */
- jump = JUMP(SLJIT_C_NOT_ZERO);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
- /* 4 byte sequence */
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 1);
  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x07);
  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 18);
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 12);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 2);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(2));
- OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
- OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
- OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 3);
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 3);
- OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
- OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 3);
- sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
- JUMPHERE(jump);
- /* 5 byte sequence */
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 1);
- OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x03);
- OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 24);
- OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
- OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 18);
- OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 2);
- OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
- OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 12);
- OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 3);
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 4);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(3));
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 4);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(3));
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3f);
  OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 4);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(3));
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  }
- static void do_utf8readtype8(compiler_common *common)
+ static void do_utfreadtype8(compiler_common *common)
  {
- /* Fast decoding an utf8 character type. TMP2 contains the first byte
+ /* Fast decoding a UTF-8 character type. TMP2 contains the first byte
- of the character (>= 192) and TMP1 is destroyed. Return value in TMP1. */
+ of the character (>= 0xc0). Return value in TMP1. */
  DEFINE_COMPILER;
  struct sljit_jump *jump;
  struct sljit_jump *compare;
- sljit_emit_fast_enter(compiler, RETURN_ADDR, 0, 1, 5, 5, common->localsize);
+ sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0x20);
  jump = JUMP(SLJIT_C_NOT_ZERO);
- /* 2 byte sequence */
+ /* Two byte sequence. */
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
  OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x1f);
  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 6);
  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3f);
-Line 1595 
 sljit_emit_fast_return(compiler, RETURN_
+Line 2714 
 sljit_emit_fast_return(compiler, RETURN_
  JUMPHERE(jump);
  /* We only have types for characters less than 256. */
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_w)_pcre_utf8_char_sizes);
+ OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
- OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  }
- #endif
+ #elif defined COMPILE_PCRE16
+ static void do_utfreadchar(compiler_common *common)
+ {
+ /* Fast decoding a UTF-16 character. TMP1 contains the first 16 bit char
+ of the character (>= 0xd800). Return char value in TMP1, length - 1 in TMP2. */
+ DEFINE_COMPILER;
+ struct sljit_jump *jump;
+ sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
+ jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xdc00);
+ /* Do nothing, only return. */
+ sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+ JUMPHERE(jump);
+ /* Combine two 16 bit characters. */
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x3ff);
+ OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 10);
+ OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0x3ff);
+ OP2(SLJIT_OR, TMP1, 0, TMP1, 0, TMP2, 0);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
+ OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
+ sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
+ }
+ #endif /* COMPILE_PCRE[8|16] */
+ #endif /* SUPPORT_UTF */
  #ifdef SUPPORT_UCP
-Line 1618 
 DEFINE_COMPILER;
+Line 2765 
 DEFINE_COMPILER;
  SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 8);
- sljit_emit_fast_enter(compiler, RETURN_ADDR, 0, 1, 5, 5, common->localsize);
+ sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
  OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_w)_pcre_ucd_stage1);
+ OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_w)_pcre_ucd_stage2);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
  OP1(SLJIT_MOV_UH, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
- OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_w)_pcre_ucd_records + SLJIT_OFFSETOF(ucd_record, chartype));
+ OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  }
-Line 1640 
 struct sljit_label *newlinelabel = NULL;
+Line 2787 
 struct sljit_label *newlinelabel = NULL;
  struct sljit_jump *start;
  struct sljit_jump *end = NULL;
  struct sljit_jump *nl = NULL;
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+ struct sljit_jump *singlechar;
+ #endif
  jump_list *newline = NULL;
  BOOL newlinecheck = FALSE;
- BOOL readbyte = FALSE;
+ BOOL readuchar = FALSE;
  if (!(hascrorlf || firstline) && (common->nltype == NLTYPE_ANY ||
      common->nltype == NLTYPE_ANYCRLF || common->newline > 255))
-Line 1651 
 if (!(hascrorlf || firstline) && (common
+Line 2801 
 if (!(hascrorlf || firstline) && (common
  if (firstline)
    {
    /* Search for the end of the first line. */
-   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STR_PTR, 0);
+   SLJIT_ASSERT(common->first_line_end != 0);
-   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END, STR_END, 0);
+   OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
    if (common->nltype == NLTYPE_FIXED && common->newline > 255)
      {
      mainloop = LABEL();
-     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+     OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
      end = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-     OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), -1);
+     OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-     OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
+     OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
      CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, mainloop);
      CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, mainloop);
-     OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END, STR_PTR, 0, SLJIT_IMM, 1);
+     JUMPHERE(end);
+     OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
      }
    else
      {
      end = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
      mainloop = LABEL();
      /* Continual stores does not cause data dependency. */
-     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END, STR_PTR, 0);
+     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0);
      read_char(common);
      check_newlinechar(common, common->nltype, &newline, TRUE);
      CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, mainloop);
-     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END, STR_PTR, 0);
+     JUMPHERE(end);
+     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0);
      set_jumps(newline, LABEL());
      }
-   JUMPHERE(end);
+   OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-   OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
    }
  start = JUMP(SLJIT_JUMP);
-Line 1687 
 start = JUMP(SLJIT_JUMP);
+Line 2838 
 start = JUMP(SLJIT_JUMP);
  if (newlinecheck)
    {
    newlinelabel = LABEL();
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
    end = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, common->newline & 0xff);
-   COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);
+   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
    nl = JUMP(SLJIT_JUMP);
    }
-Line 1699 
 if (newlinecheck)
+Line 2853 
 if (newlinecheck)
  mainloop = LABEL();
  /* Increasing the STR_PTR here requires one less jump in the most common case. */
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8) readbyte = TRUE;
+ if (common->utf) readuchar = TRUE;
  #endif
- if (newlinecheck) readbyte = TRUE;
+ if (newlinecheck) readuchar = TRUE;
- if (readbyte)
+ if (readuchar)
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
  if (newlinecheck)
    CMPTO(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, newlinelabel);
- #ifdef SUPPORT_UTF8
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
- if (common->utf8)
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+ #if defined COMPILE_PCRE8
+ if (common->utf)
    {
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)_pcre_utf8_char_sizes);
+   singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
+   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+   JUMPHERE(singlechar);
    }
- else
+ #elif defined COMPILE_PCRE16
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+ if (common->utf)
- #else
+   {
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
- #endif
+   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
+   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+   JUMPHERE(singlechar);
+   }
+ #endif /* COMPILE_PCRE[8|16] */
+ #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
  JUMPHERE(start);
  if (newlinecheck)
-Line 1732 
 if (newlinecheck)
+Line 2898 
 if (newlinecheck)
  return mainloop;
  }
- static SLJIT_INLINE void fast_forward_first_byte(compiler_common *common, pcre_uint16 firstbyte, BOOL firstline)
+ #define MAX_N_CHARS 3
+ static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common, BOOL firstline)
+ {
+ DEFINE_COMPILER;
+ struct sljit_label *start;
+ struct sljit_jump *quit;
+ pcre_uint32 chars[MAX_N_CHARS * 2];
+ pcre_uchar *cc = common->start + 1 + LINK_SIZE;
+ int location = 0;
+ pcre_int32 len, c, bit, caseless;
+ int must_stop;
+ /* We do not support alternatives now. */
+ if (*(common->start + GET(common->start, 1)) == OP_ALT)
+   return FALSE;
+ while (TRUE)
+   {
+   caseless = 0;
+   must_stop = 1;
+   switch(*cc)
+     {
+     case OP_CHAR:
+     must_stop = 0;
+     cc++;
+     break;
+     case OP_CHARI:
+     caseless = 1;
+     must_stop = 0;
+     cc++;
+     break;
+     case OP_SOD:
+     case OP_SOM:
+     case OP_SET_SOM:
+     case OP_NOT_WORD_BOUNDARY:
+     case OP_WORD_BOUNDARY:
+     case OP_EODN:
+     case OP_EOD:
+     case OP_CIRC:
+     case OP_CIRCM:
+     case OP_DOLL:
+     case OP_DOLLM:
+     /* Zero width assertions. */
+     cc++;
+     continue;
+     case OP_PLUS:
+     case OP_MINPLUS:
+     case OP_POSPLUS:
+     cc++;
+     break;
+     case OP_EXACT:
+     cc += 1 + IMM2_SIZE;
+     break;
+     case OP_PLUSI:
+     case OP_MINPLUSI:
+     case OP_POSPLUSI:
+     caseless = 1;
+     cc++;
+     break;
+     case OP_EXACTI:
+     caseless = 1;
+     cc += 1 + IMM2_SIZE;
+     break;
+     default:
+     must_stop = 2;
+     break;
+     }
+   if (must_stop == 2)
+       break;
+   len = 1;
+ #ifdef SUPPORT_UTF
+   if (common->utf && HAS_EXTRALEN(cc[0])) len += GET_EXTRALEN(cc[0]);
+ #endif
+   if (caseless && char_has_othercase(common, cc))
+     {
+     caseless = char_get_othercase_bit(common, cc);
+     if (caseless == 0)
+       return FALSE;
+ #ifdef COMPILE_PCRE8
+     caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 8));
+ #else
+     if ((caseless & 0x100) != 0)
+       caseless = ((caseless & 0xff) << 16) | (len - (caseless >> 9));
+     else
+       caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 9));
+ #endif
+     }
+   else
+     caseless = 0;
+   while (len > 0 && location < MAX_N_CHARS * 2)
+     {
+     c = *cc;
+     bit = 0;
+     if (len == (caseless & 0xff))
+       {
+       bit = caseless >> 8;
+       c |= bit;
+       }
+     chars[location] = c;
+     chars[location + 1] = bit;
+     len--;
+     location += 2;
+     cc++;
+     }
+   if (location >= MAX_N_CHARS * 2 || must_stop != 0)
+     break;
+   }
+ /* At least two characters are required. */
+ if (location < 2 * 2)
+     return FALSE;
+ if (firstline)
+   {
+   SLJIT_ASSERT(common->first_line_end != 0);
+   OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
+   OP2(SLJIT_SUB, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, SLJIT_IMM, IN_UCHARS((location >> 1) - 1));
+   }
+ else
+   OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS((location >> 1) - 1));
+ start = LABEL();
+ quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ if (chars[1] != 0)
+   OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[1]);
+ CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[0], start);
+ if (location > 2 * 2)
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
+ if (chars[3] != 0)
+   OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, chars[3]);
+ CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, chars[2], start);
+ if (location > 2 * 2)
+   {
+   if (chars[5] != 0)
+     OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[5]);
+   CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[4], start);
+   }
+ OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ JUMPHERE(quit);
+ if (firstline)
+   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
+ else
+   OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS((location >> 1) - 1));
+ return TRUE;
+ }
+ #undef MAX_N_CHARS
+ static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, pcre_uchar first_char, BOOL caseless, BOOL firstline)
  {
  DEFINE_COMPILER;
  struct sljit_label *start;
- struct sljit_jump *leave;
+ struct sljit_jump *quit;
  struct sljit_jump *found;
- pcre_uint16 oc, bit;
+ pcre_uchar oc, bit;
  if (firstline)
    {
-   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);
+   SLJIT_ASSERT(common->first_line_end != 0);
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END);
+   OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
+   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
    }
  start = LABEL();
- leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+ quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
- if ((firstbyte & REQ_CASELESS) == 0)
+ oc = first_char;
-   found = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, firstbyte & 0xff);
+ if (caseless)
+   {
+   oc = TABLE_GET(first_char, common->fcc, first_char);
+ #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
+   if (first_char > 127 && common->utf)
+     oc = UCD_OTHERCASE(first_char);
+ #endif
+   }
+ if (first_char == oc)
+   found = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, first_char);
  else
    {
-   firstbyte &= 0xff;
+   bit = first_char ^ oc;
-   oc = common->fcc[firstbyte];
+   if (is_powerof2(bit))
-   bit = firstbyte ^ oc;
-   if (ispowerof2(bit))
      {
      OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, bit);
-     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, firstbyte | bit);
+     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, first_char | bit);
      }
    else
      {
-     OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, firstbyte);
+     OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, first_char);
-     COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);
+     OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, oc);
-     COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_EQUAL);
+     OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
      found = JUMP(SLJIT_C_NOT_ZERO);
      }
    }
- #ifdef SUPPORT_UTF8
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
- if (common->utf8)
-   {
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)_pcre_utf8_char_sizes);
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-   }
- else
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
- #else
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
- #endif
  JUMPTO(SLJIT_JUMP, start);
  JUMPHERE(found);
- JUMPHERE(leave);
+ JUMPHERE(quit);
  if (firstline)
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);
+   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
  }
  static SLJIT_INLINE void fast_forward_newline(compiler_common *common, BOOL firstline)
-Line 1797 
 DEFINE_COMPILER;
+Line 3130 
 DEFINE_COMPILER;
  struct sljit_label *loop;
  struct sljit_jump *lastchar;
  struct sljit_jump *firstchar;
- struct sljit_jump *leave;
+ struct sljit_jump *quit;
  struct sljit_jump *foundcr = NULL;
  struct sljit_jump *notfoundnl;
  jump_list *newline = NULL;
  if (firstline)
    {
-   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);
+   SLJIT_ASSERT(common->first_line_end != 0);
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END);
+   OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
+   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
    }
  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-Line 1816 
 if (common->nltype == NLTYPE_FIXED && co
+Line 3150 
 if (common->nltype == NLTYPE_FIXED && co
    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
    firstchar = CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
-   OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
+   OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));
    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, STR_PTR, 0, TMP1, 0);
-   COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_GREATER_EQUAL);
+   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_GREATER_EQUAL);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+   OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
    loop = LABEL();
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-   leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+   quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), -2);
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
-   OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(STR_PTR), -1);
+   OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
    CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);
    CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);
-   JUMPHERE(leave);
+   JUMPHERE(quit);
    JUMPHERE(firstchar);
    JUMPHERE(lastchar);
-Line 1853 
 set_jumps(newline, loop);
+Line 3190 
 set_jumps(newline, loop);
  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
    {
-   leave = JUMP(SLJIT_JUMP);
+   quit = JUMP(SLJIT_JUMP);
    JUMPHERE(foundcr);
    notfoundnl = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
-   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
-   COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);
+   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+ #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
+   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+ #endif
    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
    JUMPHERE(notfoundnl);
-   JUMPHERE(leave);
+   JUMPHERE(quit);
    }
  JUMPHERE(lastchar);
  JUMPHERE(firstchar);
  if (firstline)
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);
+   OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
  }
+ static BOOL check_class_ranges(compiler_common *common, const pcre_uint8 *bits, BOOL nclass, jump_list **backtracks);
  static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common, sljit_uw start_bits, BOOL firstline)
  {
  DEFINE_COMPILER;
  struct sljit_label *start;
- struct sljit_jump *leave;
+ struct sljit_jump *quit;
- struct sljit_jump *found;
+ struct sljit_jump *found = NULL;
+ jump_list *matches = NULL;
+ pcre_uint8 inverted_start_bits[32];
+ int i;
+ #ifndef COMPILE_PCRE8
+ struct sljit_jump *jump;
+ #endif
+ for (i = 0; i < 32; ++i)
+   inverted_start_bits[i] = ~(((pcre_uint8*)start_bits)[i]);
  if (firstline)
    {
-   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);
+   SLJIT_ASSERT(common->first_line_end != 0);
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), FIRSTLINE_END);
+   OP1(SLJIT_MOV, RETURN_ADDR, 0, STR_END, 0);
+   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
    }
  start = LABEL();
- leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+ quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+ OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
- #ifdef SUPPORT_UTF8
+ #ifdef SUPPORT_UTF
- if (common->utf8)
+ if (common->utf)
-   OP1(SLJIT_MOV_UB, TMP3, 0, SLJIT_MEM1(TMP1), (sljit_w)_pcre_utf8_char_sizes);
+   OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
  #endif
- OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
- OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
+ if (!check_class_ranges(common, inverted_start_bits, (inverted_start_bits[31] & 0x80) != 0, &matches))
- OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), start_bits);
+   {
- OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
+ #ifndef COMPILE_PCRE8
- OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
+   jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 255);
- found = JUMP(SLJIT_C_NOT_ZERO);
+   OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 255);
+   JUMPHERE(jump);
- #ifdef SUPPORT_UTF8
+ #endif
- if (common->utf8)
+   OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP3, 0);
+   OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
- else
+   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), start_bits);
-   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
- #else
+   OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
- OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   found = JUMP(SLJIT_C_NOT_ZERO);
+   }
+ #ifdef SUPPORT_UTF
+ if (common->utf)
+   OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
  #endif
+ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+ #ifdef SUPPORT_UTF
+ #if defined COMPILE_PCRE8
+ if (common->utf)
+   {
+   CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0, start);
+   OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+   }
+ #elif defined COMPILE_PCRE16
+ if (common->utf)
+   {
+   CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800, start);
+   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
+   OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
+   OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
+   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+   }
+ #endif /* COMPILE_PCRE[8|16] */
+ #endif /* SUPPORT_UTF */
  JUMPTO(SLJIT_JUMP, start);
- JUMPHERE(found);
+ if (found != NULL)
- JUMPHERE(leave);
+   JUMPHERE(found);
+ if (matches != NULL)
+   set_jumps(matches, LABEL());
+ JUMPHERE(quit);
  if (firstline)
-   OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);
+   OP1(SLJIT_MOV, STR_END, 0, RETURN_ADDR, 0);
  }
- static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uint16 reqbyte, BOOL has_firstbyte)
+ static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uchar req_char, BOOL caseless, BOOL has_firstchar)
  {
  DEFINE_COMPILER;
  struct sljit_label *loop;
-Line 1922 
 struct sljit_jump *alreadyfound;
+Line 3303 
 struct sljit_jump *alreadyfound;
  struct sljit_jump *found;
  struct sljit_jump *foundoc = NULL;
  struct sljit_jump *notfound;
- pcre_uint16 oc, bit;
+ pcre_uint32 oc, bit;
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), REQ_BYTE_PTR);
+ SLJIT_ASSERT(common->req_char_ptr != 0);
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->req_char_ptr);
  OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, REQ_BYTE_MAX);
  toolong = CMP(SLJIT_C_LESS, TMP1, 0, STR_END, 0);
  alreadyfound = CMP(SLJIT_C_LESS, STR_PTR, 0, TMP2, 0);
- if (has_firstbyte)
+ if (has_firstchar)
-   OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, 1);
+   OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
  else
    OP1(SLJIT_MOV, TMP1, 0, STR_PTR, 0);
  loop = LABEL();
  notfound = CMP(SLJIT_C_GREATER_EQUAL, TMP1, 0, STR_END, 0);
- OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), 0);
+ OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(TMP1), 0);
- if ((reqbyte & REQ_CASELESS) == 0)
+ oc = req_char;
-   found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, reqbyte & 0xff);
+ if (caseless)
+   {
+   oc = TABLE_GET(req_char, common->fcc, req_char);
+ #if defined SUPPORT_UCP && !(defined COMPILE_PCRE8)
+   if (req_char > 127 && common->utf)
+     oc = UCD_OTHERCASE(req_char);
+ #endif
+   }
+ if (req_char == oc)
+   found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
  else
    {
-   reqbyte &= 0xff;
+   bit = req_char ^ oc;
-   oc = common->fcc[reqbyte];
+   if (is_powerof2(bit))
-   bit = reqbyte ^ oc;
-   if (ispowerof2(bit))
      {
      OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);
-     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, reqbyte | bit);
+     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);
      }
    else
      {
-     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, reqbyte);
+     found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, req_char);
      foundoc = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, oc);
      }
    }
- OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
+ OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(1));
  JUMPTO(SLJIT_JUMP, loop);
  JUMPHERE(found);
  if (foundoc)
    JUMPHERE(foundoc);
- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), REQ_BYTE_PTR, TMP1, 0);
+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->req_char_ptr, TMP1, 0);
  JUMPHERE(alreadyfound);
  JUMPHERE(toolong);
  return notfound;
-Line 1971 
 return notfound;
+Line 3360 
 return notfound;
  static void do_revertframes(compiler_common *common)
  {
  DEFINE_COMPILER;
- struct sljit_jump *earlyexit;
  struct sljit_jump *jump;
  struct sljit_label *mainloop;
- sljit_emit_fast_enter(compiler, RETURN_ADDR, 0, 1, 5, 5, common->localsize);
+ sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
- OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS_HEAD);
+ OP1(SLJIT_MOV, TMP1, 0, STACK_TOP, 0);
+ GET_LOCAL_BASE(TMP3, 0, 0);
  /* Drop frames until we reach STACK_TOP. */
- earlyexit = CMP(SLJIT_C_LESS, TMP1, 0, STACK_TOP, 0);
  mainloop = LABEL();
  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), 0);
- jump = CMP(SLJIT_C_SIG_LESS_EQUAL, TMP2, 0, SLJIT_IMM, frame_end);
+ OP2(SLJIT_SUB | SLJIT_SET_S, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0);
- OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_LOCALS_REG, 0);
+ jump = JUMP(SLJIT_C_SIG_LESS_EQUAL);
- OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));
- OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_w), SLJIT_MEM1(TMP1), 2 * sizeof(sljit_w));
+ OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);
- OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_w));
+ OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
+ OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), SLJIT_MEM1(TMP1), 2 * sizeof(sljit_sw));
+ OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
  JUMPTO(SLJIT_JUMP, mainloop);
  JUMPHERE(jump);
- jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_end);
+ jump = JUMP(SLJIT_C_SIG_LESS);
  /* End of dropping frames. */
- OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));
- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS_HEAD, TMP1, 0);
- CMPTO(SLJIT_C_GREATER_EQUAL, TMP1, 0, STACK_TOP, 0, mainloop);
- JUMPHERE(earlyexit);
  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
  JUMPHERE(jump);
- jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setmaxindex);
+ OP1(SLJIT_NEG, TMP2, 0, TMP2, 0);
- /* Set max index. */
+ OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);
- OP1(SLJIT_MOV, MAX_INDEX, 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));
+ OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
- OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_w));
+ OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_sw));
- JUMPTO(SLJIT_JUMP, mainloop);
- JUMPHERE(jump);
- jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setstrbegin);
- /* Set max index. */
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));
- OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_w));
- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0), TMP2, 0);
- JUMPTO(SLJIT_JUMP, mainloop);
- JUMPHERE(jump);
- /* Unknown command. */
- OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_w));
  JUMPTO(SLJIT_JUMP, mainloop);
  }
  static void check_wordboundary(compiler_common *common)
  {
  DEFINE_COMPILER;
- struct sljit_jump *beginend;
+ struct sljit_jump *skipread;
- #ifdef SUPPORT_UTF8
+ jump_list *skipread_list = NULL;
+ #if !(defined COMPILE_PCRE8) || defined SUPPORT_UTF
  struct sljit_jump *jump;
  #endif
- SLJIT_ASSERT(ctype_word == 0x10);
+ SLJIT_COMPILE_ASSERT(ctype_word == 0x10, ctype_word_must_be_16);
- sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, 1, 5, 5, common->localsize);
+ sljit_emit_fast_enter(compiler, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
  /* Get type of the previous char, and put it to LOCALS1. */
  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, SLJIT_IMM, 0);
- beginend = CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
+ skipread = CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
  skip_char_back(common);
+ check_start_used_ptr(common);
  read_char(common);
  /* Testing char type. */
  #ifdef SUPPORT_UCP
- if (common->useucp)
+ if (common->use_ucp)
    {
    OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
    jump = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
-   COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);
+   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
-   COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);
+   OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
    JUMPHERE(jump);
    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, TMP2, 0);
    }
  else
  #endif
    {
- #ifdef SUPPORT_UTF8
+ #ifndef COMPILE_PCRE8
+   jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);
+ #elif defined SUPPORT_UTF
    /* Here LOCALS1 has already been zeroed. */
    jump = NULL;
-   if (common->utf8)
+   if (common->utf)
      jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);
- #endif
+ #endif /* COMPILE_PCRE8 */
    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), common->ctypes);
    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 4 /* ctype_word */);
    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, TMP1, 0);
- #ifdef SUPPORT_UTF8
+ #ifndef COMPILE_PCRE8
+   JUMPHERE(jump);
+ #elif defined SUPPORT_UTF
    if (jump != NULL)
      JUMPHERE(jump);
- #endif
+ #endif /* COMPILE_PCRE8 */
    }
- JUMPHERE(beginend);
+ JUMPHERE(skipread);
  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
- beginend = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
+ check_str_end(common, &skipread_list);
  peek_char(common);
  /* Testing char type. This is a code duplication. */
  #ifdef SUPPORT_UCP
- if (common->useucp)
+ if (common->use_ucp)
+   {
+   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 1);
+   jump = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE);
+   add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
+   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
+   OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
+   OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
+   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
+   OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
+   OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
+   JUMPHERE(jump);
+   }
+ else
+ #endif
+   {
+ #ifndef COMPILE_PCRE8
+   /* TMP2 may be destroyed by peek_char. */
+   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
+   jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);
+ #elif defined SUPPORT_UTF
+   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
+   jump = NULL;
+   if (common->utf)
+     jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);
+ #endif
+   OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), common->ctypes);
+   OP2(SLJIT_LSHR, TMP2, 0, TMP2, 0, SLJIT_IMM, 4 /* ctype_word */);
+   OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+ #ifndef COMPILE_PCRE8
+   JUMPHERE(jump);
+ #elif defined SUPPORT_UTF
+   if (jump != NULL)
+     JUMPHERE(jump);
+ #endif /* COMPILE_PCRE8 */
+   }
+ set_jumps(skipread_list, LABEL());
+ OP2(SLJIT_XOR | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1);
+ sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
+ }