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

Diff of /code/trunk/pcre_jit_compile.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 977 by zherczeg, Sun Jun 17 06:20:52 2012 UTC revision 1245 by zherczeg, Sat Feb 9 11:30:51 2013 UTC
# Line 46  POSSIBILITY OF SUCH DAMAGE. Line 46  POSSIBILITY OF SUCH DAMAGE.
46    
47  #include "pcre_internal.h"  #include "pcre_internal.h"
48    
49  #ifdef SUPPORT_JIT  #if defined SUPPORT_JIT
50    
51  /* All-in-one: Since we use the JIT compiler only from here,  /* All-in-one: Since we use the JIT compiler only from here,
52  we just include it. This way we don't need to touch the build  we just include it. This way we don't need to touch the build
# Line 65  system files. */ Line 65  system files. */
65  #error Unsupported architecture  #error Unsupported architecture
66  #endif  #endif
67    
68  /* Allocate memory on the stack. Fast, but limited size. */  /* Allocate memory for the regex stack on the real machine stack.
69  #define LOCAL_SPACE_SIZE 32768  Fast, but limited size. */
70    #define MACHINE_STACK_SIZE 32768
71    
72    /* Growth rate for stack allocated by the OS. Should be the multiply
73    of page size. */
74  #define STACK_GROWTH_RATE 8192  #define STACK_GROWTH_RATE 8192
75    
76  /* Enable to check that the allocation could destroy temporaries. */  /* Enable to check that the allocation could destroy temporaries. */
# Line 89  vertical (sub-expression) (See struct ba Line 92  vertical (sub-expression) (See struct ba
92    
93  The condition checkers are boolean (true/false) checkers. Machine code is generated  The condition checkers are boolean (true/false) checkers. Machine code is generated
94  for the checker itself and for the actions depending on the result of the checker.  for the checker itself and for the actions depending on the result of the checker.
95  The 'true' case is called as the try 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
96  the 'backtrack' 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
97  branches on the try path.  branches on the matching path.
98    
99   Greedy star operator (*) :   Greedy star operator (*) :
100     Try path: match happens.     Matching path: match happens.
101     Backtrack path: match failed.     Backtrack path: match failed.
102   Non-greedy star operator (*?) :   Non-greedy star operator (*?) :
103     Try path: no need to perform a match.     Matching path: no need to perform a match.
104     Backtrack path: match is required.     Backtrack path: match is required.
105    
106  The following example shows how the code generated for a capturing bracket  The following example shows how the code generated for a capturing bracket
# Line 108  we have the following regular expression Line 111  we have the following regular expression
111    
112  The generated code will be the following:  The generated code will be the following:
113    
114   A try path   A matching path
115   '(' try path (pushing arguments to the stack)   '(' matching path (pushing arguments to the stack)
116   B try path   B matching path
117   ')' try path (pushing arguments to the stack)   ')' matching path (pushing arguments to the stack)
118   D try path   D matching path
119   return with successful match   return with successful match
120    
121   D backtrack path   D backtrack path
122   ')' backtrack path (If we arrived from "C" jump to the backtrack of "C")   ')' backtrack path (If we arrived from "C" jump to the backtrack of "C")
123   B backtrack path   B backtrack path
124   C expected path   C expected path
125   jump to D try path   jump to D matching path
126   C backtrack path   C backtrack path
127   A backtrack path   A backtrack path
128    
# Line 127  The generated code will be the following Line 130  The generated code will be the following
130   code paths. In this way the topmost value on the stack is always belong   code paths. In this way the topmost value on the stack is always belong
131   to the current backtrack code path. The backtrack path must check   to the current backtrack code path. The backtrack path must check
132   whether there is a next alternative. If so, it needs to jump back to   whether there is a next alternative. If so, it needs to jump back to
133   the try path eventually. Otherwise it needs to clear out its own stack   the matching path eventually. Otherwise it needs to clear out its own stack
134   frame and continue the execution on the backtrack code paths.   frame and continue the execution on the backtrack code paths.
135  */  */
136    
137  /*  /*
138  Saved stack frames:  Saved stack frames:
139    
140  Atomic blocks and asserts require reloading the values of local variables  Atomic blocks and asserts require reloading the values of private data
141  when the backtrack mechanism performed. Because of OP_RECURSE, the locals  when the backtrack mechanism performed. Because of OP_RECURSE, the data
142  are not necessarly known in compile time, thus we need a dynamic restore  are not necessarly known in compile time, thus we need a dynamic restore
143  mechanism.  mechanism.
144    
145  The stack frames are stored in a chain list, and have the following format:  The stack frames are stored in a chain list, and have the following format:
146  ([ capturing bracket offset ][ start value ][ end value ])+ ... [ 0 ] [ previous head ]  ([ capturing bracket offset ][ start value ][ end value ])+ ... [ 0 ] [ previous head ]
147    
148  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.
149  */  */
150    
151  typedef struct jit_arguments {  typedef struct jit_arguments {
# Line 154  typedef struct jit_arguments { Line 157  typedef struct jit_arguments {
157    int *offsets;    int *offsets;
158    pcre_uchar *uchar_ptr;    pcre_uchar *uchar_ptr;
159    pcre_uchar *mark_ptr;    pcre_uchar *mark_ptr;
160      void *callout_data;
161    /* Everything else after. */    /* Everything else after. */
162    int offsetcount;    int offset_count;
163    int calllimit;    int call_limit;
164    pcre_uint8 notbol;    pcre_uint8 notbol;
165    pcre_uint8 noteol;    pcre_uint8 noteol;
166    pcre_uint8 notempty;    pcre_uint8 notempty;
# Line 167  typedef struct executable_functions { Line 171  typedef struct executable_functions {
171    void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];    void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];
172    PUBL(jit_callback) callback;    PUBL(jit_callback) callback;
173    void *userdata;    void *userdata;
174      pcre_uint32 top_bracket;
175    sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];    sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];
176  } executable_functions;  } executable_functions;
177    
# Line 181  typedef struct stub_list { Line 186  typedef struct stub_list {
186    enum stub_types type;    enum stub_types type;
187    int data;    int data;
188    struct sljit_jump *start;    struct sljit_jump *start;
189    struct sljit_label *leave;    struct sljit_label *quit;
190    struct stub_list *next;    struct stub_list *next;
191  } stub_list;  } stub_list;
192    
193  typedef int (SLJIT_CALL *jit_function)(jit_arguments *args);  typedef int (SLJIT_CALL *jit_function)(jit_arguments *args);
194    
195  /* The following structure is the key data type for the recursive  /* The following structure is the key data type for the recursive
196  code generator. It is allocated by compile_trypath, and contains  code generator. It is allocated by compile_matchingpath, and contains
197  the aguments for compile_backtrackpath. Must be the first member  the aguments for compile_backtrackingpath. Must be the first member
198  of its descendants. */  of its descendants. */
199  typedef struct backtrack_common {  typedef struct backtrack_common {
200    /* Concatenation stack. */    /* Concatenation stack. */
# Line 208  typedef struct assert_backtrack { Line 213  typedef struct assert_backtrack {
213    /* Less than 0 (-1) if a frame is not needed. */    /* Less than 0 (-1) if a frame is not needed. */
214    int framesize;    int framesize;
215    /* Points to our private memory word on the stack. */    /* Points to our private memory word on the stack. */
216    int localptr;    int private_data_ptr;
217    /* For iterators. */    /* For iterators. */
218    struct sljit_label *trypath;    struct sljit_label *matchingpath;
219  } assert_backtrack;  } assert_backtrack;
220    
221  typedef struct bracket_backtrack {  typedef struct bracket_backtrack {
222    backtrack_common common;    backtrack_common common;
223    /* Where to coninue if an alternative is successfully matched. */    /* Where to coninue if an alternative is successfully matched. */
224    struct sljit_label *alttrypath;    struct sljit_label *alternative_matchingpath;
225    /* For rmin and rmax iterators. */    /* For rmin and rmax iterators. */
226    struct sljit_label *recursivetrypath;    struct sljit_label *recursive_matchingpath;
227    /* For greedy ? operator. */    /* For greedy ? operator. */
228    struct sljit_label *zerotrypath;    struct sljit_label *zero_matchingpath;
229    /* Contains the branches of a failed condition. */    /* Contains the branches of a failed condition. */
230    union {    union {
231      /* Both for OP_COND, OP_SCOND. */      /* Both for OP_COND, OP_SCOND. */
# Line 230  typedef struct bracket_backtrack { Line 235  typedef struct bracket_backtrack {
235      int framesize;      int framesize;
236    } u;    } u;
237    /* Points to our private memory word on the stack. */    /* Points to our private memory word on the stack. */
238    int localptr;    int private_data_ptr;
239  } bracket_backtrack;  } bracket_backtrack;
240    
241  typedef struct bracketpos_backtrack {  typedef struct bracketpos_backtrack {
242    backtrack_common common;    backtrack_common common;
243    /* Points to our private memory word on the stack. */    /* Points to our private memory word on the stack. */
244    int localptr;    int private_data_ptr;
245    /* Reverting stack is needed. */    /* Reverting stack is needed. */
246    int framesize;    int framesize;
247    /* Allocated stack size. */    /* Allocated stack size. */
# Line 245  typedef struct bracketpos_backtrack { Line 250  typedef struct bracketpos_backtrack {
250    
251  typedef struct braminzero_backtrack {  typedef struct braminzero_backtrack {
252    backtrack_common common;    backtrack_common common;
253    struct sljit_label *trypath;    struct sljit_label *matchingpath;
254  } braminzero_backtrack;  } braminzero_backtrack;
255    
256  typedef struct iterator_backtrack {  typedef struct iterator_backtrack {
257    backtrack_common common;    backtrack_common common;
258    /* Next iteration. */    /* Next iteration. */
259    struct sljit_label *trypath;    struct sljit_label *matchingpath;
260  } iterator_backtrack;  } iterator_backtrack;
261    
262  typedef struct recurse_entry {  typedef struct recurse_entry {
# Line 268  typedef struct recurse_backtrack { Line 273  typedef struct recurse_backtrack {
273    backtrack_common common;    backtrack_common common;
274  } recurse_backtrack;  } recurse_backtrack;
275    
276    #define MAX_RANGE_SIZE 6
277    
278  typedef struct compiler_common {  typedef struct compiler_common {
279    struct sljit_compiler *compiler;    struct sljit_compiler *compiler;
280    pcre_uchar *start;    pcre_uchar *start;
281    
282    /* Opcode local area direct map. */    /* Maps private data offset to each opcode. */
283    int *localptrs;    int *private_data_ptrs;
284      /* Tells whether the capturing bracket is optimized. */
285      pcre_uint8 *optimized_cbracket;
286      /* Starting offset of private data for capturing brackets. */
287    int cbraptr;    int cbraptr;
288    /* OVector starting point. Must be divisible by 2. */    /* OVector starting point. Must be divisible by 2. */
289    int ovector_start;    int ovector_start;
290    /* Last known position of the requested byte. */    /* Last known position of the requested byte. */
291    int req_char_ptr;    int req_char_ptr;
292    /* Head of the last recursion. */    /* Head of the last recursion. */
293    int recursive_head;    int recursive_head_ptr;
294    /* First inspected character for partial matching. */    /* First inspected character for partial matching. */
295    int start_used_ptr;    int start_used_ptr;
296    /* Starting pointer for partial soft matches. */    /* Starting pointer for partial soft matches. */
# Line 289  typedef struct compiler_common { Line 299  typedef struct compiler_common {
299    int first_line_end;    int first_line_end;
300    /* Points to the marked string. */    /* Points to the marked string. */
301    int mark_ptr;    int mark_ptr;
302      /* Points to the last matched capture block index. */
303      int capture_last_ptr;
304    
305    /* Other  */    /* Flipped and lower case tables. */
306    const pcre_uint8 *fcc;    const pcre_uint8 *fcc;
307    sljit_w lcc;    sljit_sw lcc;
308      /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */
309    int mode;    int mode;
310      /* Newline control. */
311    int nltype;    int nltype;
312    int newline;    int newline;
313    int bsr_nltype;    int bsr_nltype;
314      /* Dollar endonly. */
315    int endonly;    int endonly;
316    BOOL has_set_som;    BOOL has_set_som;
317    sljit_w ctypes;    /* Tables. */
318      sljit_sw ctypes;
319      int digits[2 + MAX_RANGE_SIZE];
320      /* Named capturing brackets. */
321    sljit_uw name_table;    sljit_uw name_table;
322    sljit_w name_count;    sljit_sw name_count;
323    sljit_w name_entry_size;    sljit_sw name_entry_size;
324    
325    /* Labels and jump lists. */    /* Labels and jump lists. */
326    struct sljit_label *partialmatchlabel;    struct sljit_label *partialmatchlabel;
327    struct sljit_label *leavelabel;    struct sljit_label *quit_label;
328    struct sljit_label *acceptlabel;    struct sljit_label *forced_quit_label;
329      struct sljit_label *accept_label;
330    stub_list *stubs;    stub_list *stubs;
331    recurse_entry *entries;    recurse_entry *entries;
332    recurse_entry *currententry;    recurse_entry *currententry;
333    jump_list *partialmatch;    jump_list *partialmatch;
334    jump_list *leave;    jump_list *quit;
335      jump_list *forced_quit;
336    jump_list *accept;    jump_list *accept;
337    jump_list *calllimit;    jump_list *calllimit;
338    jump_list *stackalloc;    jump_list *stackalloc;
# Line 329  typedef struct compiler_common { Line 349  typedef struct compiler_common {
349  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
350    BOOL use_ucp;    BOOL use_ucp;
351  #endif  #endif
352    #ifndef COMPILE_PCRE32
353    jump_list *utfreadchar;    jump_list *utfreadchar;
354    #endif
355  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
356    jump_list *utfreadtype8;    jump_list *utfreadtype8;
357  #endif  #endif
# Line 347  typedef struct compare_context { Line 369  typedef struct compare_context {
369  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
370    int ucharptr;    int ucharptr;
371    union {    union {
372      sljit_i asint;      sljit_si asint;
373      sljit_uh asushort;      sljit_uh asushort;
374  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
375      sljit_ub asbyte;      sljit_ub asbyte;
376      sljit_ub asuchars[4];      sljit_ub asuchars[4];
377  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
378      sljit_uh asuchars[2];      sljit_uh asuchars[2];
379  #endif  #elif defined COMPILE_PCRE32
380        sljit_ui asuchars[1];
381  #endif  #endif
382    } c;    } c;
383    union {    union {
384      sljit_i asint;      sljit_si asint;
385      sljit_uh asushort;      sljit_uh asushort;
386  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
387      sljit_ub asbyte;      sljit_ub asbyte;
388      sljit_ub asuchars[4];      sljit_ub asuchars[4];
389  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
390      sljit_uh asuchars[2];      sljit_uh asuchars[2];
391  #endif  #elif defined COMPILE_PCRE32
392        sljit_ui asuchars[1];
393  #endif  #endif
394    } oc;    } oc;
395  #endif  #endif
# Line 383  enum { Line 405  enum {
405  #undef CMP  #undef CMP
406    
407  /* Used for accessing the elements of the stack. */  /* Used for accessing the elements of the stack. */
408  #define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_w))  #define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_sw))
409    
410  #define TMP1          SLJIT_TEMPORARY_REG1  #define TMP1          SLJIT_SCRATCH_REG1
411  #define TMP2          SLJIT_TEMPORARY_REG3  #define TMP2          SLJIT_SCRATCH_REG3
412  #define TMP3          SLJIT_TEMPORARY_EREG2  #define TMP3          SLJIT_TEMPORARY_EREG2
413  #define STR_PTR       SLJIT_SAVED_REG1  #define STR_PTR       SLJIT_SAVED_REG1
414  #define STR_END       SLJIT_SAVED_REG2  #define STR_END       SLJIT_SAVED_REG2
415  #define STACK_TOP     SLJIT_TEMPORARY_REG2  #define STACK_TOP     SLJIT_SCRATCH_REG2
416  #define STACK_LIMIT   SLJIT_SAVED_REG3  #define STACK_LIMIT   SLJIT_SAVED_REG3
417  #define ARGUMENTS     SLJIT_SAVED_EREG1  #define ARGUMENTS     SLJIT_SAVED_EREG1
418  #define CALL_COUNT    SLJIT_SAVED_EREG2  #define CALL_COUNT    SLJIT_SAVED_EREG2
419  #define RETURN_ADDR   SLJIT_TEMPORARY_EREG1  #define RETURN_ADDR   SLJIT_TEMPORARY_EREG1
420    
421  /* Locals layout. */  /* Local space layout. */
422  /* These two locals can be used by the current opcode. */  /* These two locals can be used by the current opcode. */
423  #define LOCALS0          (0 * sizeof(sljit_w))  #define LOCALS0          (0 * sizeof(sljit_sw))
424  #define LOCALS1          (1 * sizeof(sljit_w))  #define LOCALS1          (1 * sizeof(sljit_sw))
425  /* Two local variables for possessive quantifiers (char1 cannot use them). */  /* Two local variables for possessive quantifiers (char1 cannot use them). */
426  #define POSSESSIVE0      (2 * sizeof(sljit_w))  #define POSSESSIVE0      (2 * sizeof(sljit_sw))
427  #define POSSESSIVE1      (3 * sizeof(sljit_w))  #define POSSESSIVE1      (3 * sizeof(sljit_sw))
428  /* Max limit of recursions. */  /* Max limit of recursions. */
429  #define CALL_LIMIT       (4 * sizeof(sljit_w))  #define CALL_LIMIT       (4 * sizeof(sljit_sw))
430  /* The output vector is stored on the stack, and contains pointers  /* The output vector is stored on the stack, and contains pointers
431  to characters. The vector data is divided into two groups: the first  to characters. The vector data is divided into two groups: the first
432  group contains the start / end character pointers, and the second is  group contains the start / end character pointers, and the second is
433  the start pointers when the end of the capturing group has not yet reached. */  the start pointers when the end of the capturing group has not yet reached. */
434  #define OVECTOR_START    (common->ovector_start)  #define OVECTOR_START    (common->ovector_start)
435  #define OVECTOR(i)       (OVECTOR_START + (i) * sizeof(sljit_w))  #define OVECTOR(i)       (OVECTOR_START + (i) * sizeof(sljit_sw))
436  #define OVECTOR_PRIV(i)  (common->cbraptr + (i) * sizeof(sljit_w))  #define OVECTOR_PRIV(i)  (common->cbraptr + (i) * sizeof(sljit_sw))
437  #define PRIV_DATA(cc)    (common->localptrs[(cc) - common->start])  #define PRIVATE_DATA(cc) (common->private_data_ptrs[(cc) - common->start])
438    
439  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
440  #define MOV_UCHAR  SLJIT_MOV_UB  #define MOV_UCHAR  SLJIT_MOV_UB
441  #define MOVU_UCHAR SLJIT_MOVU_UB  #define MOVU_UCHAR SLJIT_MOVU_UB
442  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
443  #define MOV_UCHAR  SLJIT_MOV_UH  #define MOV_UCHAR  SLJIT_MOV_UH
444  #define MOVU_UCHAR SLJIT_MOVU_UH  #define MOVU_UCHAR SLJIT_MOVU_UH
445    #elif defined COMPILE_PCRE32
446    #define MOV_UCHAR  SLJIT_MOV_UI
447    #define MOVU_UCHAR SLJIT_MOVU_UI
448  #else  #else
449  #error Unsupported compiling mode  #error Unsupported compiling mode
450  #endif  #endif
 #endif  
451    
452  /* Shortcuts. */  /* Shortcuts. */
453  #define DEFINE_COMPILER \  #define DEFINE_COMPILER \
# Line 445  the start pointers when the end of the c Line 468  the start pointers when the end of the c
468    sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w))    sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w))
469  #define CMPTO(type, src1, src1w, src2, src2w, label) \  #define CMPTO(type, src1, src1w, src2, src2w, label) \
470    sljit_set_label(sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w)), (label))    sljit_set_label(sljit_emit_cmp(compiler, (type), (src1), (src1w), (src2), (src2w)), (label))
471  #define COND_VALUE(op, dst, dstw, type) \  #define OP_FLAGS(op, dst, dstw, src, srcw, type) \
472    sljit_emit_cond_value(compiler, (op), (dst), (dstw), (type))    sljit_emit_op_flags(compiler, (op), (dst), (dstw), (src), (srcw), (type))
473  #define GET_LOCAL_BASE(dst, dstw, offset) \  #define GET_LOCAL_BASE(dst, dstw, offset) \
474    sljit_get_local_base(compiler, (dst), (dstw), (offset))    sljit_get_local_base(compiler, (dst), (dstw), (offset))
475    
# Line 461  return cc; Line 484  return cc;
484    
485  /* Functions whose might need modification for all new supported opcodes:  /* Functions whose might need modification for all new supported opcodes:
486   next_opcode   next_opcode
487   get_localspace   get_private_data_length
488   set_localptrs   set_private_data_ptrs
489   get_framesize   get_framesize
490   init_frame   init_frame
491   get_localsize   get_private_data_length_for_copy
492   copy_locals   copy_private_data
493   compile_trypath   compile_matchingpath
494   compile_backtrackpath   compile_backtrackingpath
495  */  */
496    
497  static pcre_uchar *next_opcode(compiler_common *common, pcre_uchar *cc)  static pcre_uchar *next_opcode(compiler_common *common, pcre_uchar *cc)
# Line 662  switch(*cc) Line 685  switch(*cc)
685    case OP_MARK:    case OP_MARK:
686    return cc + 1 + 2 + cc[1];    return cc + 1 + 2 + cc[1];
687    
688      case OP_CALLOUT:
689      return cc + 2 + 2 * LINK_SIZE;
690    
691    default:    default:
692    return NULL;    return NULL;
693    }    }
694  }  }
695    
696  static int get_localspace(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)  #define CASE_ITERATOR_PRIVATE_DATA_1 \
697        case OP_MINSTAR: \
698        case OP_MINPLUS: \
699        case OP_QUERY: \
700        case OP_MINQUERY: \
701        case OP_MINSTARI: \
702        case OP_MINPLUSI: \
703        case OP_QUERYI: \
704        case OP_MINQUERYI: \
705        case OP_NOTMINSTAR: \
706        case OP_NOTMINPLUS: \
707        case OP_NOTQUERY: \
708        case OP_NOTMINQUERY: \
709        case OP_NOTMINSTARI: \
710        case OP_NOTMINPLUSI: \
711        case OP_NOTQUERYI: \
712        case OP_NOTMINQUERYI:
713    
714    #define CASE_ITERATOR_PRIVATE_DATA_2A \
715        case OP_STAR: \
716        case OP_PLUS: \
717        case OP_STARI: \
718        case OP_PLUSI: \
719        case OP_NOTSTAR: \
720        case OP_NOTPLUS: \
721        case OP_NOTSTARI: \
722        case OP_NOTPLUSI:
723    
724    #define CASE_ITERATOR_PRIVATE_DATA_2B \
725        case OP_UPTO: \
726        case OP_MINUPTO: \
727        case OP_UPTOI: \
728        case OP_MINUPTOI: \
729        case OP_NOTUPTO: \
730        case OP_NOTMINUPTO: \
731        case OP_NOTUPTOI: \
732        case OP_NOTMINUPTOI:
733    
734    #define CASE_ITERATOR_TYPE_PRIVATE_DATA_1 \
735        case OP_TYPEMINSTAR: \
736        case OP_TYPEMINPLUS: \
737        case OP_TYPEQUERY: \
738        case OP_TYPEMINQUERY:
739    
740    #define CASE_ITERATOR_TYPE_PRIVATE_DATA_2A \
741        case OP_TYPESTAR: \
742        case OP_TYPEPLUS:
743    
744    #define CASE_ITERATOR_TYPE_PRIVATE_DATA_2B \
745        case OP_TYPEUPTO: \
746        case OP_TYPEMINUPTO:
747    
748    static int get_class_iterator_size(pcre_uchar *cc)
749    {
750    switch(*cc)
751      {
752      case OP_CRSTAR:
753      case OP_CRPLUS:
754      return 2;
755    
756      case OP_CRMINSTAR:
757      case OP_CRMINPLUS:
758      case OP_CRQUERY:
759      case OP_CRMINQUERY:
760      return 1;
761    
762      case OP_CRRANGE:
763      case OP_CRMINRANGE:
764      if (GET2(cc, 1) == GET2(cc, 1 + IMM2_SIZE))
765        return 0;
766      return 2;
767    
768      default:
769      return 0;
770      }
771    }
772    
773    static int get_private_data_length(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)
774  {  {
775  int localspace = 0;  int private_data_length = 0;
776  pcre_uchar *alternative;  pcre_uchar *alternative;
777    pcre_uchar *name;
778    pcre_uchar *end = NULL;
779    int space, size, i;
780    pcre_uint32 bracketlen;
781    
782  /* Calculate important variables (like stack size) and checks whether all opcodes are supported. */  /* Calculate important variables (like stack size) and checks whether all opcodes are supported. */
783  while (cc < ccend)  while (cc < ccend)
784    {    {
785      space = 0;
786      size = 0;
787      bracketlen = 0;
788    switch(*cc)    switch(*cc)
789      {      {
790      case OP_SET_SOM:      case OP_SET_SOM:
# Line 681  while (cc < ccend) Line 792  while (cc < ccend)
792      cc += 1;      cc += 1;
793      break;      break;
794    
795        case OP_REF:
796        case OP_REFI:
797        common->optimized_cbracket[GET2(cc, 1)] = 0;
798        cc += 1 + IMM2_SIZE;
799        break;
800    
801      case OP_ASSERT:      case OP_ASSERT:
802      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
803      case OP_ASSERTBACK:      case OP_ASSERTBACK:
# Line 690  while (cc < ccend) Line 807  while (cc < ccend)
807      case OP_BRAPOS:      case OP_BRAPOS:
808      case OP_SBRA:      case OP_SBRA:
809      case OP_SBRAPOS:      case OP_SBRAPOS:
810      case OP_SCOND:      private_data_length += sizeof(sljit_sw);
811      localspace += sizeof(sljit_w);      bracketlen = 1 + LINK_SIZE;
     cc += 1 + LINK_SIZE;  
812      break;      break;
813    
814      case OP_CBRAPOS:      case OP_CBRAPOS:
815      case OP_SCBRAPOS:      case OP_SCBRAPOS:
816      localspace += sizeof(sljit_w);      private_data_length += sizeof(sljit_sw);
817      cc += 1 + LINK_SIZE + IMM2_SIZE;      common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;
818        bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
819      break;      break;
820    
821      case OP_COND:      case OP_COND:
822      /* Might be a hidden SCOND. */      case OP_SCOND:
823      alternative = cc + GET(cc, 1);      /* Only AUTO_CALLOUT can insert this opcode. We do
824      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)         not intend to support this case. */
825        localspace += sizeof(sljit_w);      if (cc[1 + LINK_SIZE] == OP_CALLOUT)
826      cc += 1 + LINK_SIZE;        return -1;
827    
828        if (*cc == OP_COND)
829          {
830          /* Might be a hidden SCOND. */
831          alternative = cc + GET(cc, 1);
832          if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
833            private_data_length += sizeof(sljit_sw);
834          }
835        else
836          private_data_length += sizeof(sljit_sw);
837        bracketlen = 1 + LINK_SIZE;
838        break;
839    
840        case OP_CREF:
841        i = GET2(cc, 1);
842        common->optimized_cbracket[i] = 0;
843        cc += 1 + IMM2_SIZE;
844        break;
845    
846        case OP_NCREF:
847        bracketlen = GET2(cc, 1);
848        name = (pcre_uchar *)common->name_table;
849        alternative = name;
850        for (i = 0; i < common->name_count; i++)
851          {
852          if (GET2(name, 0) == bracketlen) break;
853          name += common->name_entry_size;
854          }
855        SLJIT_ASSERT(i != common->name_count);
856    
857        for (i = 0; i < common->name_count; i++)
858          {
859          if (STRCMP_UC_UC(alternative + IMM2_SIZE, name + IMM2_SIZE) == 0)
860            common->optimized_cbracket[GET2(alternative, 0)] = 0;
861          alternative += common->name_entry_size;
862          }
863        bracketlen = 0;
864        cc += 1 + IMM2_SIZE;
865        break;
866    
867        case OP_BRA:
868        bracketlen = 1 + LINK_SIZE;
869        break;
870    
871        case OP_CBRA:
872        case OP_SCBRA:
873        bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
874        break;
875    
876        CASE_ITERATOR_PRIVATE_DATA_1
877        space = 1;
878        size = -2;
879        break;
880    
881        CASE_ITERATOR_PRIVATE_DATA_2A
882        space = 2;
883        size = -2;
884        break;
885    
886        CASE_ITERATOR_PRIVATE_DATA_2B
887        space = 2;
888        size = -(2 + IMM2_SIZE);
889        break;
890    
891        CASE_ITERATOR_TYPE_PRIVATE_DATA_1
892        space = 1;
893        size = 1;
894        break;
895    
896        CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
897        if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
898          space = 2;
899        size = 1;
900        break;
901    
902        CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
903        if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
904          space = 2;
905        size = 1 + IMM2_SIZE;
906        break;
907    
908        case OP_CLASS:
909        case OP_NCLASS:
910        size += 1 + 32 / sizeof(pcre_uchar);
911        space = get_class_iterator_size(cc + size);
912      break;      break;
913    
914    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
915        case OP_XCLASS:
916        size = GET(cc, 1);
917        space = get_class_iterator_size(cc + size);
918        break;
919    #endif
920    
921      case OP_RECURSE:      case OP_RECURSE:
922      /* Set its value only once. */      /* Set its value only once. */
923      if (common->recursive_head == 0)      if (common->recursive_head_ptr == 0)
924        {        {
925        common->recursive_head = common->ovector_start;        common->recursive_head_ptr = common->ovector_start;
926        common->ovector_start += sizeof(sljit_w);        common->ovector_start += sizeof(sljit_sw);
927        }        }
928      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
929      break;      break;
930    
931        case OP_CALLOUT:
932        if (common->capture_last_ptr == 0)
933          {
934          common->capture_last_ptr = common->ovector_start;
935          common->ovector_start += sizeof(sljit_sw);
936          }
937        cc += 2 + 2 * LINK_SIZE;
938        break;
939    
940      case OP_MARK:      case OP_MARK:
941      if (common->mark_ptr == 0)      if (common->mark_ptr == 0)
942        {        {
943        common->mark_ptr = common->ovector_start;        common->mark_ptr = common->ovector_start;
944        common->ovector_start += sizeof(sljit_w);        common->ovector_start += sizeof(sljit_sw);
945        }        }
946      cc += 1 + 2 + cc[1];      cc += 1 + 2 + cc[1];
947      break;      break;
# Line 734  while (cc < ccend) Line 952  while (cc < ccend)
952        return -1;        return -1;
953      break;      break;
954      }      }
955    
956      if (space > 0 && cc >= end)
957        private_data_length += sizeof(sljit_sw) * space;
958    
959      if (size != 0)
960        {
961        if (size < 0)
962          {
963          cc += -size;
964    #ifdef SUPPORT_UTF
965          if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
966    #endif
967          }
968        else
969          cc += size;
970        }
971    
972      if (bracketlen != 0)
973        {
974        if (cc >= end)
975          {
976          end = bracketend(cc);
977          if (end[-1 - LINK_SIZE] == OP_KET)
978            end = NULL;
979          }
980        cc += bracketlen;
981        }
982    }    }
983  return localspace;  return private_data_length;
984  }  }
985    
986  static void set_localptrs(compiler_common *common, int localptr, pcre_uchar *ccend)  static void set_private_data_ptrs(compiler_common *common, int private_data_ptr, pcre_uchar *ccend)
987  {  {
988  pcre_uchar *cc = common->start;  pcre_uchar *cc = common->start;
989  pcre_uchar *alternative;  pcre_uchar *alternative;
990    pcre_uchar *end = NULL;
991    int space, size, bracketlen;
992    
993  while (cc < ccend)  while (cc < ccend)
994    {    {
995      space = 0;
996      size = 0;
997      bracketlen = 0;
998    switch(*cc)    switch(*cc)
999      {      {
1000      case OP_ASSERT:      case OP_ASSERT:
# Line 756  while (cc < ccend) Line 1007  while (cc < ccend)
1007      case OP_SBRA:      case OP_SBRA:
1008      case OP_SBRAPOS:      case OP_SBRAPOS:
1009      case OP_SCOND:      case OP_SCOND:
1010      common->localptrs[cc - common->start] = localptr;      common->private_data_ptrs[cc - common->start] = private_data_ptr;
1011      localptr += sizeof(sljit_w);      private_data_ptr += sizeof(sljit_sw);
1012      cc += 1 + LINK_SIZE;      bracketlen = 1 + LINK_SIZE;
1013      break;      break;
1014    
1015      case OP_CBRAPOS:      case OP_CBRAPOS:
1016      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1017      common->localptrs[cc - common->start] = localptr;      common->private_data_ptrs[cc - common->start] = private_data_ptr;
1018      localptr += sizeof(sljit_w);      private_data_ptr += sizeof(sljit_sw);
1019      cc += 1 + LINK_SIZE + IMM2_SIZE;      bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
1020      break;      break;
1021    
1022      case OP_COND:      case OP_COND:
# Line 773  while (cc < ccend) Line 1024  while (cc < ccend)
1024      alternative = cc + GET(cc, 1);      alternative = cc + GET(cc, 1);
1025      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
1026        {        {
1027        common->localptrs[cc - common->start] = localptr;        common->private_data_ptrs[cc - common->start] = private_data_ptr;
1028        localptr += sizeof(sljit_w);        private_data_ptr += sizeof(sljit_sw);
1029        }        }
1030      cc += 1 + LINK_SIZE;      bracketlen = 1 + LINK_SIZE;
1031        break;
1032    
1033        case OP_BRA:
1034        bracketlen = 1 + LINK_SIZE;
1035        break;
1036    
1037        case OP_CBRA:
1038        case OP_SCBRA:
1039        bracketlen = 1 + LINK_SIZE + IMM2_SIZE;
1040        break;
1041    
1042        CASE_ITERATOR_PRIVATE_DATA_1
1043        space = 1;
1044        size = -2;
1045        break;
1046    
1047        CASE_ITERATOR_PRIVATE_DATA_2A
1048        space = 2;
1049        size = -2;
1050        break;
1051    
1052        CASE_ITERATOR_PRIVATE_DATA_2B
1053        space = 2;
1054        size = -(2 + IMM2_SIZE);
1055        break;
1056    
1057        CASE_ITERATOR_TYPE_PRIVATE_DATA_1
1058        space = 1;
1059        size = 1;
1060        break;
1061    
1062        CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
1063        if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
1064          space = 2;
1065        size = 1;
1066        break;
1067    
1068        CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
1069        if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
1070          space = 2;
1071        size = 1 + IMM2_SIZE;
1072        break;
1073    
1074        case OP_CLASS:
1075        case OP_NCLASS:
1076        size += 1 + 32 / sizeof(pcre_uchar);
1077        space = get_class_iterator_size(cc + size);
1078      break;      break;
1079    
1080    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
1081        case OP_XCLASS:
1082        size = GET(cc, 1);
1083        space = get_class_iterator_size(cc + size);
1084        break;
1085    #endif
1086    
1087      default:      default:
1088      cc = next_opcode(common, cc);      cc = next_opcode(common, cc);
1089      SLJIT_ASSERT(cc != NULL);      SLJIT_ASSERT(cc != NULL);
1090      break;      break;
1091      }      }
1092    
1093      if (space > 0 && cc >= end)
1094        {
1095        common->private_data_ptrs[cc - common->start] = private_data_ptr;
1096        private_data_ptr += sizeof(sljit_sw) * space;
1097        }
1098    
1099      if (size != 0)
1100        {
1101        if (size < 0)
1102          {
1103          cc += -size;
1104    #ifdef SUPPORT_UTF
1105          if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1106    #endif
1107          }
1108        else
1109          cc += size;
1110        }
1111    
1112      if (bracketlen > 0)
1113        {
1114        if (cc >= end)
1115          {
1116          end = bracketend(cc);
1117          if (end[-1 - LINK_SIZE] == OP_KET)
1118            end = NULL;
1119          }
1120        cc += bracketlen;
1121        }
1122    }    }
1123  }  }
1124    
# Line 889  while (cc < ccend) Line 1224  while (cc < ccend)
1224        {        {
1225        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
1226        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setstrbegin);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setstrbegin);
1227        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1228        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
1229        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1230        setsom_found = TRUE;        setsom_found = TRUE;
1231        }        }
1232      cc += 1;      cc += 1;
# Line 903  while (cc < ccend) Line 1238  while (cc < ccend)
1238        {        {
1239        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
1240        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setmark);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setmark);
1241        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1242        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
1243        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1244        setmark_found = TRUE;        setmark_found = TRUE;
1245        }        }
1246      cc += 1 + 2 + cc[1];      cc += 1 + 2 + cc[1];
# Line 916  while (cc < ccend) Line 1251  while (cc < ccend)
1251        {        {
1252        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
1253        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setstrbegin);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setstrbegin);
1254        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1255        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
1256        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1257        setsom_found = TRUE;        setsom_found = TRUE;
1258        }        }
1259      if (common->mark_ptr != 0 && !setmark_found)      if (common->mark_ptr != 0 && !setmark_found)
1260        {        {
1261        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
1262        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setmark);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, frame_setmark);
1263        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1264        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
1265        stackpos += (int)sizeof(sljit_w);        stackpos += (int)sizeof(sljit_sw);
1266        setmark_found = TRUE;        setmark_found = TRUE;
1267        }        }
1268      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
# Line 939  while (cc < ccend) Line 1274  while (cc < ccend)
1274      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1275      offset = (GET2(cc, 1 + LINK_SIZE)) << 1;      offset = (GET2(cc, 1 + LINK_SIZE)) << 1;
1276      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, OVECTOR(offset));      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, SLJIT_IMM, OVECTOR(offset));
1277      stackpos += (int)sizeof(sljit_w);      stackpos += (int)sizeof(sljit_sw);
1278      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset));      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset));
1279      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));
1280      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP1, 0);
1281      stackpos += (int)sizeof(sljit_w);      stackpos += (int)sizeof(sljit_sw);
1282      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP2, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackpos, TMP2, 0);
1283      stackpos += (int)sizeof(sljit_w);      stackpos += (int)sizeof(sljit_sw);
1284    
1285      cc += 1 + LINK_SIZE + IMM2_SIZE;      cc += 1 + LINK_SIZE + IMM2_SIZE;
1286      break;      break;
# Line 960  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), st Line 1295  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), st
1295  SLJIT_ASSERT(stackpos == STACK(stacktop));  SLJIT_ASSERT(stackpos == STACK(stacktop));
1296  }  }
1297    
1298  static SLJIT_INLINE int get_localsize(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)  static SLJIT_INLINE int get_private_data_length_for_copy(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend)
1299  {  {
1300  int localsize = 2;  int private_data_length = 2;
1301    int size;
1302  pcre_uchar *alternative;  pcre_uchar *alternative;
1303  /* Calculate the sum of the local variables. */  /* Calculate the sum of the private machine words. */
1304  while (cc < ccend)  while (cc < ccend)
1305    {    {
1306      size = 0;
1307    switch(*cc)    switch(*cc)
1308      {      {
1309      case OP_ASSERT:      case OP_ASSERT:
# Line 979  while (cc < ccend) Line 1316  while (cc < ccend)
1316      case OP_SBRA:      case OP_SBRA:
1317      case OP_SBRAPOS:      case OP_SBRAPOS:
1318      case OP_SCOND:      case OP_SCOND:
1319      localsize++;      private_data_length++;
1320      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1321      break;      break;
1322    
1323      case OP_CBRA:      case OP_CBRA:
1324      case OP_SCBRA:      case OP_SCBRA:
1325      localsize++;      if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
1326          private_data_length++;
1327      cc += 1 + LINK_SIZE + IMM2_SIZE;      cc += 1 + LINK_SIZE + IMM2_SIZE;
1328      break;      break;
1329    
1330      case OP_CBRAPOS:      case OP_CBRAPOS:
1331      case OP_SCBRAPOS:      case OP_SCBRAPOS:
1332      localsize += 2;      private_data_length += 2;
1333      cc += 1 + LINK_SIZE + IMM2_SIZE;      cc += 1 + LINK_SIZE + IMM2_SIZE;
1334      break;      break;
1335    
# Line 999  while (cc < ccend) Line 1337  while (cc < ccend)
1337      /* Might be a hidden SCOND. */      /* Might be a hidden SCOND. */
1338      alternative = cc + GET(cc, 1);      alternative = cc + GET(cc, 1);
1339      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)      if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
1340        localsize++;        private_data_length++;
1341      cc += 1 + LINK_SIZE;      cc += 1 + LINK_SIZE;
1342      break;      break;
1343    
1344        CASE_ITERATOR_PRIVATE_DATA_1
1345        if (PRIVATE_DATA(cc))
1346          private_data_length++;
1347        cc += 2;
1348    #ifdef SUPPORT_UTF
1349        if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1350    #endif
1351        break;
1352    
1353        CASE_ITERATOR_PRIVATE_DATA_2A
1354        if (PRIVATE_DATA(cc))
1355          private_data_length += 2;
1356        cc += 2;
1357    #ifdef SUPPORT_UTF
1358        if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1359    #endif
1360        break;
1361    
1362        CASE_ITERATOR_PRIVATE_DATA_2B
1363        if (PRIVATE_DATA(cc))
1364          private_data_length += 2;
1365        cc += 2 + IMM2_SIZE;
1366    #ifdef SUPPORT_UTF
1367        if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1368    #endif
1369        break;
1370    
1371        CASE_ITERATOR_TYPE_PRIVATE_DATA_1
1372        if (PRIVATE_DATA(cc))
1373          private_data_length++;
1374        cc += 1;
1375        break;
1376    
1377        CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
1378        if (PRIVATE_DATA(cc))
1379          private_data_length += 2;
1380        cc += 1;
1381        break;
1382    
1383        CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
1384        if (PRIVATE_DATA(cc))
1385          private_data_length += 2;
1386        cc += 1 + IMM2_SIZE;
1387        break;
1388    
1389        case OP_CLASS:
1390        case OP_NCLASS:
1391    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
1392        case OP_XCLASS:
1393        size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
1394    #else
1395        size = 1 + 32 / (int)sizeof(pcre_uchar);
1396    #endif
1397        if (PRIVATE_DATA(cc))
1398          private_data_length += get_class_iterator_size(cc + size);
1399        cc += size;
1400        break;
1401    
1402      default:      default:
1403      cc = next_opcode(common, cc);      cc = next_opcode(common, cc);
1404      SLJIT_ASSERT(cc != NULL);      SLJIT_ASSERT(cc != NULL);
# Line 1010  while (cc < ccend) Line 1406  while (cc < ccend)
1406      }      }
1407    }    }
1408  SLJIT_ASSERT(cc == ccend);  SLJIT_ASSERT(cc == ccend);
1409  return localsize;  return private_data_length;
1410  }  }
1411    
1412  static void copy_locals(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend,  static void copy_private_data(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend,
1413    BOOL save, int stackptr, int stacktop)    BOOL save, int stackptr, int stacktop)
1414  {  {
1415  DEFINE_COMPILER;  DEFINE_COMPILER;
1416  int srcw[2];  int srcw[2];
1417  int count;  int count, size;
1418  BOOL tmp1next = TRUE;  BOOL tmp1next = TRUE;
1419  BOOL tmp1empty = TRUE;  BOOL tmp1empty = TRUE;
1420  BOOL tmp2empty = TRUE;  BOOL tmp2empty = TRUE;
# Line 1035  stacktop = STACK(stacktop - 1); Line 1431  stacktop = STACK(stacktop - 1);
1431    
1432  if (!save)  if (!save)
1433    {    {
1434    stackptr += sizeof(sljit_w);    stackptr += sizeof(sljit_sw);
1435    if (stackptr < stacktop)    if (stackptr < stacktop)
1436      {      {
1437      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
1438      stackptr += sizeof(sljit_w);      stackptr += sizeof(sljit_sw);
1439      tmp1empty = FALSE;      tmp1empty = FALSE;
1440      }      }
1441    if (stackptr < stacktop)    if (stackptr < stacktop)
1442      {      {
1443      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
1444      stackptr += sizeof(sljit_w);      stackptr += sizeof(sljit_sw);
1445      tmp2empty = FALSE;      tmp2empty = FALSE;
1446      }      }
1447    /* The tmp1next must be TRUE in either way. */    /* The tmp1next must be TRUE in either way. */
# Line 1057  while (status != end) Line 1453  while (status != end)
1453    switch(status)    switch(status)
1454      {      {
1455      case start:      case start:
1456      SLJIT_ASSERT(save && common->recursive_head != 0);      SLJIT_ASSERT(save && common->recursive_head_ptr != 0);
1457      count = 1;      count = 1;
1458      srcw[0] = common->recursive_head;      srcw[0] = common->recursive_head_ptr;
1459      status = loop;      status = loop;
1460      break;      break;
1461    
# Line 1083  while (status != end) Line 1479  while (status != end)
1479        case OP_SBRAPOS:        case OP_SBRAPOS:
1480        case OP_SCOND:        case OP_SCOND:
1481        count = 1;        count = 1;
1482        srcw[0] = PRIV_DATA(cc);        srcw[0] = PRIVATE_DATA(cc);
1483        SLJIT_ASSERT(srcw[0] != 0);        SLJIT_ASSERT(srcw[0] != 0);
1484        cc += 1 + LINK_SIZE;        cc += 1 + LINK_SIZE;
1485        break;        break;
1486    
1487        case OP_CBRA:        case OP_CBRA:
1488        case OP_SCBRA:        case OP_SCBRA:
1489        count = 1;        if (common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0)
1490        srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));          {
1491            count = 1;
1492            srcw[0] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
1493            }
1494        cc += 1 + LINK_SIZE + IMM2_SIZE;        cc += 1 + LINK_SIZE + IMM2_SIZE;
1495        break;        break;
1496    
1497        case OP_CBRAPOS:        case OP_CBRAPOS:
1498        case OP_SCBRAPOS:        case OP_SCBRAPOS:
1499        count = 2;        count = 2;
1500          srcw[0] = PRIVATE_DATA(cc);
1501        srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));        srcw[1] = OVECTOR_PRIV(GET2(cc, 1 + LINK_SIZE));
1502        srcw[0] = PRIV_DATA(cc);        SLJIT_ASSERT(srcw[0] != 0 && srcw[1] != 0);
       SLJIT_ASSERT(srcw[0] != 0);  
1503        cc += 1 + LINK_SIZE + IMM2_SIZE;        cc += 1 + LINK_SIZE + IMM2_SIZE;
1504        break;        break;
1505    
# Line 1110  while (status != end) Line 1509  while (status != end)
1509        if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)        if (*alternative == OP_KETRMAX || *alternative == OP_KETRMIN)
1510          {          {
1511          count = 1;          count = 1;
1512          srcw[0] = PRIV_DATA(cc);          srcw[0] = PRIVATE_DATA(cc);
1513          SLJIT_ASSERT(srcw[0] != 0);          SLJIT_ASSERT(srcw[0] != 0);
1514          }          }
1515        cc += 1 + LINK_SIZE;        cc += 1 + LINK_SIZE;
1516        break;        break;
1517    
1518          CASE_ITERATOR_PRIVATE_DATA_1
1519          if (PRIVATE_DATA(cc))
1520            {
1521            count = 1;
1522            srcw[0] = PRIVATE_DATA(cc);
1523            }
1524          cc += 2;
1525    #ifdef SUPPORT_UTF
1526          if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1527    #endif
1528          break;
1529    
1530          CASE_ITERATOR_PRIVATE_DATA_2A
1531          if (PRIVATE_DATA(cc))
1532            {
1533            count = 2;
1534            srcw[0] = PRIVATE_DATA(cc);
1535            srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
1536            }
1537          cc += 2;
1538    #ifdef SUPPORT_UTF
1539          if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1540    #endif
1541          break;
1542    
1543          CASE_ITERATOR_PRIVATE_DATA_2B
1544          if (PRIVATE_DATA(cc))
1545            {
1546            count = 2;
1547            srcw[0] = PRIVATE_DATA(cc);
1548            srcw[1] = PRIVATE_DATA(cc) + sizeof(sljit_sw);
1549            }
1550          cc += 2 + IMM2_SIZE;
1551    #ifdef SUPPORT_UTF
1552          if (common->utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1553    #endif
1554          break;
1555    
1556          CASE_ITERATOR_TYPE_PRIVATE_DATA_1
1557          if (PRIVATE_DATA(cc))
1558            {
1559            count = 1;
1560            srcw[0] = PRIVATE_DATA(cc);
1561            }
1562          cc += 1;
1563          break;
1564    
1565          CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
1566          if (PRIVATE_DATA(cc))
1567            {
1568            count = 2;
1569            srcw[0] = PRIVATE_DATA(cc);
1570            srcw[1] = srcw[0] + sizeof(sljit_sw);
1571            }
1572          cc += 1;
1573          break;
1574    
1575          CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
1576          if (PRIVATE_DATA(cc))
1577            {
1578            count = 2;
1579            srcw[0] = PRIVATE_DATA(cc);
1580            srcw[1] = srcw[0] + sizeof(sljit_sw);
1581            }
1582          cc += 1 + IMM2_SIZE;
1583          break;
1584    
1585          case OP_CLASS:
1586          case OP_NCLASS:
1587    #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
1588          case OP_XCLASS:
1589          size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(pcre_uchar);
1590    #else
1591          size = 1 + 32 / (int)sizeof(pcre_uchar);
1592    #endif
1593          if (PRIVATE_DATA(cc))
1594            switch(get_class_iterator_size(cc + size))
1595              {
1596              case 1:
1597              count = 1;
1598              srcw[0] = PRIVATE_DATA(cc);
1599              break;
1600    
1601              case 2:
1602              count = 2;
1603              srcw[0] = PRIVATE_DATA(cc);
1604              srcw[1] = srcw[0] + sizeof(sljit_sw);
1605              break;
1606    
1607              default:
1608              SLJIT_ASSERT_STOP();
1609              break;
1610              }
1611          cc += size;
1612          break;
1613    
1614        default:        default:
1615        cc = next_opcode(common, cc);        cc = next_opcode(common, cc);
1616        SLJIT_ASSERT(cc != NULL);        SLJIT_ASSERT(cc != NULL);
# Line 1138  while (status != end) Line 1633  while (status != end)
1633          if (!tmp1empty)          if (!tmp1empty)
1634            {            {
1635            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
1636            stackptr += sizeof(sljit_w);            stackptr += sizeof(sljit_sw);
1637            }            }
1638          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);
1639          tmp1empty = FALSE;          tmp1empty = FALSE;
# Line 1149  while (status != end) Line 1644  while (status != end)
1644          if (!tmp2empty)          if (!tmp2empty)
1645            {            {
1646            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);            OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
1647            stackptr += sizeof(sljit_w);            stackptr += sizeof(sljit_sw);
1648            }            }
1649          OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);          OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), srcw[count]);
1650          tmp2empty = FALSE;          tmp2empty = FALSE;
# Line 1166  while (status != end) Line 1661  while (status != end)
1661          if (!tmp1empty)          if (!tmp1empty)
1662            {            {
1663            OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);            OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), stackptr);
1664            stackptr += sizeof(sljit_w);            stackptr += sizeof(sljit_sw);
1665            }            }
1666          tmp1next = FALSE;          tmp1next = FALSE;
1667          }          }
# Line 1178  while (status != end) Line 1673  while (status != end)
1673          if (!tmp2empty)          if (!tmp2empty)
1674            {            {
1675            OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);            OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), stackptr);
1676            stackptr += sizeof(sljit_w);            stackptr += sizeof(sljit_sw);
1677            }            }
1678          tmp1next = TRUE;          tmp1next = TRUE;
1679          }          }
# Line 1193  if (save) Line 1688  if (save)
1688      if (!tmp1empty)      if (!tmp1empty)
1689        {        {
1690        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
1691        stackptr += sizeof(sljit_w);        stackptr += sizeof(sljit_sw);
1692        }        }
1693      if (!tmp2empty)      if (!tmp2empty)
1694        {        {
1695        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
1696        stackptr += sizeof(sljit_w);        stackptr += sizeof(sljit_sw);
1697        }        }
1698      }      }
1699    else    else
# Line 1206  if (save) Line 1701  if (save)
1701      if (!tmp2empty)      if (!tmp2empty)
1702        {        {
1703        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP2, 0);
1704        stackptr += sizeof(sljit_w);        stackptr += sizeof(sljit_sw);
1705        }        }
1706      if (!tmp1empty)      if (!tmp1empty)
1707        {        {
1708        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), stackptr, TMP1, 0);
1709        stackptr += sizeof(sljit_w);        stackptr += sizeof(sljit_sw);
1710        }        }
1711      }      }
1712    }    }
1713  SLJIT_ASSERT(cc == ccend && stackptr == stacktop && (save || (tmp1empty && tmp2empty)));  SLJIT_ASSERT(cc == ccend && stackptr == stacktop && (save || (tmp1empty && tmp2empty)));
1714  }  }
1715    
1716  static SLJIT_INLINE BOOL ispowerof2(unsigned int value)  #undef CASE_ITERATOR_PRIVATE_DATA_1
1717    #undef CASE_ITERATOR_PRIVATE_DATA_2A
1718    #undef CASE_ITERATOR_PRIVATE_DATA_2B
1719    #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_1
1720    #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
1721    #undef CASE_ITERATOR_TYPE_PRIVATE_DATA_2B
1722    
1723    static SLJIT_INLINE BOOL is_powerof2(unsigned int value)
1724  {  {
1725  return (value & (value - 1)) == 0;  return (value & (value - 1)) == 0;
1726  }  }
# Line 1228  static SLJIT_INLINE void set_jumps(jump_ Line 1730  static SLJIT_INLINE void set_jumps(jump_
1730  while (list)  while (list)
1731    {    {
1732    /* sljit_set_label is clever enough to do nothing    /* sljit_set_label is clever enough to do nothing
1733    if either the jump or the label is NULL */    if either the jump or the label is NULL. */
1734    sljit_set_label(list->jump, label);    sljit_set_label(list->jump, label);
1735    list = list->next;    list = list->next;
1736    }    }
# Line 1255  if (list_item) Line 1757  if (list_item)
1757    list_item->type = type;    list_item->type = type;
1758    list_item->data = data;    list_item->data = data;
1759    list_item->start = start;    list_item->start = start;
1760    list_item->leave = LABEL();    list_item->quit = LABEL();
1761    list_item->next = common->stubs;    list_item->next = common->stubs;
1762    common->stubs = list_item;    common->stubs = list_item;
1763    }    }
# Line 1275  while (list_item) Line 1777  while (list_item)
1777      add_jump(compiler, &common->stackalloc, JUMP(SLJIT_FAST_CALL));      add_jump(compiler, &common->stackalloc, JUMP(SLJIT_FAST_CALL));
1778      break;      break;
1779      }      }
1780    JUMPTO(SLJIT_JUMP, list_item->leave);    JUMPTO(SLJIT_JUMP, list_item->quit);
1781    list_item = list_item->next;    list_item = list_item->next;
1782    }    }
1783  common->stubs = NULL;  common->stubs = NULL;
# Line 1294  static SLJIT_INLINE void allocate_stack( Line 1796  static SLJIT_INLINE void allocate_stack(
1796  /* May destroy all locals and registers except TMP2. */  /* May destroy all locals and registers except TMP2. */
1797  DEFINE_COMPILER;  DEFINE_COMPILER;
1798    
1799  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));
1800  #ifdef DESTROY_REGISTERS  #ifdef DESTROY_REGISTERS
1801  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 12345);  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 12345);
1802  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);  OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
# Line 1308  add_stub(common, stack_alloc, 0, CMP(SLJ Line 1810  add_stub(common, stack_alloc, 0, CMP(SLJ
1810  static SLJIT_INLINE void free_stack(compiler_common *common, int size)  static SLJIT_INLINE void free_stack(compiler_common *common, int size)
1811  {  {
1812  DEFINE_COMPILER;  DEFINE_COMPILER;
1813  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));
1814  }  }
1815    
1816  static SLJIT_INLINE void reset_ovector(compiler_common *common, int length)  static SLJIT_INLINE void reset_ovector(compiler_common *common, int length)
# Line 1318  struct sljit_label *loop; Line 1820  struct sljit_label *loop;
1820  int i;  int i;
1821  /* At this point we can freely use all temporary registers. */  /* At this point we can freely use all temporary registers. */
1822  /* TMP1 returns with begin - 1. */  /* TMP1 returns with begin - 1. */
1823  OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG1, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), SLJIT_OFFSETOF(jit_arguments, begin), SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_SUB, SLJIT_SCRATCH_REG1, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), SLJIT_OFFSETOF(jit_arguments, begin), SLJIT_IMM, IN_UCHARS(1));
1824  if (length < 8)  if (length < 8)
1825    {    {
1826    for (i = 0; i < length; i++)    for (i = 0; i < length; i++)
1827      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(i), SLJIT_TEMPORARY_REG1, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(i), SLJIT_SCRATCH_REG1, 0);
1828    }    }
1829  else  else
1830    {    {
1831    GET_LOCAL_BASE(SLJIT_TEMPORARY_REG2, 0, OVECTOR_START - sizeof(sljit_w));    GET_LOCAL_BASE(SLJIT_SCRATCH_REG2, 0, OVECTOR_START - sizeof(sljit_sw));
1832    OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, length);    OP1(SLJIT_MOV, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, length);
1833    loop = LABEL();    loop = LABEL();
1834    OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), sizeof(sljit_w), SLJIT_TEMPORARY_REG1, 0);    OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_SCRATCH_REG2), sizeof(sljit_sw), SLJIT_SCRATCH_REG1, 0);
1835    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_TEMPORARY_REG3, 0, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, 1);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, 1);
1836    JUMPTO(SLJIT_C_NOT_ZERO, loop);    JUMPTO(SLJIT_C_NOT_ZERO, loop);
1837    }    }
1838  }  }
# Line 1339  static SLJIT_INLINE void copy_ovector(co Line 1841  static SLJIT_INLINE void copy_ovector(co
1841  {  {
1842  DEFINE_COMPILER;  DEFINE_COMPILER;
1843  struct sljit_label *loop;  struct sljit_label *loop;
1844  struct sljit_jump *earlyexit;  struct sljit_jump *early_quit;
1845    
1846  /* At this point we can freely use all registers. */  /* At this point we can freely use all registers. */
1847  OP1(SLJIT_MOV, SLJIT_SAVED_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));  OP1(SLJIT_MOV, SLJIT_SAVED_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));
1848  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1), STR_PTR, 0);  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1), STR_PTR, 0);
1849    
1850  OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG1, 0, ARGUMENTS, 0);  OP1(SLJIT_MOV, SLJIT_SCRATCH_REG1, 0, ARGUMENTS, 0);
1851  if (common->mark_ptr != 0)  if (common->mark_ptr != 0)
1852    OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);    OP1(SLJIT_MOV, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr);
1853  OP1(SLJIT_MOV_SI, SLJIT_TEMPORARY_REG2, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, offsetcount));  OP1(SLJIT_MOV_SI, SLJIT_SCRATCH_REG2, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, offset_count));
1854  if (common->mark_ptr != 0)  if (common->mark_ptr != 0)
1855    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_TEMPORARY_REG3, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, mark_ptr), SLJIT_SCRATCH_REG3, 0);
1856  OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));  OP2(SLJIT_SUB, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, offsets), SLJIT_IMM, sizeof(int));
1857  OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG1, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), SLJIT_OFFSETOF(jit_arguments, begin));  OP1(SLJIT_MOV, SLJIT_SCRATCH_REG1, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), SLJIT_OFFSETOF(jit_arguments, begin));
1858  GET_LOCAL_BASE(SLJIT_SAVED_REG1, 0, OVECTOR_START);  GET_LOCAL_BASE(SLJIT_SAVED_REG1, 0, OVECTOR_START);
1859  /* Unlikely, but possible */  /* Unlikely, but possible */
1860  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);
1861  loop = LABEL();  loop = LABEL();
1862  OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), 0, SLJIT_TEMPORARY_REG1, 0);  OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, SLJIT_MEM1(SLJIT_SAVED_REG1), 0, SLJIT_SCRATCH_REG1, 0);
1863  OP2(SLJIT_ADD, SLJIT_SAVED_REG1, 0, SLJIT_SAVED_REG1, 0, SLJIT_IMM, sizeof(sljit_w));  OP2(SLJIT_ADD, SLJIT_SAVED_REG1, 0, SLJIT_SAVED_REG1, 0, SLJIT_IMM, sizeof(sljit_sw));
1864  /* Copy the integer value to the output buffer */  /* Copy the integer value to the output buffer */
1865  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1866  OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, 1);  OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, UCHAR_SHIFT);
1867  #endif  #endif
1868  OP1(SLJIT_MOVU_SI, SLJIT_MEM1(SLJIT_TEMPORARY_REG3), sizeof(int), SLJIT_SAVED_REG2, 0);  OP1(SLJIT_MOVU_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG3), sizeof(int), SLJIT_SAVED_REG2, 0);
1869  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_TEMPORARY_REG2, 0, SLJIT_TEMPORARY_REG2, 0, SLJIT_IMM, 1);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_SCRATCH_REG2, 0, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, 1);
1870  JUMPTO(SLJIT_C_NOT_ZERO, loop);  JUMPTO(SLJIT_C_NOT_ZERO, loop);
1871  JUMPHERE(earlyexit);  JUMPHERE(early_quit);
1872    
1873  /* Calculate the return value, which is the maximum ovector value. */  /* Calculate the return value, which is the maximum ovector value. */
1874  if (topbracket > 1)  if (topbracket > 1)
1875    {    {
1876    GET_LOCAL_BASE(SLJIT_TEMPORARY_REG1, 0, OVECTOR_START + topbracket * 2 * sizeof(sljit_w));    GET_LOCAL_BASE(SLJIT_SCRATCH_REG1, 0, OVECTOR_START + topbracket * 2 * sizeof(sljit_sw));
1877    OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG2, 0, SLJIT_IMM, topbracket + 1);    OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, topbracket + 1);
1878    
1879    /* OVECTOR(0) is never equal to SLJIT_SAVED_REG3. */    /* OVECTOR(0) is never equal to SLJIT_SAVED_REG3. */
1880    loop = LABEL();    loop = LABEL();
1881    OP1(SLJIT_MOVU, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG1), -(2 * (sljit_w)sizeof(sljit_w)));    OP1(SLJIT_MOVU, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG1), -(2 * (sljit_sw)sizeof(sljit_sw)));
1882    OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG2, 0, SLJIT_TEMPORARY_REG2, 0, SLJIT_IMM, 1);    OP2(SLJIT_SUB, SLJIT_SCRATCH_REG2, 0, SLJIT_SCRATCH_REG2, 0, SLJIT_IMM, 1);
1883    CMPTO(SLJIT_C_EQUAL, SLJIT_TEMPORARY_REG3, 0, SLJIT_SAVED_REG3, 0, loop);    CMPTO(SLJIT_C_EQUAL, SLJIT_SCRATCH_REG3, 0, SLJIT_SAVED_REG3, 0, loop);
1884    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_TEMPORARY_REG2, 0);    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_SCRATCH_REG2, 0);
1885    }    }
1886  else  else
1887    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);    OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, 1);
1888  }  }
1889    
1890  static SLJIT_INLINE void return_with_partial_match(compiler_common *common, struct sljit_label *leave)  static SLJIT_INLINE void return_with_partial_match(compiler_common *common, struct sljit_label *quit)
1891  {  {
1892  DEFINE_COMPILER;  DEFINE_COMPILER;
1893    
1894  SLJIT_COMPILE_ASSERT(STR_END == SLJIT_SAVED_REG2, str_end_must_be_saved_reg2);  SLJIT_COMPILE_ASSERT(STR_END == SLJIT_SAVED_REG2, str_end_must_be_saved_reg2);
1895  SLJIT_ASSERT(common->start_used_ptr != 0 && (common->mode == JIT_PARTIAL_SOFT_COMPILE ? common->hit_start != 0 : common->hit_start == 0));  SLJIT_ASSERT(common->start_used_ptr != 0 && (common->mode == JIT_PARTIAL_SOFT_COMPILE ? common->hit_start != 0 : common->hit_start == 0));
1896    
1897  OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG2, 0, ARGUMENTS, 0);  OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, ARGUMENTS, 0);
1898  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_PARTIAL);  OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE_ERROR_PARTIAL);
1899  OP1(SLJIT_MOV_SI, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), SLJIT_OFFSETOF(jit_arguments, offsetcount));  OP1(SLJIT_MOV_SI, SLJIT_SCRATCH_REG3, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, offset_count));
1900  CMPTO(SLJIT_C_LESS, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, 2, leave);  CMPTO(SLJIT_C_LESS, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, 2, quit);
1901    
1902  /* Store match begin and end. */  /* Store match begin and end. */
1903  OP1(SLJIT_MOV, SLJIT_SAVED_REG1, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), SLJIT_OFFSETOF(jit_arguments, begin));  OP1(SLJIT_MOV, SLJIT_SAVED_REG1, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, begin));
1904  OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG2, 0, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), SLJIT_OFFSETOF(jit_arguments, offsets));  OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, offsets));
1905  OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG3, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mode == JIT_PARTIAL_HARD_COMPILE ? common->start_used_ptr : common->hit_start);  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);
1906  OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, STR_END, 0, SLJIT_SAVED_REG1, 0);  OP2(SLJIT_SUB, SLJIT_SAVED_REG2, 0, STR_END, 0, SLJIT_SAVED_REG1, 0);
1907  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1908  OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, 1);  OP2(SLJIT_ASHR, SLJIT_SAVED_REG2, 0, SLJIT_SAVED_REG2, 0, SLJIT_IMM, UCHAR_SHIFT);
1909  #endif  #endif
1910  OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), sizeof(int), SLJIT_SAVED_REG2, 0);  OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG2), sizeof(int), SLJIT_SAVED_REG2, 0);
1911    
1912  OP2(SLJIT_SUB, SLJIT_TEMPORARY_REG3, 0, SLJIT_TEMPORARY_REG3, 0, SLJIT_SAVED_REG1, 0);  OP2(SLJIT_SUB, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_SAVED_REG1, 0);
1913  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
1914  OP2(SLJIT_ASHR, SLJIT_TEMPORARY_REG3, 0, SLJIT_TEMPORARY_REG3, 0, SLJIT_IMM, 1);  OP2(SLJIT_ASHR, SLJIT_SCRATCH_REG3, 0, SLJIT_SCRATCH_REG3, 0, SLJIT_IMM, UCHAR_SHIFT);
1915  #endif  #endif
1916  OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), 0, SLJIT_TEMPORARY_REG3, 0);  OP1(SLJIT_MOV_SI, SLJIT_MEM1(SLJIT_SCRATCH_REG2), 0, SLJIT_SCRATCH_REG3, 0);
1917    
1918  JUMPTO(SLJIT_JUMP, leave);  JUMPTO(SLJIT_JUMP, quit);
1919  }  }
1920    
1921  static SLJIT_INLINE void check_start_used_ptr(compiler_common *common)  static SLJIT_INLINE void check_start_used_ptr(compiler_common *common)
# Line 1524  if (c <= 127 && bit == 0x20) Line 2026  if (c <= 127 && bit == 0x20)
2026    return (0 << 8) | 0x20;    return (0 << 8) | 0x20;
2027    
2028  /* Since c != oc, they must have at least 1 bit difference. */  /* Since c != oc, they must have at least 1 bit difference. */
2029  if (!ispowerof2(bit))  if (!is_powerof2(bit))
2030    return 0;    return 0;
2031    
2032  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2033    
2034  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
2035  if (common->utf && c > 127)  if (common->utf && c > 127)
# Line 1543  if (common->utf && c > 127) Line 2045  if (common->utf && c > 127)
2045  #endif /* SUPPORT_UTF */  #endif /* SUPPORT_UTF */
2046  return (0 << 8) | bit;  return (0 << 8) | bit;
2047    
2048  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2049    
 #ifdef COMPILE_PCRE16  
2050  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
2051  if (common->utf && c > 65535)  if (common->utf && c > 65535)
2052    {    {
# Line 1556  if (common->utf && c > 65535) Line 2057  if (common->utf && c > 65535)
2057    }    }
2058  #endif /* SUPPORT_UTF */  #endif /* SUPPORT_UTF */
2059  return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));  return (bit < 256) ? ((0 << 8) | bit) : ((1 << 8) | (bit >> 8));
 #endif /* COMPILE_PCRE16 */  
2060    
2061  #endif /* COMPILE_PCRE8 */  #endif /* COMPILE_PCRE[8|16|32] */
2062  }  }
2063    
2064  static void check_partial(compiler_common *common, BOOL force)  static void check_partial(compiler_common *common, BOOL force)
# Line 1656  static void read_char(compiler_common *c Line 2156  static void read_char(compiler_common *c
2156  /* Reads the character into TMP1, updates STR_PTR.  /* Reads the character into TMP1, updates STR_PTR.
2157  Does not check STR_END. TMP2 Destroyed. */  Does not check STR_END. TMP2 Destroyed. */
2158  DEFINE_COMPILER;  DEFINE_COMPILER;
2159  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2160  struct sljit_jump *jump;  struct sljit_jump *jump;
2161  #endif  #endif
2162    
2163  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2164  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2165  if (common->utf)  if (common->utf)
2166    {    {
2167  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2168    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
2169  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
2170    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
2171  #endif  #endif /* COMPILE_PCRE[8|16] */
 #endif /* COMPILE_PCRE8 */  
2172    add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
2173    JUMPHERE(jump);    JUMPHERE(jump);
2174    }    }
2175  #endif  #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
2176  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2177  }  }
2178    
# Line 1683  static void peek_char(compiler_common *c Line 2181  static void peek_char(compiler_common *c
2181  /* Reads the character into TMP1, keeps STR_PTR.  /* Reads the character into TMP1, keeps STR_PTR.
2182  Does not check STR_END. TMP2 Destroyed. */  Does not check STR_END. TMP2 Destroyed. */
2183  DEFINE_COMPILER;  DEFINE_COMPILER;
2184  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2185  struct sljit_jump *jump;  struct sljit_jump *jump;
2186  #endif  #endif
2187    
2188  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2189  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2190  if (common->utf)  if (common->utf)
2191    {    {
2192  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2193    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
2194  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
2195    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
2196  #endif  #endif /* COMPILE_PCRE[8|16] */
 #endif /* COMPILE_PCRE8 */  
2197    add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->utfreadchar, JUMP(SLJIT_FAST_CALL));
2198    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
2199    JUMPHERE(jump);    JUMPHERE(jump);
2200    }    }
2201  #endif  #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
2202  }  }
2203    
2204  static void read_char8_type(compiler_common *common)  static void read_char8_type(compiler_common *common)
2205  {  {
2206  /* Reads the character type into TMP1, updates STR_PTR. Does not check STR_END. */  /* Reads the character type into TMP1, updates STR_PTR. Does not check STR_END. */
2207  DEFINE_COMPILER;  DEFINE_COMPILER;
2208  #if defined SUPPORT_UTF || defined COMPILE_PCRE16  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2209  struct sljit_jump *jump;  struct sljit_jump *jump;
2210  #endif  #endif
2211    
# Line 1718  if (common->utf) Line 2214  if (common->utf)
2214    {    {
2215    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
2216    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2217  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2218    /* This can be an extra read in some situations, but hopefully    /* This can be an extra read in some situations, but hopefully
2219    it is needed in most cases. */    it is needed in most cases. */
2220    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
2221    jump = CMP(SLJIT_C_LESS, TMP2, 0, SLJIT_IMM, 0xc0);    jump = CMP(SLJIT_C_LESS, TMP2, 0, SLJIT_IMM, 0xc0);
2222    add_jump(compiler, &common->utfreadtype8, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->utfreadtype8, JUMP(SLJIT_FAST_CALL));
2223    JUMPHERE(jump);    JUMPHERE(jump);
2224  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
2225    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
2226    jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);    jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
2227    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
# Line 1734  if (common->utf) Line 2229  if (common->utf)
2229    /* Skip low surrogate if necessary. */    /* Skip low surrogate if necessary. */
2230    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xfc00);    OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, 0xfc00);
2231    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0xd800);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, 0xd800);
2232    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2233    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
2234    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
2235  #endif  #elif defined COMPILE_PCRE32
2236  #endif /* COMPILE_PCRE8 */    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
2237      jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
2238      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
2239      JUMPHERE(jump);
2240    #endif /* COMPILE_PCRE[8|16|32] */
2241    return;    return;
2242    }    }
2243  #endif  #endif /* SUPPORT_UTF */
2244  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);  OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), 0);
2245  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2246  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2247  /* The ctypes array contains only 256 values. */  /* The ctypes array contains only 256 values. */
2248  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
2249  jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);  jump = CMP(SLJIT_C_GREATER, TMP2, 0, SLJIT_IMM, 255);
2250  #endif  #endif
2251  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), common->ctypes);
2252  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2253  JUMPHERE(jump);  JUMPHERE(jump);
2254  #endif  #endif
2255  }  }
# Line 1759  static void skip_char_back(compiler_comm Line 2258  static void skip_char_back(compiler_comm
2258  {  {
2259  /* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */  /* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */
2260  DEFINE_COMPILER;  DEFINE_COMPILER;
2261  #if defined SUPPORT_UTF && defined COMPILE_PCRE8  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2262    #if defined COMPILE_PCRE8
2263  struct sljit_label *label;  struct sljit_label *label;
2264    
2265  if (common->utf)  if (common->utf)
# Line 1771  if (common->utf) Line 2271  if (common->utf)
2271    CMPTO(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, label);    CMPTO(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 0x80, label);
2272    return;    return;
2273    }    }
2274  #endif  #elif defined COMPILE_PCRE16
 #if defined SUPPORT_UTF && defined COMPILE_PCRE16  
2275  if (common->utf)  if (common->utf)
2276    {    {
2277    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -IN_UCHARS(1));
# Line 1780  if (common->utf) Line 2279  if (common->utf)
2279    /* Skip low surrogate if necessary. */    /* Skip low surrogate if necessary. */
2280    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
2281    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xdc00);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xdc00);
2282    COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2283    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
2284    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2285    return;    return;
2286    }    }
2287  #endif  #endif /* COMPILE_PCRE[8|16] */
2288    #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
2289  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2290  }  }
2291    
# Line 1802  if (nltype == NLTYPE_ANY) Line 2302  if (nltype == NLTYPE_ANY)
2302  else if (nltype == NLTYPE_ANYCRLF)  else if (nltype == NLTYPE_ANYCRLF)
2303    {    {
2304    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_CR);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_CR);
2305    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2306    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
2307    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);
2308    add_jump(compiler, backtracks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));    add_jump(compiler, backtracks, JUMP(jumpiftrue ? SLJIT_C_NOT_ZERO : SLJIT_C_ZERO));
2309    }    }
2310  else  else
# Line 1816  else Line 2316  else
2316    
2317  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
2318    
2319  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
2320  static void do_utfreadchar(compiler_common *common)  static void do_utfreadchar(compiler_common *common)
2321  {  {
2322  /* Fast decoding a UTF-8 character. TMP1 contains the first byte  /* Fast decoding a UTF-8 character. TMP1 contains the first byte
# Line 1904  sljit_emit_fast_return(compiler, RETURN_ Line 2404  sljit_emit_fast_return(compiler, RETURN_
2404  JUMPHERE(jump);  JUMPHERE(jump);
2405    
2406  /* We only have types for characters less than 256. */  /* We only have types for characters less than 256. */
2407  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_w)PRIV(utf8_table4) - 0xc0);  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(utf8_table4) - 0xc0);
2408  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2409  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 0);
2410  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
2411  }  }
2412    
2413  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
2414    
 #ifdef COMPILE_PCRE16  
2415  static void do_utfreadchar(compiler_common *common)  static void do_utfreadchar(compiler_common *common)
2416  {  {
2417  /* Fast decoding a UTF-16 character. TMP1 contains the first 16 bit char  /* Fast decoding a UTF-16 character. TMP1 contains the first 16 bit char
# Line 1937  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UC Line 2436  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, IN_UC
2436  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x10000);
2437  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
2438  }  }
 #endif /* COMPILE_PCRE16 */  
2439    
2440  #endif /* COMPILE_PCRE8 */  #endif /* COMPILE_PCRE[8|16] */
2441    
2442  #endif /* SUPPORT_UTF */  #endif /* SUPPORT_UTF */
2443    
# Line 1959  SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && si Line 2457  SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && si
2457    
2458  sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);  sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
2459  OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);  OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
2460  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_w)PRIV(ucd_stage1));  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
2461  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
2462  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
2463  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
2464  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_w)PRIV(ucd_stage2));  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
2465  OP1(SLJIT_MOV_UH, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);  OP1(SLJIT_MOV_UH, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
2466  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_w)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
2467  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(TMP1, TMP2), 3);
2468  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
2469  }  }
# Line 1979  struct sljit_label *newlinelabel = NULL; Line 2477  struct sljit_label *newlinelabel = NULL;
2477  struct sljit_jump *start;  struct sljit_jump *start;
2478  struct sljit_jump *end = NULL;  struct sljit_jump *end = NULL;
2479  struct sljit_jump *nl = NULL;  struct sljit_jump *nl = NULL;
2480  #ifdef SUPPORT_UTF  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2481  struct sljit_jump *singlechar;  struct sljit_jump *singlechar;
2482  #endif  #endif
2483  jump_list *newline = NULL;  jump_list *newline = NULL;
# Line 1994  if (firstline) Line 2492  if (firstline)
2492    {    {
2493    /* Search for the end of the first line. */    /* Search for the end of the first line. */
2494    SLJIT_ASSERT(common->first_line_end != 0);    SLJIT_ASSERT(common->first_line_end != 0);
2495    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STR_PTR, 0);    OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_END, 0);  
2496    
2497    if (common->nltype == NLTYPE_FIXED && common->newline > 255)    if (common->nltype == NLTYPE_FIXED && common->newline > 255)
2498      {      {
# Line 2006  if (firstline) Line 2503  if (firstline)
2503      OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));      OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
2504      CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, mainloop);      CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, mainloop);
2505      CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, mainloop);      CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, mainloop);
2506        JUMPHERE(end);
2507      OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));      OP2(SLJIT_SUB, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2508      }      }
2509    else    else
# Line 2017  if (firstline) Line 2515  if (firstline)
2515      read_char(common);      read_char(common);
2516      check_newlinechar(common, common->nltype, &newline, TRUE);      check_newlinechar(common, common->nltype, &newline, TRUE);
2517      CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, mainloop);      CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, mainloop);
2518        JUMPHERE(end);
2519      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, STR_PTR, 0);
2520      set_jumps(newline, LABEL());      set_jumps(newline, LABEL());
2521      }      }
2522    
2523      OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
2524      }
2525    
2526    start = JUMP(SLJIT_JUMP);
2527    
2528    if (newlinecheck)
2529      {
2530      newlinelabel = LABEL();
2531      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2532      end = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
2533      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2534      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, common->newline & 0xff);
2535      OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2536    #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2537      OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
2538    #endif
2539      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2540      nl = JUMP(SLJIT_JUMP);
2541      }
2542    
2543    mainloop = LABEL();
2544    
2545    /* Increasing the STR_PTR here requires one less jump in the most common case. */
2546    #ifdef SUPPORT_UTF
2547    if (common->utf) readuchar = TRUE;
2548    #endif
2549    if (newlinecheck) readuchar = TRUE;
2550    
2551    if (readuchar)
2552      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2553    
2554    if (newlinecheck)
2555      CMPTO(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, newlinelabel);
2556    
2557    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2558    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
2559    #if defined COMPILE_PCRE8
2560    if (common->utf)
2561      {
2562      singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
2563      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
2564      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2565      JUMPHERE(singlechar);
2566      }
2567    #elif defined COMPILE_PCRE16
2568    if (common->utf)
2569      {
2570      singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
2571      OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
2572      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
2573      OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2574      OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
2575      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2576      JUMPHERE(singlechar);
2577      }
2578    #endif /* COMPILE_PCRE[8|16] */
2579    #endif /* SUPPORT_UTF && !COMPILE_PCRE32 */
2580    JUMPHERE(start);
2581    
2582    if (newlinecheck)
2583      {
2584    JUMPHERE(end);    JUMPHERE(end);
2585    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);    JUMPHERE(nl);
2586      }
2587    
2588    return mainloop;
2589    }
2590    
2591    #define MAX_N_CHARS 3
2592    
2593    static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common, BOOL firstline)
2594    {
2595    DEFINE_COMPILER;
2596    struct sljit_label *start;
2597    struct sljit_jump *quit;
2598    pcre_uint32 chars[MAX_N_CHARS * 2];
2599    pcre_uchar *cc = common->start + 1 + LINK_SIZE;
2600    int location = 0;
2601    pcre_int32 len, c, bit, caseless;
2602    int must_stop;
2603    
2604    /* We do not support alternatives now. */
2605    if (*(common->start + GET(common->start, 1)) == OP_ALT)
2606      return FALSE;
2607    
2608    while (TRUE)
2609      {
2610      caseless = 0;
2611      must_stop = 1;
2612      switch(*cc)
2613        {
2614        case OP_CHAR:
2615        must_stop = 0;
2616        cc++;
2617        break;
2618    
2619        case OP_CHARI:
2620        caseless = 1;
2621        must_stop = 0;
2622        cc++;
2623        break;
2624    
2625        case OP_SOD:
2626        case OP_SOM:
2627        case OP_SET_SOM:
2628        case OP_NOT_WORD_BOUNDARY:
2629        case OP_WORD_BOUNDARY:
2630        case OP_EODN:
2631        case OP_EOD:
2632        case OP_CIRC:
2633        case OP_CIRCM:
2634        case OP_DOLL:
2635        case OP_DOLLM:
2636        /* Zero width assertions. */
2637        cc++;
2638        continue;
2639    
2640        case OP_PLUS:
2641        case OP_MINPLUS:
2642        case OP_POSPLUS:
2643        cc++;
2644        break;
2645    
2646        case OP_EXACT:
2647        cc += 1 + IMM2_SIZE;
2648        break;
2649    
2650        case OP_PLUSI:
2651        case OP_MINPLUSI:
2652        case OP_POSPLUSI:
2653        caseless = 1;
2654        cc++;
2655        break;
2656    
2657        case OP_EXACTI:
2658        caseless = 1;
2659        cc += 1 + IMM2_SIZE;
2660        break;
2661    
2662        default:
2663        must_stop = 2;
2664        break;
2665        }
2666    
2667      if (must_stop == 2)
2668          break;
2669    
2670      len = 1;
2671    #ifdef SUPPORT_UTF
2672      if (common->utf && HAS_EXTRALEN(cc[0])) len += GET_EXTRALEN(cc[0]);
2673    #endif
2674    
2675      if (caseless && char_has_othercase(common, cc))
2676        {
2677        caseless = char_get_othercase_bit(common, cc);
2678        if (caseless == 0)
2679          return FALSE;
2680    #ifdef COMPILE_PCRE8
2681        caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 8));
2682    #else
2683        if ((caseless & 0x100) != 0)
2684          caseless = ((caseless & 0xff) << 16) | (len - (caseless >> 9));
2685        else
2686          caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 9));
2687    #endif
2688        }
2689      else
2690        caseless = 0;
2691    
2692      while (len > 0 && location < MAX_N_CHARS * 2)
2693        {
2694        c = *cc;
2695        bit = 0;
2696        if (len == (caseless & 0xff))
2697          {
2698          bit = caseless >> 8;
2699          c |= bit;
2700          }
2701    
2702        chars[location] = c;
2703        chars[location + 1] = bit;
2704    
2705        len--;
2706        location += 2;
2707        cc++;
2708        }
2709    
2710      if (location >= MAX_N_CHARS * 2 || must_stop != 0)
2711        break;
2712    }    }
2713    
2714  start = JUMP(SLJIT_JUMP);  /* At least two characters are required. */
2715    if (location < 2 * 2)
2716        return FALSE;
2717    
2718  if (newlinecheck)  if (firstline)
2719    {    {
2720    newlinelabel = LABEL();    SLJIT_ASSERT(common->first_line_end != 0);
2721    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));    OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
2722    end = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 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));
   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);  
 #ifdef COMPILE_PCRE16  
   OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);  
 #endif  
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);  
   nl = JUMP(SLJIT_JUMP);  
2723    }    }
2724    else
2725      OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS((location >> 1) - 1));
2726    
2727  mainloop = LABEL();  start = LABEL();
2728    quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
 /* Increasing the STR_PTR here requires one less jump in the most common case. */  
 #ifdef SUPPORT_UTF  
 if (common->utf) readuchar = TRUE;  
 #endif  
 if (newlinecheck) readuchar = TRUE;  
   
 if (readuchar)  
   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);  
2729    
2730    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
2731    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
2732  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2733  #if defined SUPPORT_UTF && defined COMPILE_PCRE8  if (chars[1] != 0)
2734  if (common->utf)    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[1]);
2735    {  CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[0], start);
2736    singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);  if (location > 2 * 2)
2737    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)PRIV(utf8_table4) - 0xc0);    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(1));
2738    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);  if (chars[3] != 0)
2739    JUMPHERE(singlechar);    OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, chars[3]);
2740    }  CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, chars[2], start);
2741  #endif  if (location > 2 * 2)
2742  #if defined SUPPORT_UTF && defined COMPILE_PCRE16    {
2743  if (common->utf)    if (chars[5] != 0)
2744    {      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[5]);
2745    singlechar = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);    CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[4], 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);  
   COND_VALUE(SLJIT_MOV, TMP1, 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);  
2746    }    }
2747  #endif  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 JUMPHERE(start);  
2748    
2749  if (newlinecheck)  JUMPHERE(quit);
   {  
   JUMPHERE(end);  
   JUMPHERE(nl);  
   }  
2750    
2751  return mainloop;  if (firstline)
2752      OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
2753    else
2754      OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS((location >> 1) - 1));
2755    return TRUE;
2756  }  }
2757    
2758    #undef MAX_N_CHARS
2759    
2760  static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, pcre_uchar first_char, BOOL caseless, BOOL firstline)  static SLJIT_INLINE void fast_forward_first_char(compiler_common *common, pcre_uchar first_char, BOOL caseless, BOOL firstline)
2761  {  {
2762  DEFINE_COMPILER;  DEFINE_COMPILER;
2763  struct sljit_label *start;  struct sljit_label *start;
2764  struct sljit_jump *leave;  struct sljit_jump *quit;
2765  struct sljit_jump *found;  struct sljit_jump *found;
2766  pcre_uchar oc, bit;  pcre_uchar oc, bit;
2767    
2768  if (firstline)  if (firstline)
2769    {    {
2770    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);    SLJIT_ASSERT(common->first_line_end != 0);
2771      OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
2772    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
2773    }    }
2774    
2775  start = LABEL();  start = LABEL();
2776  leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);  quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
2777  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2778    
2779  oc = first_char;  oc = first_char;
# Line 2121  if (first_char == oc) Line 2790  if (first_char == oc)
2790  else  else
2791    {    {
2792    bit = first_char ^ oc;    bit = first_char ^ oc;
2793    if (ispowerof2(bit))    if (is_powerof2(bit))
2794      {      {
2795      OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, bit);      OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, bit);
2796      found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, first_char | bit);      found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, first_char | bit);
# Line 2129  else Line 2798  else
2798    else    else
2799      {      {
2800      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, first_char);      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, first_char);
2801      COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2802      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, oc);      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, oc);
2803      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);
2804      found = JUMP(SLJIT_C_NOT_ZERO);      found = JUMP(SLJIT_C_NOT_ZERO);
2805      }      }
2806    }    }
2807    
2808  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 #if defined SUPPORT_UTF && 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_w)PRIV(utf8_table4) - 0xc0);  
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);  
   }  
 #endif  
 #if defined SUPPORT_UTF && 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);  
   COND_VALUE(SLJIT_MOV, TMP1, 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  
2809  JUMPTO(SLJIT_JUMP, start);  JUMPTO(SLJIT_JUMP, start);
2810  JUMPHERE(found);  JUMPHERE(found);
2811  JUMPHERE(leave);  JUMPHERE(quit);
2812    
2813  if (firstline)  if (firstline)
2814    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);    OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
2815  }  }
2816    
2817  static SLJIT_INLINE void fast_forward_newline(compiler_common *common, BOOL firstline)  static SLJIT_INLINE void fast_forward_newline(compiler_common *common, BOOL firstline)
# Line 2170  DEFINE_COMPILER; Line 2820  DEFINE_COMPILER;
2820  struct sljit_label *loop;  struct sljit_label *loop;
2821  struct sljit_jump *lastchar;  struct sljit_jump *lastchar;
2822  struct sljit_jump *firstchar;  struct sljit_jump *firstchar;
2823  struct sljit_jump *leave;  struct sljit_jump *quit;
2824  struct sljit_jump *foundcr = NULL;  struct sljit_jump *foundcr = NULL;
2825  struct sljit_jump *notfoundnl;  struct sljit_jump *notfoundnl;
2826  jump_list *newline = NULL;  jump_list *newline = NULL;
2827    
2828  if (firstline)  if (firstline)
2829    {    {
2830    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);    SLJIT_ASSERT(common->first_line_end != 0);
2831      OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
2832    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
2833    }    }
2834    
# Line 2191  if (common->nltype == NLTYPE_FIXED && co Line 2842  if (common->nltype == NLTYPE_FIXED && co
2842    
2843    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, IN_UCHARS(2));
2844    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, STR_PTR, 0, TMP1, 0);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, STR_PTR, 0, TMP1, 0);
2845    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_GREATER_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_GREATER_EQUAL);
2846  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2847    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);    OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCHAR_SHIFT);
2848  #endif  #endif
2849    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
2850    
2851    loop = LABEL();    loop = LABEL();
2852    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2853    leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);    quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
2854    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
2855    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));    OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
2856    CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);    CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff, loop);
2857    CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);    CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, common->newline & 0xff, loop);
2858    
2859    JUMPHERE(leave);    JUMPHERE(quit);
2860    JUMPHERE(firstchar);    JUMPHERE(firstchar);
2861    JUMPHERE(lastchar);    JUMPHERE(lastchar);
2862    
# Line 2229  set_jumps(newline, loop); Line 2880  set_jumps(newline, loop);
2880    
2881  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
2882    {    {
2883    leave = JUMP(SLJIT_JUMP);    quit = JUMP(SLJIT_JUMP);
2884    JUMPHERE(foundcr);    JUMPHERE(foundcr);
2885    notfoundnl = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);    notfoundnl = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
2886    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2887    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_NL);
2888    COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2889  #ifdef COMPILE_PCRE16  #if defined COMPILE_PCRE16 || defined COMPILE_PCRE32
2890    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
2891  #endif  #endif
2892    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2893    JUMPHERE(notfoundnl);    JUMPHERE(notfoundnl);
2894    JUMPHERE(leave);    JUMPHERE(quit);
2895    }    }
2896  JUMPHERE(lastchar);  JUMPHERE(lastchar);
2897  JUMPHERE(firstchar);  JUMPHERE(firstchar);
2898    
2899  if (firstline)  if (firstline)
2900    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);    OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
2901  }  }
2902    
2903    static BOOL check_class_ranges(compiler_common *common, const pcre_uint8 *bits, BOOL nclass, jump_list **backtracks);
2904    
2905  static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common, sljit_uw start_bits, BOOL firstline)  static SLJIT_INLINE void fast_forward_start_bits(compiler_common *common, sljit_uw start_bits, BOOL firstline)
2906  {  {
2907  DEFINE_COMPILER;  DEFINE_COMPILER;
2908  struct sljit_label *start;  struct sljit_label *start;
2909  struct sljit_jump *leave;  struct sljit_jump *quit;
2910  struct sljit_jump *found;  struct sljit_jump *found = NULL;
2911    jump_list *matches = NULL;
2912    pcre_uint8 inverted_start_bits[32];
2913    int i;
2914  #ifndef COMPILE_PCRE8  #ifndef COMPILE_PCRE8
2915  struct sljit_jump *jump;  struct sljit_jump *jump;
2916  #endif  #endif
2917    
2918    for (i = 0; i < 32; ++i)
2919      inverted_start_bits[i] = ~(((pcre_uint8*)start_bits)[i]);
2920    
2921  if (firstline)  if (firstline)
2922    {    {
2923    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, STR_END, 0);    SLJIT_ASSERT(common->first_line_end != 0);
2924      OP1(SLJIT_MOV, RETURN_ADDR, 0, STR_END, 0);
2925    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
2926    }    }
2927    
2928  start = LABEL();  start = LABEL();
2929  leave = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);  quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
2930  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
2931  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
2932  if (common->utf)  if (common->utf)
2933    OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);    OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
2934  #endif  #endif
2935    
2936    if (!check_class_ranges(common, inverted_start_bits, (inverted_start_bits[31] & 0x80) != 0, &matches))
2937      {
2938  #ifndef COMPILE_PCRE8  #ifndef COMPILE_PCRE8
2939  jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 255);    jump = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 255);
2940  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 255);    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 255);
2941  JUMPHERE(jump);    JUMPHERE(jump);
2942  #endif  #endif
2943  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
2944  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
2945  OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), start_bits);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), start_bits);
2946  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
2947  OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
2948  found = JUMP(SLJIT_C_NOT_ZERO);    found = JUMP(SLJIT_C_NOT_ZERO);
2949      }
2950    
2951  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
2952  if (common->utf)  if (common->utf)
2953    OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);    OP1(SLJIT_MOV, TMP1, 0, TMP3, 0);
2954  #endif  #endif
2955  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
2956  #if defined SUPPORT_UTF && defined COMPILE_PCRE8  #ifdef SUPPORT_UTF
2957    #if defined COMPILE_PCRE8
2958  if (common->utf)  if (common->utf)
2959    {    {
2960    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0, start);    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0, start);
2961    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)PRIV(utf8_table4) - 0xc0);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
2962    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2963    }    }
2964  #endif  #elif defined COMPILE_PCRE16
 #if defined SUPPORT_UTF && defined COMPILE_PCRE16  
2965  if (common->utf)  if (common->utf)
2966    {    {
2967    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800, start);    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800, start);
2968    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
2969    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
2970    COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
2971    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
2972    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
2973    }    }
2974  #endif  #endif /* COMPILE_PCRE[8|16] */
2975    #endif /* SUPPORT_UTF */
2976  JUMPTO(SLJIT_JUMP, start);  JUMPTO(SLJIT_JUMP, start);
2977  JUMPHERE(found);  if (found != NULL)
2978  JUMPHERE(leave);    JUMPHERE(found);
2979    if (matches != NULL)
2980      set_jumps(matches, LABEL());
2981    JUMPHERE(quit);
2982    
2983  if (firstline)  if (firstline)
2984    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);    OP1(SLJIT_MOV, STR_END, 0, RETURN_ADDR, 0);
2985  }  }
2986    
2987  static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uchar req_char, BOOL caseless, BOOL has_firstchar)  static SLJIT_INLINE struct sljit_jump *search_requested_char(compiler_common *common, pcre_uchar req_char, BOOL caseless, BOOL has_firstchar)
# Line 2325  struct sljit_jump *alreadyfound; Line 2993  struct sljit_jump *alreadyfound;
2993  struct sljit_jump *found;  struct sljit_jump *found;
2994  struct sljit_jump *foundoc = NULL;  struct sljit_jump *foundoc = NULL;
2995  struct sljit_jump *notfound;  struct sljit_jump *notfound;
2996  pcre_uchar oc, bit;  pcre_uint32 oc, bit;
2997    
2998  SLJIT_ASSERT(common->req_char_ptr != 0);  SLJIT_ASSERT(common->req_char_ptr != 0);
2999  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->req_char_ptr);  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->req_char_ptr);
# Line 2356  if (req_char == oc) Line 3024  if (req_char == oc)
3024  else  else
3025    {    {
3026    bit = req_char ^ oc;    bit = req_char ^ oc;
3027    if (ispowerof2(bit))    if (is_powerof2(bit))
3028      {      {
3029      OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);      OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, bit);
3030      found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);      found = CMP(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, req_char | bit);
# Line 2394  mainloop = LABEL(); Line 3062  mainloop = LABEL();
3062  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), 0);  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), 0);
3063  jump = CMP(SLJIT_C_SIG_LESS_EQUAL, TMP2, 0, SLJIT_IMM, frame_end);  jump = CMP(SLJIT_C_SIG_LESS_EQUAL, TMP2, 0, SLJIT_IMM, frame_end);
3064  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP3, 0);
3065  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
3066  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_w), SLJIT_MEM1(TMP1), 2 * sizeof(sljit_w));  OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), sizeof(sljit_sw), SLJIT_MEM1(TMP1), 2 * sizeof(sljit_sw));
3067  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_w));  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_sw));
3068  JUMPTO(SLJIT_JUMP, mainloop);  JUMPTO(SLJIT_JUMP, mainloop);
3069    
3070  JUMPHERE(jump);  JUMPHERE(jump);
# Line 2407  sljit_emit_fast_return(compiler, RETURN_ Line 3075  sljit_emit_fast_return(compiler, RETURN_
3075  JUMPHERE(jump);  JUMPHERE(jump);
3076  jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setstrbegin);  jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setstrbegin);
3077  /* Set string begin. */  /* Set string begin. */
3078  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
3079  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));
3080  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0), TMP2, 0);  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0), TMP2, 0);
3081  JUMPTO(SLJIT_JUMP, mainloop);  JUMPTO(SLJIT_JUMP, mainloop);
3082    
# Line 2416  JUMPHERE(jump); Line 3084  JUMPHERE(jump);
3084  if (common->mark_ptr != 0)  if (common->mark_ptr != 0)
3085    {    {
3086    jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setmark);    jump = CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, frame_setmark);
3087    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), sizeof(sljit_w));    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), sizeof(sljit_sw));
3088    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));
3089    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr, TMP2, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->mark_ptr, TMP2, 0);
3090    JUMPTO(SLJIT_JUMP, mainloop);    JUMPTO(SLJIT_JUMP, mainloop);
3091    
# Line 2425  if (common->mark_ptr != 0) Line 3093  if (common->mark_ptr != 0)
3093    }    }
3094    
3095  /* Unknown command. */  /* Unknown command. */
3096  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));
3097  JUMPTO(SLJIT_JUMP, mainloop);  JUMPTO(SLJIT_JUMP, mainloop);
3098  }  }
3099    
# Line 2458  if (common->use_ucp) Line 3126  if (common->use_ucp)
3126    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
3127    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
3128    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
3129    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
3130    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
3131    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
3132    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
3133    JUMPHERE(jump);    JUMPHERE(jump);
3134    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, TMP2, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS1, TMP2, 0);
3135    }    }
# Line 2502  if (common->use_ucp) Line 3170  if (common->use_ucp)
3170    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
3171    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Ll);
3172    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
3173    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
3174    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Nd - ucp_Ll);
3175    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ucp_No - ucp_Nd);
3176    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
3177    JUMPHERE(jump);    JUMPHERE(jump);
3178    }    }
3179  else  else
# Line 2537  OP2(SLJIT_XOR | SLJIT_SET_E, SLJIT_UNUSE Line 3205  OP2(SLJIT_XOR | SLJIT_SET_E, SLJIT_UNUSE
3205  sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);  sljit_emit_fast_return(compiler, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
3206  }  }
3207    
3208    /*
3209      range format:
3210    
3211      ranges[0] = length of the range (max MAX_RANGE_SIZE, -1 means invalid range).
3212      ranges[1] = first bit (0 or 1)
3213      ranges[2-length] = position of the bit change (when the current bit is not equal to the previous)
3214    */
3215    
3216    static BOOL check_ranges(compiler_common *common, int *ranges, jump_list **backtracks, BOOL readch)
3217    {
3218    DEFINE_COMPILER;
3219    struct sljit_jump *jump;
3220    
3221    if (ranges[0] < 0)
3222      return FALSE;
3223    
3224    switch(ranges[0])
3225      {
3226      case 1:
3227      if (readch)
3228        read_char(common);
3229      add_jump(compiler, backtracks, CMP(ranges[1] == 0 ? SLJIT_C_LESS : SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2]));
3230      return TRUE;
3231    
3232      case 2:
3233      if (readch)
3234        read_char(common);
3235      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[2]);
3236      add_jump(compiler, backtracks, CMP(ranges[1] != 0 ? SLJIT_C_LESS : SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[3] - ranges[2]));
3237      return TRUE;
3238    
3239      case 4:
3240      if (ranges[2] + 1 == ranges[3] && ranges[4] + 1 == ranges[5])
3241        {
3242        if (readch)
3243          read_char(common);
3244        if (ranges[1] != 0)
3245          {
3246          add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2]));
3247          add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, ranges[4]));
3248          }
3249        else
3250          {
3251          jump = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, ranges[2]);
3252          add_jump(compiler, backtracks, CMP(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, ranges[4]));
3253          JUMPHERE(jump);
3254          }
3255        return TRUE;
3256        }
3257      if ((ranges[3] - ranges[2]) == (ranges[5] - ranges[4]) && is_powerof2(ranges[4] - ranges[2]))
3258        {
3259        if (readch)
3260          read_char(common);
3261        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[4] - ranges[2]);
3262        OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ranges[4]);
3263        add_jump(compiler, backtracks, CMP(ranges[1] != 0 ? SLJIT_C_LESS : SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, ranges[5] - ranges[4]));
3264        return TRUE;
3265        }
3266      return FALSE;
3267    
3268      default:
3269      return FALSE;
3270      }
3271    }
3272    
3273    static void get_ctype_ranges(compiler_common *common, int flag, int *ranges)
3274    {
3275    int i, bit, length;
3276    const pcre_uint8 *ctypes = (const pcre_uint8*)common->ctypes;
3277    
3278    bit = ctypes[0] & flag;
3279    ranges[0] = -1;
3280    ranges[1] = bit != 0 ? 1 : 0;
3281    length = 0;
3282    
3283    for (i = 1; i < 256; i++)
3284      if ((ctypes[i] & flag) != bit)
3285        {
3286        if (length >= MAX_RANGE_SIZE)
3287          return;
3288        ranges[2 + length] = i;
3289        length++;
3290        bit ^= flag;
3291        }
3292    
3293    if (bit != 0)
3294      {
3295      if (length >= MAX_RANGE_SIZE)
3296        return;
3297      ranges[2 + length] = 256;
3298      length++;
3299      }
3300    ranges[0] = length;
3301    }
3302    
3303    static BOOL check_class_ranges(compiler_common *common, const pcre_uint8 *bits, BOOL nclass, jump_list **backtracks)
3304    {
3305    int ranges[2 + MAX_RANGE_SIZE];
3306    pcre_uint8 bit, cbit, all;
3307    int i, byte, length = 0;
3308    
3309    bit = bits[0] & 0x1;
3310    ranges[1] = bit;
3311    /* Can be 0 or 255. */
3312    all = -bit;
3313    
3314    for (i = 0; i < 256; )
3315      {
3316      byte = i >> 3;
3317      if ((i & 0x7) == 0 && bits[byte] == all)
3318        i += 8;
3319      else
3320        {
3321        cbit = (bits[byte] >> (i & 0x7)) & 0x1;
3322        if (cbit != bit)
3323          {
3324          if (length >= MAX_RANGE_SIZE)
3325            return FALSE;
3326          ranges[2 + length] = i;
3327          length++;
3328          bit = cbit;
3329          all = -cbit;
3330          }
3331        i++;
3332        }
3333      }
3334    
3335    if (((bit == 0) && nclass) || ((bit == 1) && !nclass))
3336      {
3337      if (length >= MAX_RANGE_SIZE)
3338        return FALSE;
3339      ranges[2 + length] = 256;
3340      length++;
3341      }
3342    ranges[0] = length;
3343    
3344    return check_ranges(common, ranges, backtracks, FALSE);
3345    }
3346    
3347  static void check_anynewline(compiler_common *common)  static void check_anynewline(compiler_common *common)
3348  {  {
3349  /* Check whether TMP1 contains a newline character. TMP2 destroyed. */  /* Check whether TMP1 contains a newline character. TMP2 destroyed. */
# Line 2546  sljit_emit_fast_enter(compiler, RETURN_A Line 3353  sljit_emit_fast_enter(compiler, RETURN_A
3353    
3354  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
3355  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
3356  COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
3357  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
3358  #if defined SUPPORT_UTF || defined COMPILE_PCRE16  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
3359  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3360  if (common->utf)  if (common->utf)
3361    {    {
3362  #endif  #endif
3363    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3364    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
3365    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
3366  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3367    }    }
3368  #endif  #endif
3369  #endif /* SUPPORT_UTF || COMPILE_PCRE16 */  #endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
3370  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);
3371  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
3372  }  }
3373    
# Line 2572  DEFINE_COMPILER; Line 3379  DEFINE_COMPILER;
3379  sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);  sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);
3380    
3381  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x09);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x09);
3382  COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
3383  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x20);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x20);
3384  COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);  OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3385  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xa0);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xa0);
3386  #if defined SUPPORT_UTF || defined COMPILE_PCRE16  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
3387  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3388  if (common->utf)  if (common->utf)
3389    {    {
3390  #endif  #endif
3391    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3392    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x1680);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x1680);
3393    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3394    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x180e);
3395    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3396    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x2000);    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x2000);
3397    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x200A - 0x2000);    OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x200A - 0x2000);
3398    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
3399    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x202f - 0x2000);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x202f - 0x2000);
3400    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3401    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x205f - 0x2000);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x205f - 0x2000);
3402    COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
3403    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x3000 - 0x2000);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x3000 - 0x2000);
3404  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3405    }    }
3406  #endif  #endif
3407  #endif /* SUPPORT_UTF || COMPILE_PCRE16 */  #endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
3408  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);
3409    
3410  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
3411  }  }
# Line 2612  sljit_emit_fast_enter(compiler, RETURN_A Line 3419  sljit_emit_fast_enter(compiler, RETURN_A
3419    
3420  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);  OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x0a);
3421  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);  OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x0d - 0x0a);
3422  COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
3423  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);  OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x85 - 0x0a);
3424  #if defined SUPPORT_UTF || defined COMPILE_PCRE16  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
3425  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3426  if (common->utf)  if (common->utf)
3427    {    {
3428  #endif  #endif
3429    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);
3430    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);    OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, 0x1);
3431    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0x2029 - 0x0a);
3432  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
3433    }    }
3434  #endif  #endif
3435  #endif /* SUPPORT_UTF || COMPILE_PCRE16 */  #endif /* SUPPORT_UTF || COMPILE_PCRE16 || COMPILE_PCRE32 */
3436  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);
3437    
3438  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);  sljit_emit_fast_return(compiler, RETURN_ADDR, 0);
3439  }  }
# Line 2712  sljit_emit_fast_return(compiler, RETURN_ Line 3519  sljit_emit_fast_return(compiler, RETURN_
3519    
3520  #if defined SUPPORT_UTF && defined SUPPORT_UCP  #if defined SUPPORT_UTF && defined SUPPORT_UCP
3521    
3522  static const pcre_uchar *SLJIT_CALL do_utf_caselesscmp(pcre_uchar *src1, jit_arguments *args, pcre_uchar *end1)  static const pcre_uchar * SLJIT_CALL do_utf_caselesscmp(pcre_uchar *src1, jit_arguments *args, pcre_uchar *end1)
3523  {  {
3524  /* This function would be ineffective to do in JIT level. */  /* This function would be ineffective to do in JIT level. */
3525  int c1, c2;  pcre_uint32 c1, c2;
3526  const pcre_uchar *src2 = args->uchar_ptr;  const pcre_uchar *src2 = args->uchar_ptr;
3527  const pcre_uchar *end2 = args->end;  const pcre_uchar *end2 = args->end;
3528    const ucd_record *ur;
3529    const pcre_uint32 *pp;
3530    
3531  while (src1 < end1)  while (src1 < end1)
3532    {    {
# Line 2725  while (src1 < end1) Line 3534  while (src1 < end1)
3534      return (pcre_uchar*)1;      return (pcre_uchar*)1;
3535    GETCHARINC(c1, src1);    GETCHARINC(c1, src1);
3536    GETCHARINC(c2, src2);    GETCHARINC(c2, src2);
3537    if (c1 != c2 && c1 != UCD_OTHERCASE(c2)) return NULL;    ur = GET_UCD(c2);
3538      if (c1 != c2 && c1 != c2 + ur->other_case)
3539        {
3540        pp = PRIV(ucd_caseless_sets) + ur->caseset;
3541        for (;;)
3542          {
3543          if (c1 < *pp) return NULL;
3544          if (c1 == *pp++) break;
3545          }
3546        }
3547    }    }
3548  return src2;  return src2;
3549  }  }
# Line 2747  if (caseless && char_has_othercase(commo Line 3565  if (caseless && char_has_othercase(commo
3565    othercasebit = char_get_othercase_bit(common, cc);    othercasebit = char_get_othercase_bit(common, cc);
3566    SLJIT_ASSERT(othercasebit);    SLJIT_ASSERT(othercasebit);
3567    /* Extracting bit difference info. */    /* Extracting bit difference info. */
3568  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
3569    othercasechar = cc + (othercasebit >> 8);    othercasechar = cc + (othercasebit >> 8);
3570    othercasebit &= 0xff;    othercasebit &= 0xff;
3571  #else  #elif defined COMPILE_PCRE16 || defined COMPILE_PCRE32
3572  #ifdef COMPILE_PCRE16    /* Note that this code only handles characters in the BMP. If there
3573      ever are characters outside the BMP whose othercase differs in only one
3574      bit from itself (there currently are none), this code will need to be
3575      revised for COMPILE_PCRE32. */
3576    othercasechar = cc + (othercasebit >> 9);    othercasechar = cc + (othercasebit >> 9);
3577    if ((othercasebit & 0x100) != 0)    if ((othercasebit & 0x100) != 0)
3578      othercasebit = (othercasebit & 0xff) << 8;      othercasebit = (othercasebit & 0xff) << 8;
3579    else    else
3580      othercasebit &= 0xff;      othercasebit &= 0xff;
3581  #endif  #endif /* COMPILE_PCRE[8|16|32] */
 #endif  
3582    }    }
3583    
3584  if (context->sourcereg == -1)  if (context->sourcereg == -1)
3585    {    {
3586  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
3587  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
3588    if (context->length >= 4)    if (context->length >= 4)
3589      OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);      OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
# Line 2772  if (context->sourcereg == -1) Line 3592  if (context->sourcereg == -1)
3592    else    else
3593  #endif  #endif
3594      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
3595  #else  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
3596  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
3597    if (context->length >= 4)    if (context->length >= 4)
3598      OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);      OP1(SLJIT_MOV_SI, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
3599    else    else
3600  #endif  #endif
3601      OP1(SLJIT_MOV_UH, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
3602  #endif  #elif defined COMPILE_PCRE32
3603  #endif /* COMPILE_PCRE8 */    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
3604    #endif /* COMPILE_PCRE[8|16|32] */
3605    context->sourcereg = TMP2;    context->sourcereg = TMP2;
3606    }    }
3607    
# Line 2795  do Line 3615  do
3615  #endif  #endif
3616    
3617    context->length -= IN_UCHARS(1);    context->length -= IN_UCHARS(1);
3618  #if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED  #if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (defined COMPILE_PCRE8 || defined COMPILE_PCRE16)
3619    
3620    /* Unaligned read is supported. */    /* Unaligned read is supported. */
3621    if (othercasebit != 0 && othercasechar == cc)    if (othercasebit != 0 && othercasechar == cc)
# Line 2810  do Line 3630  do
3630      }      }
3631    context->ucharptr++;    context->ucharptr++;
3632    
3633  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8
3634    if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))    if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))
3635  #else  #else
3636    if (context->ucharptr >= 2 || context->length == 0)    if (context->ucharptr >= 2 || context->length == 0)
# Line 2818  do Line 3638  do
3638      {      {
3639      if (context->length >= 4)      if (context->length >= 4)
3640        OP1(SLJIT_MOV_SI, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);        OP1(SLJIT_MOV_SI, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
 #ifdef COMPILE_PCRE8  
3641      else if (context->length >= 2)      else if (context->length >= 2)
3642        OP1(SLJIT_MOV_UH, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);        OP1(SLJIT_MOV_UH, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
3643    #if defined COMPILE_PCRE8
3644      else if (context->length >= 1)      else if (context->length >= 1)
3645        OP1(SLJIT_MOV_UB, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);        OP1(SLJIT_MOV_UB, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
3646  #else  #endif /* COMPILE_PCRE8 */
     else if (context->length >= 2)  
       OP1(SLJIT_MOV_UH, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);  
 #endif  
3647      context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;      context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
3648    
3649      switch(context->ucharptr)      switch(context->ucharptr)
# Line 2860  do Line 3677  do
3677    
3678  #else  #else
3679    
3680    /* Unaligned read is unsupported. */    /* Unaligned read is unsupported or in 32 bit mode. */
3681  #ifdef COMPILE_PCRE8    if (context->length >= 1)
3682    if (context->length > 0)      OP1(MOV_UCHAR, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
3683      OP1(SLJIT_MOV_UB, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);  
 #else  
   if (context->length > 0)  
     OP1(SLJIT_MOV_UH, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);  
 #endif  
3684    context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;    context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
3685    
3686    if (othercasebit != 0 && othercasechar == cc)    if (othercasebit != 0 && othercasechar == cc)
# Line 2912  return cc; Line 3725  return cc;
3725      } \      } \
3726    charoffset = (value);    charoffset = (value);
3727    
3728  static void compile_xclass_trypath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)  static void compile_xclass_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
3729  {  {
3730  DEFINE_COMPILER;  DEFINE_COMPILER;
3731  jump_list *found = NULL;  jump_list *found = NULL;
3732  jump_list **list = (*cc & XCL_NOT) == 0 ? &found : backtracks;  jump_list **list = (*cc & XCL_NOT) == 0 ? &found : backtracks;
3733  unsigned int c;  pcre_int32 c, charoffset;
3734  int compares;  const pcre_uint32 *other_cases;
3735  struct sljit_jump *jump = NULL;  struct sljit_jump *jump = NULL;
3736  pcre_uchar *ccbegin;  pcre_uchar *ccbegin;
3737    int compares, invertcmp, numberofcmps;
3738  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3739  BOOL needstype = FALSE, needsscript = FALSE, needschar = FALSE;  BOOL needstype = FALSE, needsscript = FALSE, needschar = FALSE;
3740  BOOL charsaved = FALSE;  BOOL charsaved = FALSE;
3741  int typereg = TMP1, scriptreg = TMP1;  int typereg = TMP1, scriptreg = TMP1;
3742  unsigned int typeoffset;  pcre_int32 typeoffset;
3743  #endif  #endif
 int invertcmp, numberofcmps;  
 unsigned int charoffset;  
3744    
3745  /* Although SUPPORT_UTF must be defined, we are not necessary in utf mode. */  /* Although SUPPORT_UTF must be defined, we are
3746       not necessary in utf mode even in 8 bit mode. */
3747  detect_partial_match(common, backtracks);  detect_partial_match(common, backtracks);
3748  read_char(common);  read_char(common);
3749    
# Line 2944  if ((*cc++ & XCL_MAP) != 0) Line 3757  if ((*cc++ & XCL_MAP) != 0)
3757      jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);      jump = CMP(SLJIT_C_GREATER, TMP1, 0, SLJIT_IMM, 255);
3758  #endif  #endif
3759    
3760    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);    if (!check_class_ranges(common, (const pcre_uint8 *)cc, TRUE, list))
3761    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);      {
3762    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)cc);      OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
3763    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);      OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
3764    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
3765    add_jump(compiler, list, JUMP(SLJIT_C_NOT_ZERO));      OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
3766        OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
3767        add_jump(compiler, list, JUMP(SLJIT_C_NOT_ZERO));
3768        }
3769    
3770  #ifndef COMPILE_PCRE8  #ifndef COMPILE_PCRE8
3771    JUMPHERE(jump);    JUMPHERE(jump);
# Line 3022  while (*cc != XCL_END) Line 3838  while (*cc != XCL_END)
3838        needschar = TRUE;        needschar = TRUE;
3839        break;        break;
3840    
3841          case PT_CLIST:
3842          needschar = TRUE;
3843          break;
3844    
3845        default:        default:
3846        SLJIT_ASSERT_STOP();        SLJIT_ASSERT_STOP();
3847        break;        break;
# Line 3058  if (needstype || needsscript) Line 3878  if (needstype || needsscript)
3878      {      {
3879      if (scriptreg == TMP1)      if (scriptreg == TMP1)
3880        {        {
3881        OP1(SLJIT_MOV, scriptreg, 0, SLJIT_IMM, (sljit_w)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));        OP1(SLJIT_MOV, scriptreg, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
3882        OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM2(scriptreg, TMP2), 3);        OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM2(scriptreg, TMP2), 3);
3883        }        }
3884      else      else
3885        {        {
3886        OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 3);        OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 3);
3887        OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_w)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));        OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
3888        OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM1(TMP2), 0);        OP1(SLJIT_MOV_UB, scriptreg, 0, SLJIT_MEM1(TMP2), 0);
3889        }        }
3890      }      }
# Line 3100  while (*cc != XCL_END) Line 3920  while (*cc != XCL_END)
3920      if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))      if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
3921        {        {
3922        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);
3923        COND_VALUE(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);        OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, numberofcmps == 0 ? SLJIT_UNUSED : TMP2, 0, SLJIT_C_EQUAL);
3924        numberofcmps++;        numberofcmps++;
3925        }        }
3926      else if (numberofcmps > 0)      else if (numberofcmps > 0)
3927        {        {
3928        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);
3929        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);
3930        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
3931        numberofcmps = 0;        numberofcmps = 0;
3932        }        }
# Line 3139  while (*cc != XCL_END) Line 3959  while (*cc != XCL_END)
3959      if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))      if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
3960        {        {
3961        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);
3962        COND_VALUE(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, numberofcmps == 0 ? SLJIT_UNUSED : TMP2, 0, SLJIT_C_LESS_EQUAL);
3963        numberofcmps++;        numberofcmps++;
3964        }        }
3965      else if (numberofcmps > 0)      else if (numberofcmps > 0)
3966        {        {
3967        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c - charoffset);
3968        COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
3969        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
3970        numberofcmps = 0;        numberofcmps = 0;
3971        }        }
# Line 3176  while (*cc != XCL_END) Line 3996  while (*cc != XCL_END)
3996    
3997        case PT_LAMP:        case PT_LAMP:
3998        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - typeoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - typeoffset);
3999        COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4000        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ll - typeoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Ll - typeoffset);
4001        COND_VALUE(SLJIT_OR, TMP2, 0, SLJIT_C_EQUAL);        OP_FLAGS(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
4002        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lt - typeoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lt - typeoffset);
4003        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);
4004        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
4005        break;        break;
4006    
# Line 3207  while (*cc != XCL_END) Line 4027  while (*cc != XCL_END)
4027          }          }
4028        SET_CHAR_OFFSET(9);        SET_CHAR_OFFSET(9);
4029        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 13 - 9);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 13 - 9);
4030        COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS_EQUAL);
4031        if (*cc == PT_SPACE)        if (*cc == PT_SPACE)
4032          JUMPHERE(jump);          JUMPHERE(jump);
4033    
4034        SET_TYPE_OFFSET(ucp_Zl);        SET_TYPE_OFFSET(ucp_Zl);
4035        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Zl);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Zs - ucp_Zl);
4036        COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
4037        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
4038        break;        break;
4039    
4040        case PT_WORD:        case PT_WORD:
4041        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE - charoffset);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, CHAR_UNDERSCORE - charoffset);
4042        COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4043        /* ... fall through */        /* ... fall through */
4044    
4045        case PT_ALNUM:        case PT_ALNUM:
4046        SET_TYPE_OFFSET(ucp_Ll);        SET_TYPE_OFFSET(ucp_Ll);
4047        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_Lu - ucp_Ll);
4048        COND_VALUE((*cc == PT_ALNUM) ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS((*cc == PT_ALNUM) ? SLJIT_MOV : SLJIT_OR, TMP2, 0, (*cc == PT_ALNUM) ? SLJIT_UNUSED : TMP2, 0, SLJIT_C_LESS_EQUAL);
4049        SET_TYPE_OFFSET(ucp_Nd);        SET_TYPE_OFFSET(ucp_Nd);
4050        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_No - ucp_Nd);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, typereg, 0, SLJIT_IMM, ucp_No - ucp_Nd);
4051        COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_LESS_EQUAL);        OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_LESS_EQUAL);
4052          jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
4053          break;
4054    
4055          case PT_CLIST:
4056          other_cases = PRIV(ucd_caseless_sets) + cc[1];
4057    
4058          /* At least three characters are required.
4059             Otherwise this case would be handled by the normal code path. */
4060          SLJIT_ASSERT(other_cases[0] != NOTACHAR && other_cases[1] != NOTACHAR && other_cases[2] != NOTACHAR);
4061          SLJIT_ASSERT(other_cases[0] < other_cases[1] && other_cases[1] < other_cases[2]);
4062    
4063          /* Optimizing character pairs, if their difference is power of 2. */
4064          if (is_powerof2(other_cases[1] ^ other_cases[0]))
4065            {
4066            if (charoffset == 0)
4067              OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
4068            else
4069              {
4070              OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
4071              OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
4072              }
4073            OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[1]);
4074            OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4075            other_cases += 2;
4076            }
4077          else if (is_powerof2(other_cases[2] ^ other_cases[1]))
4078            {
4079            if (charoffset == 0)
4080              OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[2] ^ other_cases[1]);
4081            else
4082              {
4083              OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
4084              OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
4085              }
4086            OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP2, 0, SLJIT_IMM, other_cases[2]);
4087            OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4088    
4089            OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, other_cases[0] - charoffset);
4090            OP_FLAGS(SLJIT_OR | ((other_cases[3] == NOTACHAR) ? SLJIT_SET_E : 0), TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
4091    
4092            other_cases += 3;
4093            }
4094          else
4095            {
4096            OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, *other_cases++ - charoffset);
4097            OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4098            }
4099    
4100          while (*other_cases != NOTACHAR)
4101            {
4102            OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, *other_cases++ - charoffset);
4103            OP_FLAGS(SLJIT_OR | ((*other_cases == NOTACHAR) ? SLJIT_SET_E : 0), TMP2, 0, TMP2, 0, SLJIT_C_EQUAL);
4104            }
4105        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);        jump = JUMP(SLJIT_C_NOT_ZERO ^ invertcmp);
4106        break;        break;
4107        }        }
# Line 3249  if (found != NULL) Line 4122  if (found != NULL)
4122    
4123  #endif  #endif
4124    
4125  static pcre_uchar *compile_char1_trypath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks)  static pcre_uchar *compile_char1_matchingpath(compiler_common *common, pcre_uchar type, pcre_uchar *cc, jump_list **backtracks)
4126  {  {
4127  DEFINE_COMPILER;  DEFINE_COMPILER;
4128  int length;  int length;
# Line 3285  switch(type) Line 4158  switch(type)
4158    
4159    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
4160    case OP_DIGIT:    case OP_DIGIT:
4161      /* Digits are usually 0-9, so it is worth to optimize them. */
4162      if (common->digits[0] == -2)
4163        get_ctype_ranges(common, ctype_digit, common->digits);
4164    detect_partial_match(common, backtracks);    detect_partial_match(common, backtracks);
4165    read_char8_type(common);    /* Flip the starting bit in the negative case. */
4166    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_digit);    if (type == OP_NOT_DIGIT)
4167    add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_C_ZERO : SLJIT_C_NOT_ZERO));      common->digits[1] ^= 1;
4168      if (!check_ranges(common, common->digits, backtracks, TRUE))
4169        {
4170        read_char8_type(common);
4171        OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, ctype_digit);
4172        add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_C_ZERO : SLJIT_C_NOT_ZERO));
4173        }
4174      if (type == OP_NOT_DIGIT)
4175        common->digits[1] ^= 1;
4176    return cc;    return cc;
4177    
4178    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
# Line 3335  switch(type) Line 4219  switch(type)
4219      {      {
4220      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
4221      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
4222  #ifdef COMPILE_PCRE8  #if defined COMPILE_PCRE8 || defined COMPILE_PCRE16
4223    #if defined COMPILE_PCRE8
4224      jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);      jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
4225      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)PRIV(utf8_table4) - 0xc0);      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
4226      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
4227  #else /* COMPILE_PCRE8 */  #elif defined COMPILE_PCRE16
 #ifdef COMPILE_PCRE16  
4228      jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);      jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xd800);
4229      OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);      OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, 0xfc00);
4230      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, 0xd800);
4231      COND_VALUE(SLJIT_MOV, TMP1, 0, SLJIT_C_EQUAL);      OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4232      OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);      OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
4233      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
4234  #endif /* COMPILE_PCRE16 */  #endif
 #endif /* COMPILE_PCRE8 */  
4235      JUMPHERE(jump[0]);      JUMPHERE(jump[0]);
4236    #endif /* COMPILE_PCRE[8|16] */
4237      return cc;      return cc;
4238      }      }
4239  #endif  #endif
# Line 3370  switch(type) Line 4254  switch(type)
4254    propdata[2] = cc[0];    propdata[2] = cc[0];
4255    propdata[3] = cc[1];    propdata[3] = cc[1];
4256    propdata[4] = XCL_END;    propdata[4] = XCL_END;
4257    compile_xclass_trypath(common, propdata, backtracks);    compile_xclass_matchingpath(common, propdata, backtracks);
4258    return cc + 2;    return cc + 2;
4259  #endif  #endif
4260  #endif  #endif
# Line 3416  switch(type) Line 4300  switch(type)
4300    detect_partial_match(common, backtracks);    detect_partial_match(common, backtracks);
4301    read_char(common);    read_char(common);
4302    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
4303    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Mc);    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
4304    add_jump(compiler, backtracks, CMP(SLJIT_C_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_Mn - ucp_Mc));    /* Optimize register allocation: use a real register. */
4305      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STACK_TOP, 0);
4306      OP1(SLJIT_MOV_UB, STACK_TOP, 0, SLJIT_MEM2(TMP1, TMP2), 3);
4307    
4308    label = LABEL();    label = LABEL();
4309    jump[0] = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);    jump[0] = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
4310    OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);    OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
4311    read_char(common);    read_char(common);
4312    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
4313    OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, ucp_Mc);    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, gbprop));
4314    CMPTO(SLJIT_C_LESS_EQUAL, TMP1, 0, SLJIT_IMM, ucp_Mn - ucp_Mc, label);    OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM2(TMP1, TMP2), 3);
4315    
4316      OP2(SLJIT_SHL, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 2);
4317      OP1(SLJIT_MOV_UI, TMP1, 0, SLJIT_MEM1(STACK_TOP), (sljit_sw)PRIV(ucp_gbtable));
4318      OP1(SLJIT_MOV, STACK_TOP, 0, TMP2, 0);
4319      OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
4320      OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
4321      JUMPTO(SLJIT_C_NOT_ZERO, label);
4322    
4323    OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);    OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
4324    JUMPHERE(jump[0]);    JUMPHERE(jump[0]);
4325      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
4326    
4327    if (common->mode == JIT_PARTIAL_HARD_COMPILE)    if (common->mode == JIT_PARTIAL_HARD_COMPILE)
4328      {      {
4329      jump[0] = CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0);      jump[0] = CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0);
# Line 3452  switch(type) Line 4347  switch(type)
4347        {        {
4348        jump[1] = CMP(SLJIT_C_EQUAL, TMP2, 0, STR_END, 0);        jump[1] = CMP(SLJIT_C_EQUAL, TMP2, 0, STR_END, 0);
4349        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);        OP2(SLJIT_SUB | SLJIT_SET_U, SLJIT_UNUSED, 0, TMP2, 0, STR_END, 0);
4350        COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_LESS);        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_LESS);
4351        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);        OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
4352        COND_VALUE(SLJIT_OR | SLJIT_SET_E, TMP2, 0, SLJIT_C_NOT_EQUAL);        OP_FLAGS(SLJIT_OR | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_C_NOT_EQUAL);
4353        add_jump(compiler, backtracks, JUMP(SLJIT_C_NOT_EQUAL));        add_jump(compiler, backtracks, JUMP(SLJIT_C_NOT_EQUAL));
4354        check_partial(common, TRUE);        check_partial(common, TRUE);
4355        add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));        add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
# Line 3554  switch(type) Line 4449  switch(type)
4449    add_jump(compiler, backtracks, CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));    add_jump(compiler, backtracks, CMP(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
4450    
4451    if (!common->endonly)    if (!common->endonly)
4452      compile_char1_trypath(common, OP_EODN, cc, backtracks);      compile_char1_matchingpath(common, OP_EODN, cc, backtracks);
4453    else    else
4454      {      {
4455      add_jump(compiler, backtracks, CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0));      add_jump(compiler, backtracks, CMP(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0));
# Line 3634  switch(type) Line 4529  switch(type)
4529      }      }
4530    oc = char_othercase(common, c);    oc = char_othercase(common, c);
4531    bit = c ^ oc;    bit = c ^ oc;
4532    if (ispowerof2(bit))    if (is_powerof2(bit))
4533      {      {
4534      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
4535      add_jump(compiler, backtracks, CMP(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));      add_jump(compiler, backtracks, CMP(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
4536      return cc + length;      return cc + length;
4537      }      }
4538    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, c);
4539    COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4540    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, char_othercase(common, c));    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_IMM, oc);
4541    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);
4542    add_jump(compiler, backtracks, JUMP(SLJIT_C_ZERO));    add_jump(compiler, backtracks, JUMP(SLJIT_C_ZERO));
4543    return cc + length;    return cc + length;
4544    
# Line 3670  switch(type) Line 4565  switch(type)
4565        /* Skip the variable-length character. */        /* Skip the variable-length character. */
4566        OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));        OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
4567        jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);        jump[0] = CMP(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
4568        OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)PRIV(utf8_table4) - 0xc0);        OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
4569        OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);        OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
4570        JUMPHERE(jump[0]);        JUMPHERE(jump[0]);
4571        return cc + 1;        return cc + 1;
# Line 3695  switch(type) Line 4590  switch(type)
4590      {      {
4591      oc = char_othercase(common, c);      oc = char_othercase(common, c);
4592      bit = c ^ oc;      bit = c ^ oc;
4593      if (ispowerof2(bit))      if (is_powerof2(bit))
4594        {        {
4595        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
4596        add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));        add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
# Line 3712  switch(type) Line 4607  switch(type)
4607    case OP_NCLASS:    case OP_NCLASS:
4608    detect_partial_match(common, backtracks);    detect_partial_match(common, backtracks);
4609    read_char(common);    read_char(common);
4610      if (check_class_ranges(common, (const pcre_uint8 *)cc, type == OP_NCLASS, backtracks))
4611        return cc + 32 / sizeof(pcre_uchar);
4612    
4613  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4614    jump[0] = NULL;    jump[0] = NULL;
4615  #ifdef COMPILE_PCRE8  #ifdef COMPILE_PCRE8
# Line 3730  switch(type) Line 4628  switch(type)
4628  #endif /* SUPPORT_UTF || !COMPILE_PCRE8 */  #endif /* SUPPORT_UTF || !COMPILE_PCRE8 */
4629    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
4630    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
4631    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_w)cc);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
4632    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
4633    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);    OP2(SLJIT_AND | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, TMP2, 0);
4634    add_jump(compiler, backtracks, JUMP(SLJIT_C_ZERO));    add_jump(compiler, backtracks, JUMP(SLJIT_C_ZERO));
# Line 3740  switch(type) Line 4638  switch(type)
4638  #endif /* SUPPORT_UTF || !COMPILE_PCRE8 */  #endif /* SUPPORT_UTF || !COMPILE_PCRE8 */
4639    return cc + 32 / sizeof(pcre_uchar);    return cc + 32 / sizeof(pcre_uchar);
4640    
4641  #if defined SUPPORT_UTF || defined COMPILE_PCRE16  #if defined SUPPORT_UTF || defined COMPILE_PCRE16 || defined COMPILE_PCRE32
4642    case OP_XCLASS:    case OP_XCLASS:
4643    compile_xclass_trypath(common, cc + LINK_SIZE, backtracks);    compile_xclass_matchingpath(common, cc + LINK_SIZE, backtracks);
4644    return cc + GET(cc, 0) - 1;    return cc + GET(cc, 0) - 1;
4645  #endif  #endif
4646    
# Line 3776  SLJIT_ASSERT_STOP(); Line 4674  SLJIT_ASSERT_STOP();
4674  return cc;  return cc;
4675  }  }
4676    
4677  static SLJIT_INLINE pcre_uchar *compile_charn_trypath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, jump_list **backtracks)  static SLJIT_INLINE pcre_uchar *compile_charn_matchingpath(compiler_common *common, pcre_uchar *cc, pcre_uchar *ccend, jump_list **backtracks)
4678  {  {
4679  /* This function consumes at least one input character. */  /* This function consumes at least one input character. */
4680  /* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */  /* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */
# Line 3839  if (context.length > 0) Line 4737  if (context.length > 0)
4737    }    }
4738    
4739  /* A non-fixed length character will be checked if length == 0. */  /* A non-fixed length character will be checked if length == 0. */
4740  return compile_char1_trypath(common, *cc, cc + 1, backtracks);  return compile_char1_matchingpath(common, *cc, cc + 1, backtracks);
4741  }  }
4742    
4743  static struct sljit_jump *compile_ref_checks(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)  static struct sljit_jump *compile_ref_checks(compiler_common *common, pcre_uchar *cc, jump_list **backtracks)
# Line 3854  if (!common->jscript_compat) Line 4752  if (!common->jscript_compat)
4752      {      {
4753      /* OVECTOR(1) contains the "string begin - 1" constant. */      /* OVECTOR(1) contains the "string begin - 1" constant. */
4754      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1));
4755      COND_VALUE(SLJIT_MOV, TMP2, 0, SLJIT_C_EQUAL);      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_UNUSED, 0, SLJIT_C_EQUAL);
4756      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));      OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_UNUSED, 0, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));
4757      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);
4758      return JUMP(SLJIT_C_NOT_ZERO);      return JUMP(SLJIT_C_NOT_ZERO);
4759      }      }
4760    add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1)));    add_jump(compiler, backtracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(1)));
# Line 3865  return CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT Line 4763  return CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT
4763  }  }
4764    
4765  /* Forward definitions. */  /* Forward definitions. */
4766  static void compile_trypath(compiler_common *, pcre_uchar *, pcre_uchar *, backtrack_common *);  static void compile_matchingpath(compiler_common *, pcre_uchar *, pcre_uchar *, backtrack_common *);
4767  static void compile_backtrackpath(compiler_common *, struct backtrack_common *);  static void compile_backtrackingpath(compiler_common *, struct backtrack_common *);
4768    
4769  #define PUSH_BACKTRACK(size, ccstart, error) \  #define PUSH_BACKTRACK(size, ccstart, error) \
4770    do \    do \
# Line 3896  static void compile_backtrackpath(compil Line 4794  static void compile_backtrackpath(compil
4794    
4795  #define BACKTRACK_AS(type) ((type *)backtrack)  #define BACKTRACK_AS(type) ((type *)backtrack)
4796    
4797  static pcre_uchar *compile_ref_trypath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks, BOOL withchecks, BOOL emptyfail)  static pcre_uchar *compile_ref_matchingpath(compiler_common *common, pcre_uchar *cc, jump_list **backtracks, BOOL withchecks, BOOL emptyfail)
4798  {  {
4799  DEFINE_COMPILER;  DEFINE_COMPILER;
4800  int offset = GET2(cc, 1) << 1;  int offset = GET2(cc, 1) << 1;
# Line 3912  if (withchecks && !common->jscript_compa Line 4810  if (withchecks && !common->jscript_compa
4810  #if defined SUPPORT_UTF && defined SUPPORT_UCP  #if defined SUPPORT_UTF && defined SUPPORT_UCP
4811  if (common->utf && *cc == OP_REFI)  if (common->utf && *cc == OP_REFI)
4812    {    {
4813    SLJIT_ASSERT(TMP1 == SLJIT_TEMPORARY_REG1 && STACK_TOP == SLJIT_TEMPORARY_REG2 && TMP2 == SLJIT_TEMPORARY_REG3);    SLJIT_ASSERT(TMP1 == SLJIT_SCRATCH_REG1 && STACK_TOP == SLJIT_SCRATCH_REG2 && TMP2 == SLJIT_SCRATCH_REG3);
4814    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(offset + 1));
4815    if (withchecks)    if (withchecks)
4816      jump = CMP(SLJIT_C_EQUAL, TMP1, 0, TMP2, 0);      jump = CMP(SLJIT_C_EQUAL, TMP1, 0, TMP2, 0);
4817    
4818    /* Needed to save important temporary registers. */    /* Needed to save important temporary registers. */
4819    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STACK_TOP, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STACK_TOP, 0);
4820    OP1(SLJIT_MOV, SLJIT_TEMPORARY_REG2, 0, ARGUMENTS, 0);    OP1(SLJIT_MOV, SLJIT_SCRATCH_REG2, 0, ARGUMENTS, 0);
4821    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_TEMPORARY_REG2), SLJIT_OFFSETOF(jit_arguments, uchar_ptr), STR_PTR, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SCRATCH_REG2), SLJIT_OFFSETOF(jit_arguments, uchar_ptr), STR_PTR, 0);
4822    sljit_emit_ijump(compiler, SLJIT_CALL3, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_utf_caselesscmp));    sljit_emit_ijump(compiler, SLJIT_CALL3, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_utf_caselesscmp));
4823    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
4824    if (common->mode == JIT_COMPILE)    if (common->mode == JIT_COMPILE)
# Line 3978  if (jump != NULL) Line 4876  if (jump != NULL)
4876  return cc + 1 + IMM2_SIZE;  return cc + 1 + IMM2_SIZE;
4877  }  }
4878    
4879  static SLJIT_INLINE pcre_uchar *compile_ref_iterator_trypath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)  static SLJIT_INLINE pcre_uchar *compile_ref_iterator_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
4880  {  {
4881  DEFINE_COMPILER;  DEFINE_COMPILER;
4882  backtrack_common *backtrack;  backtrack_common *backtrack;
# Line 4033  if (!minimize) Line 4931  if (!minimize)
4931      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
4932      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
4933      /* Temporary release of STR_PTR. */      /* Temporary release of STR_PTR. */
4934      OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_w));      OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
4935      zerolength = compile_ref_checks(common, ccbegin, NULL);      zerolength = compile_ref_checks(common, ccbegin, NULL);
4936      /* Restore if not zero length. */      /* Restore if not zero length. */
4937      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_w));      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
4938      }      }
4939    else    else
4940      {      {
# Line 4049  if (!minimize) Line 4947  if (!minimize)
4947      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, SLJIT_IMM, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0, SLJIT_IMM, 0);
4948    
4949    label = LABEL();    label = LABEL();
4950    compile_ref_trypath(common, ccbegin, &backtrack->topbacktracks, FALSE, FALSE);    compile_ref_matchingpath(common, ccbegin, &backtrack->topbacktracks, FALSE, FALSE);
4951    
4952    if (min > 1 || max > 1)    if (min > 1 || max > 1)
4953      {      {
# Line 4077  if (!minimize) Line 4975  if (!minimize)
4975      }      }
4976    
4977    JUMPHERE(zerolength);    JUMPHERE(zerolength);
4978    BACKTRACK_AS(iterator_backtrack)->trypath = LABEL();    BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
4979    
4980    decrease_call_count(common);    decrease_call_count(common);
4981    return cc;    return cc;
# Line 4097  if (min == 0) Line 4995  if (min == 0)
4995  else  else
4996    zerolength = compile_ref_checks(common, ccbegin, &backtrack->topbacktracks);    zerolength = compile_ref_checks(common, ccbegin, &backtrack->topbacktracks);
4997    
4998  BACKTRACK_AS(iterator_backtrack)->trypath = LABEL();  BACKTRACK_AS(iterator_backtrack)->matchingpath = LABEL();
4999  if (max > 0)  if (max > 0)
5000    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, max));    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_C_GREATER_EQUAL, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, max));
5001    
5002  compile_ref_trypath(common, ccbegin, &backtrack->topbacktracks, TRUE, TRUE);  compile_ref_matchingpath(common, ccbegin, &backtrack->topbacktracks, TRUE, TRUE);
5003  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
5004    
5005  if (min > 1)  if (min > 1)
# Line 4109  if (min > 1) Line 5007  if (min > 1)
5007    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
5008    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);    OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
5009    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
5010    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, min, BACKTRACK_AS(iterator_backtrack)->trypath);    CMPTO(SLJIT_C_LESS, TMP1, 0, SLJIT_IMM, min, BACKTRACK_AS(iterator_backtrack)->matchingpath);
5011    }    }
5012  else if (max > 0)  else if (max > 0)
5013    OP2(SLJIT_ADD, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 1);    OP2(SLJIT_ADD, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 1);
# Line 4122  decrease_call_count(common); Line 5020  decrease_call_count(common);
5020  return cc;  return cc;
5021  }  }
5022    
5023  static SLJIT_INLINE pcre_uchar *compile_recurse_trypath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)  static SLJIT_INLINE pcre_uchar *compile_recurse_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
5024  {  {
5025  DEFINE_COMPILER;  DEFINE_COMPILER;
5026  backtrack_common *backtrack;  backtrack_common *backtrack;
# Line 4170  else if (common->has_set_som || common-> Line 5068  else if (common->has_set_som || common->
5068    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP2, 0);
5069    }    }
5070    
5071  if (entry->entry == NULL)  if (entry->entry == NULL)
5072    add_jump(compiler, &entry->calls, JUMP(SLJIT_FAST_CALL));    add_jump(compiler, &entry->calls, JUMP(SLJIT_FAST_CALL));
5073    else
5074      JUMPTO(SLJIT_FAST_CALL, entry->entry);
5075    /* Leave if the match is failed. */
5076    add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 0));
5077    return cc + 1 + LINK_SIZE;
5078    }
5079    
5080    static int SLJIT_CALL do_callout(struct jit_arguments* arguments, PUBL(callout_block) *callout_block, pcre_uchar **jit_ovector)
5081    {
5082    const pcre_uchar *begin = arguments->begin;
5083    int *offset_vector = arguments->offsets;
5084    int offset_count = arguments->offset_count;
5085    int i;
5086    
5087    if (PUBL(callout) == NULL)
5088      return 0;
5089    
5090    callout_block->version = 2;
5091    callout_block->callout_data = arguments->callout_data;
5092    
5093    /* Offsets in subject. */
5094    callout_block->subject_length = arguments->end - arguments->begin;
5095    callout_block->start_match = (pcre_uchar*)callout_block->subject - arguments->begin;
5096    callout_block->current_position = (pcre_uchar*)callout_block->offset_vector - arguments->begin;
5097    #if defined COMPILE_PCRE8
5098    callout_block->subject = (PCRE_SPTR)begin;
5099    #elif defined COMPILE_PCRE16
5100    callout_block->subject = (PCRE_SPTR16)begin;
5101    #elif defined COMPILE_PCRE32
5102    callout_block->subject = (PCRE_SPTR32)begin;
5103    #endif
5104    
5105    /* Convert and copy the JIT offset vector to the offset_vector array. */
5106    callout_block->capture_top = 0;
5107    callout_block->offset_vector = offset_vector;
5108    for (i = 2; i < offset_count; i += 2)
5109      {
5110      offset_vector[i] = jit_ovector[i] - begin;
5111      offset_vector[i + 1] = jit_ovector[i + 1] - begin;
5112      if (jit_ovector[i] >= begin)
5113        callout_block->capture_top = i;
5114      }
5115    
5116    callout_block->capture_top = (callout_block->capture_top >> 1) + 1;
5117    if (offset_count > 0)
5118      offset_vector[0] = -1;
5119    if (offset_count > 1)
5120      offset_vector[1] = -1;
5121    return (*PUBL(callout))(callout_block);
5122    }
5123    
5124    /* Aligning to 8 byte. */
5125    #define CALLOUT_ARG_SIZE \
5126        (((int)sizeof(PUBL(callout_block)) + 7) & ~7)
5127    
5128    #define CALLOUT_ARG_OFFSET(arg) \
5129        (-CALLOUT_ARG_SIZE + SLJIT_OFFSETOF(PUBL(callout_block), arg))
5130    
5131    static SLJIT_INLINE pcre_uchar *compile_callout_matchingpath(compiler_common *common, pcre_uchar *cc, backtrack_common *parent)
5132    {
5133    DEFINE_COMPILER;
5134    backtrack_common *backtrack;
5135    
5136    PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL);
5137    
5138    allocate_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
5139    
5140    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->capture_last_ptr);
5141    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
5142    SLJIT_ASSERT(common->capture_last_ptr != 0);
5143    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(callout_number), SLJIT_IMM, cc[1]);
5144    OP1(SLJIT_MOV_UI, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(capture_last), TMP2, 0);
5145    
5146    /* These pointer sized fields temporarly stores internal variables. */
5147    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
5148    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(offset_vector), STR_PTR, 0);
5149    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(subject), TMP2, 0);
5150    
5151    if (common->mark_ptr != 0)
5152      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, mark_ptr));
5153    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(pattern_position), SLJIT_IMM, GET(cc, 2));
5154    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(next_item_length), SLJIT_IMM, GET(cc, 2 + LINK_SIZE));
5155    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(mark), (common->mark_ptr != 0) ? TMP2 : SLJIT_IMM, 0);
5156    
5157    /* Needed to save important temporary registers. */
5158    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0, STACK_TOP, 0);
5159    OP2(SLJIT_SUB, SLJIT_SCRATCH_REG2, 0, STACK_TOP, 0, SLJIT_IMM, CALLOUT_ARG_SIZE);
5160    GET_LOCAL_BASE(SLJIT_SCRATCH_REG3, 0, OVECTOR_START);
5161    sljit_emit_ijump(compiler, SLJIT_CALL3, SLJIT_IMM, SLJIT_FUNC_OFFSET(do_callout));
5162    OP1(SLJIT_MOV_SI, SLJIT_RETURN_REG, 0, SLJIT_RETURN_REG, 0);
5163    OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), LOCALS0);
5164    free_stack(common, CALLOUT_ARG_SIZE / sizeof(sljit_sw));
5165    
5166    /* Check return value. */
5167    OP2(SLJIT_SUB | SLJIT_SET_S, SLJIT_UNUSED, 0, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
5168    add_jump(compiler, &backtrack->topbacktracks, JUMP(SLJIT_C_SIG_GREATER));
5169    if (common->forced_quit_label == NULL)
5170      add_jump(compiler, &common->forced_quit, JUMP(SLJIT_C_SIG_LESS));
5171  else  else
5172    JUMPTO(SLJIT_FAST_CALL, entry->entry);    JUMPTO(SLJIT_C_SIG_LESS, common->forced_quit_label);
5173  /* Leave if the match is failed. */  return cc + 2 + 2 * LINK_SIZE;
 add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 0));  
 return cc + 1 + LINK_SIZE;  
5174  }  }
5175    
5176  static pcre_uchar *compile_assert_trypath(compiler_common *common, pcre_uchar *cc, assert_backtrack *backtrack, BOOL conditional)  #undef CALLOUT_ARG_SIZE
5177    #undef CALLOUT_ARG_OFFSET
5178    
5179    static pcre_uchar *compile_assert_matchingpath(compiler_common *common, pcre_uchar *cc, assert_backtrack *backtrack, BOOL conditional)
5180  {  {
5181  DEFINE_COMPILER;  DEFINE_COMPILER;
5182  int framesize;  int framesize;
5183  int localptr;  int private_data_ptr;
5184  backtrack_common altbacktrack;  backtrack_common altbacktrack;
5185  pcre_uchar *ccbegin;  pcre_uchar *ccbegin;
5186  pcre_uchar opcode;  pcre_uchar opcode;
# Line 4192  jump_list *tmp = NULL; Line 5189  jump_list *tmp = NULL;
5189  jump_list **target = (conditional) ? &backtrack->condfailed : &backtrack->common.topbacktracks;  jump_list **target = (conditional) ? &backtrack->condfailed : &backtrack->common.topbacktracks;
5190  jump_list **found;  jump_list **found;
5191  /* Saving previous accept variables. */  /* Saving previous accept variables. */
5192  struct sljit_label *save_leavelabel = common->leavelabel;  struct sljit_label *save_quit_label = common->quit_label;
5193  struct sljit_label *save_acceptlabel = common->acceptlabel;  struct sljit_label *save_accept_label = common->accept_label;
5194  jump_list *save_leave = common->leave;  jump_list *save_quit = common->quit;
5195  jump_list *save_accept = common->accept;  jump_list *save_accept = common->accept;
5196  struct sljit_jump *jump;  struct sljit_jump *jump;
5197  struct sljit_jump *brajump = NULL;  struct sljit_jump *brajump = NULL;
# Line 4205  if (*cc == OP_BRAZERO || *cc == OP_BRAMI Line 5202  if (*cc == OP_BRAZERO || *cc == OP_BRAMI
5202    bra = *cc;    bra = *cc;
5203    cc++;    cc++;
5204    }    }
5205  localptr = PRIV_DATA(cc);  private_data_ptr = PRIVATE_DATA(cc);
5206  SLJIT_ASSERT(localptr != 0);  SLJIT_ASSERT(private_data_ptr != 0);
5207  framesize = get_framesize(common, cc, FALSE);  framesize = get_framesize(common, cc, FALSE);
5208  backtrack->framesize = framesize;  backtrack->framesize = framesize;
5209  backtrack->localptr = localptr;  backtrack->private_data_ptr = private_data_ptr;
5210  opcode = *cc;  opcode = *cc;
5211  SLJIT_ASSERT(opcode >= OP_ASSERT && opcode <= OP_ASSERTBACK_NOT);  SLJIT_ASSERT(opcode >= OP_ASSERT && opcode <= OP_ASSERTBACK_NOT);
5212  found = (opcode == OP_ASSERT || opcode == OP_ASSERTBACK) ? &tmp : target;  found = (opcode == OP_ASSERT || opcode == OP_ASSERTBACK) ? &tmp : target;
# Line 4226  if (bra == OP_BRAMINZERO) Line 5223  if (bra == OP_BRAMINZERO)
5223    
5224  if (framesize < 0)  if (framesize < 0)
5225    {    {
5226    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, STACK_TOP, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, STACK_TOP, 0);
5227    allocate_stack(common, 1);    allocate_stack(common, 1);
5228    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
5229    }    }
5230  else  else
5231    {    {
5232    allocate_stack(common, framesize + 2);    allocate_stack(common, framesize + 2);
5233    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr);    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr);
5234    OP2(SLJIT_SUB, TMP2, 0, STACK_TOP, 0, SLJIT_IMM, -STACK(framesize + 1));    OP2(SLJIT_SUB, TMP2, 0, STACK_TOP, 0, SLJIT_IMM, -STACK(framesize + 1));
5235    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, TMP2, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, TMP2, 0);
5236    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
5237    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), TMP1, 0);
5238    init_frame(common, ccbegin, framesize + 1, 2, FALSE);    init_frame(common, ccbegin, framesize + 1, 2, FALSE);
5239    }    }
5240    
5241  memset(&altbacktrack, 0, sizeof(backtrack_common));  memset(&altbacktrack, 0, sizeof(backtrack_common));
5242  common->leavelabel = NULL;  common->quit_label = NULL;
5243  common->leave = NULL;  common->quit = NULL;
5244  while (1)  while (1)
5245    {    {
5246    common->acceptlabel = NULL;    common->accept_label = NULL;
5247    common->accept = NULL;    common->accept = NULL;
5248    altbacktrack.top = NULL;    altbacktrack.top = NULL;
5249    altbacktrack.topbacktracks = NULL;    altbacktrack.topbacktracks = NULL;
# Line 4255  while (1) Line 5252  while (1)
5252      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
5253    
5254    altbacktrack.cc = ccbegin;    altbacktrack.cc = ccbegin;
5255    compile_trypath(common, ccbegin + 1 + LINK_SIZE, cc, &altbacktrack);    compile_matchingpath(common, ccbegin + 1 + LINK_SIZE, cc, &altbacktrack);
5256    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
5257      {      {
5258      common->leavelabel = save_leavelabel;      common->quit_label = save_quit_label;
5259      common->acceptlabel = save_acceptlabel;      common->accept_label = save_accept_label;
5260      common->leave = save_leave;      common->quit = save_quit;
5261      common->accept = save_accept;      common->accept = save_accept;
5262      return NULL;      return NULL;
5263      }      }
5264    common->acceptlabel = LABEL();    common->accept_label = LABEL();
5265    if (common->accept != NULL)    if (common->accept != NULL)
5266      set_jumps(common->accept, common->acceptlabel);      set_jumps(common->accept, common->accept_label);
5267    
5268    /* Reset stack. */    /* Reset stack. */
5269    if (framesize < 0)    if (framesize < 0)
5270      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr);      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr);
5271    else {    else {
5272      if ((opcode != OP_ASSERT_NOT && opcode != OP_ASSERTBACK_NOT) || conditional)      if ((opcode != OP_ASSERT_NOT && opcode != OP_ASSERTBACK_NOT) || conditional)
5273        {        {
5274        /* We don't need to keep the STR_PTR, only the previous localptr. */        /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
5275        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_sw));
5276        }        }
5277      else      else
5278        {        {
5279        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr);        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr);
5280        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
5281        }        }
5282    }    }
# Line 4295  while (1) Line 5292  while (1)
5292          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);
5293        else        else
5294          {          {
5295          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_w));          OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
5296          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (framesize + 1) * sizeof(sljit_w));          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), (framesize + 1) * sizeof(sljit_sw));
5297          OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, TMP1, 0);          OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, TMP1, 0);
5298          }          }
5299        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
5300        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
5301        }        }
5302      else if (framesize >= 0)      else if (framesize >= 0)
5303        {        {
5304        /* For OP_BRA and OP_BRAMINZERO. */        /* For OP_BRA and OP_BRAMINZERO. */
5305        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_w));        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
5306        }        }
5307      }      }
5308    add_jump(compiler, found, JUMP(SLJIT_JUMP));    add_jump(compiler, found, JUMP(SLJIT_JUMP));
5309    
5310    compile_backtrackpath(common, altbacktrack.top);    compile_backtrackingpath(common, altbacktrack.top);
5311    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))    if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
5312      {      {
5313      common->leavelabel = save_leavelabel;      common->quit_label = save_quit_label;
5314      common->acceptlabel = save_acceptlabel;      common->accept_label = save_accept_label;
5315      common->leave = save_leave;      common->quit = save_quit;
5316      common->accept = save_accept;      common->accept = save_accept;
5317      return NULL;      return NULL;
5318      }      }
# Line 4328  while (1) Line 5325  while (1)
5325    cc += GET(cc, 1);    cc += GET(cc, 1);
5326    }    }
5327  /* None of them matched. */  /* None of them matched. */
5328  if (common->leave != NULL)  if (common->quit != NULL)
5329    set_jumps(common->leave, LABEL());    set_jumps(common->quit, LABEL());
5330    
5331  if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)  if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)
5332    {    {
# Line 4356  if (opcode == OP_ASSERT || opcode == OP_ Line 5353  if (opcode == OP_ASSERT || opcode == OP_
5353        }        }
5354      else      else
5355        free_stack(common, framesize + 2);        free_stack(common, framesize + 2);
5356      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, TMP1, 0);      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, TMP1, 0);
5357      }      }
5358    jump = JUMP(SLJIT_JUMP);    jump = JUMP(SLJIT_JUMP);
5359    if (bra != OP_BRAZERO)    if (bra != OP_BRAZERO)
# Line 4370  if (opcode == OP_ASSERT || opcode == OP_ Line 5367  if (opcode == OP_ASSERT || opcode == OP_
5367      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);      OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);
5368      /* Keep the STR_PTR on the top of the stack. */      /* Keep the STR_PTR on the top of the stack. */
5369      if (bra == OP_BRAZERO)      if (bra == OP_BRAZERO)
5370        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
5371      else if (bra == OP_BRAMINZERO)      else if (bra == OP_BRAMINZERO)
5372        {        {
5373        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, sizeof(sljit_sw));
5374        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
5375        }        }
5376      }      }
# Line 4381  if (opcode == OP_ASSERT || opcode == OP_ Line 5378  if (opcode == OP_ASSERT || opcode == OP_
5378      {      {
5379      if (bra == OP_BRA)      if (bra == OP_BRA)
5380        {        {
5381        /* We don't need to keep the STR_PTR, only the previous localptr. */        /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
5382        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, SLJIT_IMM, (framesize + 1) * sizeof(sljit_sw));
5383        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), 0);
5384        }        }
5385      else      else
5386        {        {
5387        /* We don't need to keep the STR_PTR, only the previous localptr. */        /* We don't need to keep the STR_PTR, only the previous private_data_ptr. */
5388        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, SLJIT_IMM, (framesize + 2) * sizeof(sljit_w));        OP2(SLJIT_ADD, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, SLJIT_IMM, (framesize + 2) * sizeof(sljit_sw));
5389        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
5390        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), bra == OP_BRAZERO ? STR_PTR : SLJIT_IMM, 0);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), bra == OP_BRAZERO ? STR_PTR : SLJIT_IMM, 0);
5391        }        }
# Line 4396  if (opcode == OP_ASSERT || opcode == OP_ Line 5393  if (opcode == OP_ASSERT || opcode == OP_
5393    
5394    if (bra == OP_BRAZERO)    if (bra == OP_BRAZERO)
5395      {      {
5396      backtrack->trypath = LABEL();      backtrack->matchingpath = LABEL();
5397      sljit_set_label(jump, backtrack->trypath);      sljit_set_label(jump, backtrack->matchingpath);
5398      }      }
5399    else if (bra == OP_BRAMINZERO)    else if (bra == OP_BRAMINZERO)
5400      {      {
5401      JUMPTO(SLJIT_JUMP, backtrack->trypath);      JUMPTO(SLJIT_JUMP, backtrack->matchingpath);
5402      JUMPHERE(brajump);      JUMPHERE(brajump);
5403      if (framesize >= 0)      if (framesize >= 0)
5404        {        {
5405        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr);        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr);
5406        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
5407        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), localptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_w));        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), private_data_ptr, SLJIT_MEM1(STACK_TOP), framesize * sizeof(sljit_sw));
5408        }        }
5409      set_jumps(backtrack->common.topbacktracks, LABEL());      set_jumps(backtrack->common.topbacktracks, LABEL());
5410      }      }
# Line 4435  else Line 5432  else
5432        }        }
5433      else      else