/[pcre]/code/tags/pcre-8.37/pcre_jit_compile.c
ViewVC logotype

Diff of /code/tags/pcre-8.37/pcre_jit_compile.c

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

revision 1427 by zherczeg, Wed Jan 1 15:15:09 2014 UTC revision 1474 by zherczeg, Thu Apr 24 06:43:50 2014 UTC
# Line 179  typedef struct jit_arguments { Line 179  typedef struct jit_arguments {
179    
180  typedef struct executable_functions {  typedef struct executable_functions {
181    void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];    void *executable_funcs[JIT_NUMBER_OF_COMPILE_MODES];
182      sljit_uw *read_only_data[JIT_NUMBER_OF_COMPILE_MODES];
183      sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];
184    PUBL(jit_callback) callback;    PUBL(jit_callback) callback;
185    void *userdata;    void *userdata;
186    pcre_uint32 top_bracket;    pcre_uint32 top_bracket;
187    pcre_uint32 limit_match;    pcre_uint32 limit_match;
   sljit_uw executable_sizes[JIT_NUMBER_OF_COMPILE_MODES];  
188  } executable_functions;  } executable_functions;
189    
190  typedef struct jump_list {  typedef struct jump_list {
# Line 197  typedef struct stub_list { Line 198  typedef struct stub_list {
198    struct stub_list *next;    struct stub_list *next;
199  } stub_list;  } stub_list;
200    
201    typedef struct label_addr_list {
202      struct sljit_label *label;
203      sljit_uw *addr;
204      struct label_addr_list *next;
205    } label_addr_list;
206    
207  enum frame_types {  enum frame_types {
208    no_frame = -1,    no_frame = -1,
209    no_stack = -2    no_stack = -2
# Line 315  typedef struct compiler_common { Line 322  typedef struct compiler_common {
322    pcre_uchar *start;    pcre_uchar *start;
323    /* Maps private data offset to each opcode. */    /* Maps private data offset to each opcode. */
324    sljit_si *private_data_ptrs;    sljit_si *private_data_ptrs;
325      /* This read-only data is available during runtime. */
326      sljit_uw *read_only_data;
327      /* The total size of the read-only data. */
328      sljit_uw read_only_data_size;
329      /* The next free entry of the read_only_data. */
330      sljit_uw *read_only_data_ptr;
331    /* Tells whether the capturing bracket is optimized. */    /* Tells whether the capturing bracket is optimized. */
332    pcre_uint8 *optimized_cbracket;    pcre_uint8 *optimized_cbracket;
333    /* Tells whether the starting offset is a target of then. */    /* Tells whether the starting offset is a target of then. */
# Line 349  typedef struct compiler_common { Line 362  typedef struct compiler_common {
362    sljit_sw lcc;    sljit_sw lcc;
363    /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */    /* Mode can be PCRE_STUDY_JIT_COMPILE and others. */
364    int mode;    int mode;
365      /* TRUE, when minlength is greater than 0. */
366      BOOL might_be_empty;
367    /* \K is found in the pattern. */    /* \K is found in the pattern. */
368    BOOL has_set_som;    BOOL has_set_som;
369    /* (*SKIP:arg) is found in the pattern. */    /* (*SKIP:arg) is found in the pattern. */
# Line 383  typedef struct compiler_common { Line 398  typedef struct compiler_common {
398    struct sljit_label *quit_label;    struct sljit_label *quit_label;
399    struct sljit_label *forced_quit_label;    struct sljit_label *forced_quit_label;
400    struct sljit_label *accept_label;    struct sljit_label *accept_label;
401      struct sljit_label *ff_newline_shortcut;
402    stub_list *stubs;    stub_list *stubs;
403      label_addr_list *label_addrs;
404    recurse_entry *entries;    recurse_entry *entries;
405    recurse_entry *currententry;    recurse_entry *currententry;
406    jump_list *partialmatch;    jump_list *partialmatch;
# Line 537  cc += 1 + LINK_SIZE; Line 554  cc += 1 + LINK_SIZE;
554  return cc;  return cc;
555  }  }
556    
557    static int no_alternatives(pcre_uchar* cc)
558    {
559    int count = 0;
560    SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
561    do
562      {
563      cc += GET(cc, 1);
564      count++;
565      }
566    while (*cc == OP_ALT);
567    SLJIT_ASSERT(*cc >= OP_KET && *cc <= OP_KETRPOS);
568    return count;
569    }
570    
571  static int ones_in_half_byte[16] = {  static int ones_in_half_byte[16] = {
572    /* 0 */ 0, 1, 1, 2, /* 4 */ 1, 2, 2, 3,    /* 0 */ 0, 1, 1, 2, /* 4 */ 1, 2, 2, 3,
573    /* 8 */ 1, 2, 2, 3, /* 12 */ 2, 3, 3, 4    /* 8 */ 1, 2, 2, 3, /* 12 */ 2, 3, 3, 4
# Line 761  while (cc < ccend) Line 792  while (cc < ccend)
792      {      {
793      case OP_SET_SOM:      case OP_SET_SOM:
794      common->has_set_som = TRUE;      common->has_set_som = TRUE;
795        common->might_be_empty = TRUE;
796      cc += 1;      cc += 1;
797      break;      break;
798    
# Line 770  while (cc < ccend) Line 802  while (cc < ccend)
802      cc += 1 + IMM2_SIZE;      cc += 1 + IMM2_SIZE;
803      break;      break;
804    
805        case OP_BRA:
806        case OP_CBRA:
807        case OP_SBRA:
808        case OP_SCBRA:
809        count = no_alternatives(cc);
810        if (count > 4)
811          common->read_only_data_size += count * sizeof(sljit_uw);
812        cc += 1 + LINK_SIZE + (*cc == OP_CBRA || *cc == OP_SCBRA ? IMM2_SIZE : 0);
813        break;
814    
815      case OP_CBRAPOS:      case OP_CBRAPOS:
816      case OP_SCBRAPOS:      case OP_SCBRAPOS:
817      common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;      common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] = 0;
# Line 2028  while (list_item) Line 2070  while (list_item)
2070  common->stubs = NULL;  common->stubs = NULL;
2071  }  }
2072    
2073    static void add_label_addr(compiler_common *common)
2074    {
2075    DEFINE_COMPILER;
2076    label_addr_list *label_addr;
2077    
2078    label_addr = sljit_alloc_memory(compiler, sizeof(label_addr_list));
2079    if (label_addr == NULL)
2080      return;
2081    label_addr->label = LABEL();
2082    label_addr->addr = common->read_only_data_ptr;
2083    label_addr->next = common->label_addrs;
2084    common->label_addrs = label_addr;
2085    common->read_only_data_ptr++;
2086    }
2087    
2088  static SLJIT_INLINE void count_match(compiler_common *common)  static SLJIT_INLINE void count_match(compiler_common *common)
2089  {  {
2090  DEFINE_COMPILER;  DEFINE_COMPILER;
# Line 2511  if (common->utf) Line 2568  if (common->utf)
2568    
2569  #if defined SUPPORT_UTF && defined COMPILE_PCRE8  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
2570    
2571  static BOOL is_char7_bitset(const pcre_uint8* bitset, BOOL nclass)  static BOOL is_char7_bitset(const pcre_uint8 *bitset, BOOL nclass)
2572  {  {
2573  /* Tells whether the character codes below 128 are enough  /* Tells whether the character codes below 128 are enough
2574  to determine a match. */  to determine a match. */
# Line 3093  if (newlinecheck) Line 3150  if (newlinecheck)
3150  return mainloop;  return mainloop;
3151  }  }
3152    
3153  static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uint32 *chars, int max_chars)  #define MAX_N_CHARS 16
3154    #define MAX_N_BYTES 8
3155    
3156    static SLJIT_INLINE void add_prefix_byte(pcre_uint8 byte, pcre_uint8 *bytes)
3157    {
3158    pcre_uint8 len = bytes[0];
3159    int i;
3160    
3161    if (len == 255)
3162      return;
3163    
3164    if (len == 0)
3165      {
3166      bytes[0] = 1;
3167      bytes[1] = byte;
3168      return;
3169      }
3170    
3171    for (i = len; i > 0; i--)
3172      if (bytes[i] == byte)
3173        return;
3174    
3175    if (len >= MAX_N_BYTES - 1)
3176      {
3177      bytes[0] = 255;
3178      return;
3179      }
3180    
3181    len++;
3182    bytes[len] = byte;
3183    bytes[0] = len;
3184    }
3185    
3186    static int scan_prefix(compiler_common *common, pcre_uchar *cc, pcre_uint32 *chars, pcre_uint8 *bytes, int max_chars)
3187  {  {
3188  /* Recursive function, which scans prefix literals. */  /* Recursive function, which scans prefix literals. */
3189    BOOL last, any, caseless;
3190  int len, repeat, len_save, consumed = 0;  int len, repeat, len_save, consumed = 0;
3191  pcre_uint32 caseless, chr, mask;  pcre_uint32 chr, mask;
3192  pcre_uchar *alternative, *cc_save;  pcre_uchar *alternative, *cc_save, *oc;
3193  BOOL last, any;  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3194    pcre_uchar othercase[8];
3195    #elif defined SUPPORT_UTF && defined COMPILE_PCRE16
3196    pcre_uchar othercase[2];
3197    #else
3198    pcre_uchar othercase[1];
3199    #endif
3200    
3201  repeat = 1;  repeat = 1;
3202  while (TRUE)  while (TRUE)
3203    {    {
3204    last = TRUE;    last = TRUE;
3205    any = FALSE;    any = FALSE;
3206    caseless = 0;    caseless = FALSE;
3207    switch (*cc)    switch (*cc)
3208      {      {
3209      case OP_CHARI:      case OP_CHARI:
3210      caseless = 1;      caseless = TRUE;
3211      case OP_CHAR:      case OP_CHAR:
3212      last = FALSE;      last = FALSE;
3213      cc++;      cc++;
# Line 3131  while (TRUE) Line 3228  while (TRUE)
3228      cc++;      cc++;
3229      continue;      continue;
3230    
3231        case OP_ASSERT:
3232        case OP_ASSERT_NOT:
3233        case OP_ASSERTBACK:
3234        case OP_ASSERTBACK_NOT:
3235        cc = bracketend(cc);
3236        continue;
3237    
3238        case OP_PLUSI:
3239        case OP_MINPLUSI:
3240        case OP_POSPLUSI:
3241        caseless = TRUE;
3242      case OP_PLUS:      case OP_PLUS:
3243      case OP_MINPLUS:      case OP_MINPLUS:
3244      case OP_POSPLUS:      case OP_POSPLUS:
# Line 3138  while (TRUE) Line 3246  while (TRUE)
3246      break;      break;
3247    
3248      case OP_EXACTI:      case OP_EXACTI:
3249      caseless = 1;      caseless = TRUE;
3250      case OP_EXACT:      case OP_EXACT:
3251      repeat = GET2(cc, 1);      repeat = GET2(cc, 1);
3252      last = FALSE;      last = FALSE;
3253      cc += 1 + IMM2_SIZE;      cc += 1 + IMM2_SIZE;
3254      break;      break;
3255    
3256      case OP_PLUSI:      case OP_QUERYI:
3257      case OP_MINPLUSI:      case OP_MINQUERYI:
3258      case OP_POSPLUSI:      case OP_POSQUERYI:
3259      caseless = 1;      caseless = TRUE;
3260        case OP_QUERY:
3261        case OP_MINQUERY:
3262        case OP_POSQUERY:
3263        len = 1;
3264      cc++;      cc++;
3265    #ifdef SUPPORT_UTF
3266        if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
3267    #endif
3268        max_chars = scan_prefix(common, cc + len, chars, bytes, max_chars);
3269        if (max_chars == 0)
3270          return consumed;
3271        last = FALSE;
3272      break;      break;
3273    
3274      case OP_KET:      case OP_KET:
# Line 3169  while (TRUE) Line 3288  while (TRUE)
3288      alternative = cc + GET(cc, 1);      alternative = cc + GET(cc, 1);
3289      while (*alternative == OP_ALT)      while (*alternative == OP_ALT)
3290        {        {
3291        max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, max_chars);        max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, bytes, max_chars);
3292        if (max_chars == 0)        if (max_chars == 0)
3293          return consumed;          return consumed;
3294        alternative += GET(alternative, 1);        alternative += GET(alternative, 1);
# Line 3181  while (TRUE) Line 3300  while (TRUE)
3300      continue;      continue;
3301    
3302      case OP_CLASS:      case OP_CLASS:
3303    #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3304        if (common->utf && !is_char7_bitset((const pcre_uint8 *)(cc + 1), FALSE)) return consumed;
3305    #endif
3306        any = TRUE;
3307        cc += 1 + 32 / sizeof(pcre_uchar);
3308        break;
3309    
3310      case OP_NCLASS:      case OP_NCLASS:
3311    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3312        if (common->utf) return consumed;
3313    #endif
3314      any = TRUE;      any = TRUE;
3315      cc += 1 + 32 / sizeof(pcre_uchar);      cc += 1 + 32 / sizeof(pcre_uchar);
3316      break;      break;
3317    
3318  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
3319      case OP_XCLASS:      case OP_XCLASS:
3320    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3321        if (common->utf) return consumed;
3322    #endif
3323      any = TRUE;      any = TRUE;
3324      cc += GET(cc, 1);      cc += GET(cc, 1);
3325      break;      break;
3326  #endif  #endif
3327    
     case OP_NOT_DIGIT:  
3328      case OP_DIGIT:      case OP_DIGIT:
3329      case OP_NOT_WHITESPACE:  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3330        if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_digit, FALSE))
3331          return consumed;
3332    #endif
3333        any = TRUE;
3334        cc++;
3335        break;
3336    
3337      case OP_WHITESPACE:      case OP_WHITESPACE:
3338      case OP_NOT_WORDCHAR:  #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3339        if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_space, FALSE))
3340          return consumed;
3341    #endif
3342        any = TRUE;
3343        cc++;
3344        break;
3345    
3346      case OP_WORDCHAR:      case OP_WORDCHAR:
3347    #if defined SUPPORT_UTF && defined COMPILE_PCRE8
3348        if (common->utf && !is_char7_bitset((const pcre_uint8 *)common->ctypes - cbit_length + cbit_word, FALSE))
3349          return consumed;
3350    #endif
3351        any = TRUE;
3352        cc++;
3353        break;
3354    
3355        case OP_NOT:
3356        case OP_NOTI:
3357        cc++;
3358        /* Fall through. */
3359        case OP_NOT_DIGIT:
3360        case OP_NOT_WHITESPACE:
3361        case OP_NOT_WORDCHAR:
3362      case OP_ANY:      case OP_ANY:
3363      case OP_ALLANY:      case OP_ALLANY:
3364    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3365        if (common->utf) return consumed;
3366    #endif
3367      any = TRUE;      any = TRUE;
3368      cc++;      cc++;
3369      break;      break;
# Line 3208  while (TRUE) Line 3371  while (TRUE)
3371  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3372      case OP_NOTPROP:      case OP_NOTPROP:
3373      case OP_PROP:      case OP_PROP:
3374    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3375        if (common->utf) return consumed;
3376    #endif
3377      any = TRUE;      any = TRUE;
3378      cc += 1 + 2;      cc += 1 + 2;
3379      break;      break;
# Line 3218  while (TRUE) Line 3384  while (TRUE)
3384      cc += 1 + IMM2_SIZE;      cc += 1 + IMM2_SIZE;
3385      continue;      continue;
3386    
3387        case OP_NOTEXACT:
3388        case OP_NOTEXACTI:
3389    #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
3390        if (common->utf) return consumed;
3391    #endif
3392        any = TRUE;
3393        repeat = GET2(cc, 1);
3394        cc += 1 + IMM2_SIZE + 1;
3395        break;
3396    
3397      default:      default:
3398      return consumed;      return consumed;
3399      }      }
3400    
3401    if (any)    if (any)
3402      {      {
 #ifdef SUPPORT_UTF  
     if (common->utf) return consumed;  
 #endif  
3403  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
3404      mask = 0xff;      mask = 0xff;
3405  #elif defined COMPILE_PCRE16  #elif defined COMPILE_PCRE16
# Line 3241  while (TRUE) Line 3414  while (TRUE)
3414        {        {
3415        chars[0] = mask;        chars[0] = mask;
3416        chars[1] = mask;        chars[1] = mask;
3417          bytes[0] = 255;
3418    
3419          consumed++;
3420        if (--max_chars == 0)        if (--max_chars == 0)
3421          return consumed;          return consumed;
       consumed++;  
3422        chars += 2;        chars += 2;
3423          bytes += MAX_N_BYTES;
3424        }        }
3425      while (--repeat > 0);      while (--repeat > 0);
3426    
# Line 3258  while (TRUE) Line 3433  while (TRUE)
3433    if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);    if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
3434  #endif  #endif
3435    
3436    if (caseless != 0 && char_has_othercase(common, cc))    if (caseless && char_has_othercase(common, cc))
3437      {      {
3438      caseless = char_get_othercase_bit(common, cc);  #ifdef SUPPORT_UTF
3439      if (caseless == 0)      if (common->utf)
3440        return consumed;        {
3441  #ifdef COMPILE_PCRE8        GETCHAR(chr, cc);
3442      caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 8));        if ((int)PRIV(ord2utf)(char_othercase(common, chr), othercase) != len)
3443  #else          return consumed;
3444      if ((caseless & 0x100) != 0)        }
       caseless = ((caseless & 0xff) << 16) | (len - (caseless >> 9));  
3445      else      else
       caseless = ((caseless & 0xff) << 8) | (len - (caseless >> 9));  
3446  #endif  #endif
3447          {
3448          chr = *cc;
3449          othercase[0] = TABLE_GET(chr, common->fcc, chr);
3450          }
3451      }      }
3452    else    else
3453      caseless = 0;      caseless = FALSE;
3454    
3455    len_save = len;    len_save = len;
3456    cc_save = cc;    cc_save = cc;
3457    while (TRUE)    while (TRUE)
3458      {      {
3459        oc = othercase;
3460      do      do
3461        {        {
3462        chr = *cc;        chr = *cc;
# Line 3286  while (TRUE) Line 3464  while (TRUE)
3464        if (SLJIT_UNLIKELY(chr == NOTACHAR))        if (SLJIT_UNLIKELY(chr == NOTACHAR))
3465          return consumed;          return consumed;
3466  #endif  #endif
3467          add_prefix_byte((pcre_uint8)chr, bytes);
3468    
3469        mask = 0;        mask = 0;
3470        if ((pcre_uint32)len == (caseless & 0xff))        if (caseless)
3471          {          {
3472          mask = caseless >> 8;          add_prefix_byte((pcre_uint8)*oc, bytes);
3473            mask = *cc ^ *oc;
3474          chr |= mask;          chr |= mask;
3475          }          }
3476    
3477    #ifdef COMPILE_PCRE32
3478          if (chars[0] == NOTACHAR && chars[1] == 0)
3479    #else
3480        if (chars[0] == NOTACHAR)        if (chars[0] == NOTACHAR)
3481    #endif
3482          {          {
3483          chars[0] = chr;          chars[0] = chr;
3484          chars[1] = mask;          chars[1] = mask;
# Line 3307  while (TRUE) Line 3492  while (TRUE)
3492          }          }
3493    
3494        len--;        len--;
3495          consumed++;
3496        if (--max_chars == 0)        if (--max_chars == 0)
3497          return consumed;          return consumed;
       consumed++;  
3498        chars += 2;        chars += 2;
3499          bytes += MAX_N_BYTES;
3500        cc++;        cc++;
3501          oc++;
3502        }        }
3503      while (len > 0);      while (len > 0);
3504    
# Line 3328  while (TRUE) Line 3515  while (TRUE)
3515    }    }
3516  }  }
3517    
 #define MAX_N_CHARS 16  
   
3518  static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common, BOOL firstline)  static SLJIT_INLINE BOOL fast_forward_first_n_chars(compiler_common *common, BOOL firstline)
3519  {  {
3520  DEFINE_COMPILER;  DEFINE_COMPILER;
3521  struct sljit_label *start;  struct sljit_label *start;
3522  struct sljit_jump *quit;  struct sljit_jump *quit;
3523  pcre_uint32 chars[MAX_N_CHARS * 2];  pcre_uint32 chars[MAX_N_CHARS * 2];
3524    pcre_uint8 bytes[MAX_N_CHARS * MAX_N_BYTES];
3525  pcre_uint8 ones[MAX_N_CHARS];  pcre_uint8 ones[MAX_N_CHARS];
 pcre_uint32 mask;  
 int i, max;  
3526  int offsets[3];  int offsets[3];
3527    pcre_uint32 mask;
3528    pcre_uint8 *byte_set, *byte_set_end;
3529    int i, max, from;
3530    int range_right = -1, range_len = 3 - 1;
3531    sljit_ub *update_table = NULL;
3532    BOOL in_range;
3533    
3534    /* This is even TRUE, if both are NULL. */
3535    SLJIT_ASSERT(common->read_only_data_ptr == common->read_only_data);
3536    
3537  for (i = 0; i < MAX_N_CHARS; i++)  for (i = 0; i < MAX_N_CHARS; i++)
3538    {    {
3539    chars[i << 1] = NOTACHAR;    chars[i << 1] = NOTACHAR;
3540    chars[(i << 1) + 1] = 0;    chars[(i << 1) + 1] = 0;
3541      bytes[i * MAX_N_BYTES] = 0;
3542    }    }
3543    
3544  max = scan_prefix(common, common->start, chars, MAX_N_CHARS);  max = scan_prefix(common, common->start, chars, bytes, MAX_N_CHARS);
3545    
3546  if (max <= 1)  if (max <= 1)
3547    return FALSE;    return FALSE;
# Line 3364  for (i = 0; i < max; i++) Line 3558  for (i = 0; i < max; i++)
3558      }      }
3559    }    }
3560    
3561    in_range = FALSE;
3562    from = 0;   /* Prevent compiler "uninitialized" warning */
3563    for (i = 0; i <= max; i++)
3564      {
3565      if (in_range && (i - from) > range_len && (bytes[(i - 1) * MAX_N_BYTES] <= 4))
3566        {
3567        range_len = i - from;
3568        range_right = i - 1;
3569        }
3570    
3571      if (i < max && bytes[i * MAX_N_BYTES] < 255)
3572        {
3573        if (!in_range)
3574          {
3575          in_range = TRUE;
3576          from = i;
3577          }
3578        }
3579      else if (in_range)
3580        in_range = FALSE;
3581      }
3582    
3583    if (range_right >= 0)
3584      {
3585      /* Since no data is consumed (see the assert in the beginning
3586      of this function), this space can be reallocated. */
3587      if (common->read_only_data)
3588        SLJIT_FREE(common->read_only_data);
3589    
3590      common->read_only_data_size += 256;
3591      common->read_only_data = (sljit_uw *)SLJIT_MALLOC(common->read_only_data_size);
3592      if (common->read_only_data == NULL)
3593        return TRUE;
3594    
3595      update_table = (sljit_ub *)common->read_only_data;
3596      common->read_only_data_ptr = (sljit_uw *)(update_table + 256);
3597      memset(update_table, IN_UCHARS(range_len), 256);
3598    
3599      for (i = 0; i < range_len; i++)
3600        {
3601        byte_set = bytes + ((range_right - i) * MAX_N_BYTES);
3602        SLJIT_ASSERT(byte_set[0] > 0 && byte_set[0] < 255);
3603        byte_set_end = byte_set + byte_set[0];
3604        byte_set++;
3605        while (byte_set <= byte_set_end)
3606          {
3607          if (update_table[*byte_set] > IN_UCHARS(i))
3608            update_table[*byte_set] = IN_UCHARS(i);
3609          byte_set++;
3610          }
3611        }
3612      }
3613    
3614  offsets[0] = -1;  offsets[0] = -1;
3615  /* Scan forward. */  /* Scan forward. */
3616  for (i = 0; i < max; i++)  for (i = 0; i < max; i++)
# Line 3372  for (i = 0; i < max; i++) Line 3619  for (i = 0; i < max; i++)
3619      break;      break;
3620    }    }
3621    
3622  if (offsets[0] == -1)  if (offsets[0] < 0 && range_right < 0)
3623    return FALSE;    return FALSE;
3624    
3625  /* Scan backward. */  if (offsets[0] >= 0)
 offsets[1] = -1;  
 for (i = max - 1; i > offsets[0]; i--)  
   if (ones[i] <= 2) {  
     offsets[1] = i;  
     break;  
   }  
   
 offsets[2] = -1;  
 if (offsets[1] >= 0)  
3626    {    {
3627    /* Scan from middle. */    /* Scan backward. */
3628    for (i = (offsets[0] + offsets[1]) / 2 + 1; i < offsets[1]; i++)    offsets[1] = -1;
3629      if (ones[i] <= 2)    for (i = max - 1; i > offsets[0]; i--)
3630        if (ones[i] <= 2 && i != range_right)
3631        {        {
3632        offsets[2] = i;        offsets[1] = i;
3633        break;        break;
3634        }        }
3635    
3636    if (offsets[2] == -1)    /* This case is handled better by fast_forward_first_char. */
3637      if (offsets[1] == -1 && offsets[0] == 0 && range_right < 0)
3638        return FALSE;
3639    
3640      offsets[2] = -1;
3641      /* We only search for a middle character if there is no range check. */
3642      if (offsets[1] >= 0 && range_right == -1)
3643      {      {
3644      for (i = (offsets[0] + offsets[1]) / 2; i > offsets[0]; i--)      /* Scan from middle. */
3645        for (i = (offsets[0] + offsets[1]) / 2 + 1; i < offsets[1]; i++)
3646        if (ones[i] <= 2)        if (ones[i] <= 2)
3647          {          {
3648          offsets[2] = i;          offsets[2] = i;
3649          break;          break;
3650          }          }
3651    
3652        if (offsets[2] == -1)
3653          {
3654          for (i = (offsets[0] + offsets[1]) / 2; i > offsets[0]; i--)
3655            if (ones[i] <= 2)
3656              {
3657              offsets[2] = i;
3658              break;
3659              }
3660          }
3661      }      }
   }  
3662    
3663  SLJIT_ASSERT(offsets[1] == -1 || (offsets[0] < offsets[1]));    SLJIT_ASSERT(offsets[1] == -1 || (offsets[0] < offsets[1]));
3664  SLJIT_ASSERT(offsets[2] == -1 || (offsets[0] < offsets[2] && offsets[1] > offsets[2]));    SLJIT_ASSERT(offsets[2] == -1 || (offsets[0] < offsets[2] && offsets[1] > offsets[2]));
3665    
3666  chars[0] = chars[offsets[0] << 1];    chars[0] = chars[offsets[0] << 1];
3667  chars[1] = chars[(offsets[0] << 1) + 1];    chars[1] = chars[(offsets[0] << 1) + 1];
3668  if (offsets[2] >= 0)    if (offsets[2] >= 0)
3669    {      {
3670    chars[2] = chars[offsets[2] << 1];      chars[2] = chars[offsets[2] << 1];
3671    chars[3] = chars[(offsets[2] << 1) + 1];      chars[3] = chars[(offsets[2] << 1) + 1];
3672    }      }
3673  if (offsets[1] >= 0)    if (offsets[1] >= 0)
3674    {      {
3675    chars[4] = chars[offsets[1] << 1];      chars[4] = chars[offsets[1] << 1];
3676    chars[5] = chars[(offsets[1] << 1) + 1];      chars[5] = chars[(offsets[1] << 1) + 1];
3677        }
3678    }    }
3679    
3680  max -= 1;  max -= 1;
3681  if (firstline)  if (firstline)
3682    {    {
3683    SLJIT_ASSERT(common->first_line_end != 0);    SLJIT_ASSERT(common->first_line_end != 0);
3684      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
3685    OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);    OP1(SLJIT_MOV, TMP3, 0, STR_END, 0);
3686    OP2(SLJIT_SUB, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end, SLJIT_IMM, IN_UCHARS(max));    OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
3687      quit = CMP(SLJIT_C_LESS_EQUAL, STR_END, 0, TMP1, 0);
3688      OP1(SLJIT_MOV, STR_END, 0, TMP1, 0);
3689      JUMPHERE(quit);
3690    }    }
3691  else  else
3692    OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));    OP2(SLJIT_SUB, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
3693    
3694    #if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
3695    if (range_right >= 0)
3696      OP1(SLJIT_MOV, RETURN_ADDR, 0, SLJIT_IMM, (sljit_sw)update_table);
3697    #endif
3698    
3699  start = LABEL();  start = LABEL();
3700  quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);  quit = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
3701    
3702  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[0]));  SLJIT_ASSERT(range_right >= 0 || offsets[0] >= 0);
 if (offsets[1] >= 0)  
   OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[1]));  
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  
   
 if (chars[1] != 0)  
   OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[1]);  
 CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[0], start);  
 if (offsets[2] >= 0)  
   OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[2] - 1));  
3703    
3704  if (offsets[1] >= 0)  if (range_right >= 0)
3705    {    {
3706    if (chars[5] != 0)  #if defined COMPILE_PCRE8 || (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
3707      OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, chars[5]);    OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right));
3708    CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, chars[4], start);  #else
3709      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(range_right + 1) - 1);
3710    #endif
3711    
3712    #if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
3713      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM2(RETURN_ADDR, TMP1), 0);
3714    #else
3715      OP1(SLJIT_MOV_UB, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)update_table);
3716    #endif
3717      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
3718      CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, 0, start);
3719    }    }
3720    
3721  if (offsets[2] >= 0)  if (offsets[0] >= 0)
3722    {    {
3723    if (chars[3] != 0)    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[0]));
3724      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[3]);    if (offsets[1] >= 0)
3725    CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[2], start);      OP1(MOV_UCHAR, TMP2, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[1]));
3726      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
3727    
3728      if (chars[1] != 0)
3729        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[1]);
3730      CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[0], start);
3731      if (offsets[2] >= 0)
3732        OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(offsets[2] - 1));
3733    
3734      if (offsets[1] >= 0)
3735        {
3736        if (chars[5] != 0)
3737          OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, chars[5]);
3738        CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, chars[4], start);
3739        }
3740    
3741      if (offsets[2] >= 0)
3742        {
3743        if (chars[3] != 0)
3744          OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, chars[3]);
3745        CMPTO(SLJIT_C_NOT_EQUAL, TMP1, 0, SLJIT_IMM, chars[2], start);
3746        }
3747      OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
3748    }    }
 OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));  
3749    
3750  JUMPHERE(quit);  JUMPHERE(quit);
3751    
3752  if (firstline)  if (firstline)
3753      {
3754      if (range_right >= 0)
3755        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->first_line_end);
3756    OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);    OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
3757      if (range_right >= 0)
3758        {
3759        quit = CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP1, 0);
3760        OP1(SLJIT_MOV, STR_PTR, 0, TMP1, 0);
3761        JUMPHERE(quit);
3762        }
3763      }
3764  else  else
3765    OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));    OP2(SLJIT_ADD, STR_END, 0, STR_END, 0, SLJIT_IMM, IN_UCHARS(max));
3766  return TRUE;  return TRUE;
3767  }  }
3768    
3769  #undef MAX_N_CHARS  #undef MAX_N_CHARS
3770    #undef MAX_N_BYTES
3771    
3772  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)
3773  {  {
# Line 3575  if (common->nltype == NLTYPE_FIXED && co Line 3873  if (common->nltype == NLTYPE_FIXED && co
3873    JUMPHERE(lastchar);    JUMPHERE(lastchar);
3874    
3875    if (firstline)    if (firstline)
3876      OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), POSSESSIVE0);      OP1(SLJIT_MOV, STR_END, 0, TMP3, 0);
3877    return;    return;
3878    }    }
3879    
# Line 3585  firstchar = CMP(SLJIT_C_LESS_EQUAL, STR_ Line 3883  firstchar = CMP(SLJIT_C_LESS_EQUAL, STR_
3883  skip_char_back(common);  skip_char_back(common);
3884    
3885  loop = LABEL();  loop = LABEL();
3886    common->ff_newline_shortcut = loop;
3887    
3888  read_char_range(common, common->nlmin, common->nlmax, TRUE);  read_char_range(common, common->nlmin, common->nlmax, TRUE);
3889  lastchar = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);  lastchar = CMP(SLJIT_C_GREATER_EQUAL, STR_PTR, 0, STR_END, 0);
3890  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)  if (common->nltype == NLTYPE_ANY || common->nltype == NLTYPE_ANYCRLF)
# Line 7116  if (ket == OP_KETRMAX) Line 7416  if (ket == OP_KETRMAX)
7416    
7417  if (repeat_type == OP_EXACT)  if (repeat_type == OP_EXACT)
7418    {    {
7419      count_match(common);
7420    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_LOCALS_REG), repeat_ptr, SLJIT_MEM1(SLJIT_LOCALS_REG), repeat_ptr, SLJIT_IMM, 1);    OP2(SLJIT_SUB | SLJIT_SET_E, SLJIT_MEM1(SLJIT_LOCALS_REG), repeat_ptr, SLJIT_MEM1(SLJIT_LOCALS_REG), repeat_ptr, SLJIT_IMM, 1);
7421    JUMPTO(SLJIT_C_NOT_ZERO, rmax_label);    JUMPTO(SLJIT_C_NOT_ZERO, rmax_label);
7422    }    }
# Line 7800  if (*cc == OP_FAIL) Line 8101  if (*cc == OP_FAIL)
8101    return cc + 1;    return cc + 1;
8102    }    }
8103    
8104  if (*cc == OP_ASSERT_ACCEPT || common->currententry != NULL)  if (*cc == OP_ASSERT_ACCEPT || common->currententry != NULL || !common->might_be_empty)
8105    {    {
8106    /* No need to check notempty conditions. */    /* No need to check notempty conditions. */
8107    if (common->accept_label == NULL)    if (common->accept_label == NULL)
# Line 8502  if (bra == OP_BRAZERO) Line 8803  if (bra == OP_BRAZERO)
8803  static void compile_bracket_backtrackingpath(compiler_common *common, struct backtrack_common *current)  static void compile_bracket_backtrackingpath(compiler_common *common, struct backtrack_common *current)
8804  {  {
8805  DEFINE_COMPILER;  DEFINE_COMPILER;
8806  int opcode, stacksize, count;  int opcode, stacksize, alt_count, alt_max;
8807  int offset = 0;  int offset = 0;
8808  int private_data_ptr = CURRENT_AS(bracket_backtrack)->private_data_ptr;  int private_data_ptr = CURRENT_AS(bracket_backtrack)->private_data_ptr;
8809  int repeat_ptr = 0, repeat_type = 0, repeat_count = 0;  int repeat_ptr = 0, repeat_type = 0, repeat_count = 0;
8810  pcre_uchar *cc = current->cc;  pcre_uchar *cc = current->cc;
8811  pcre_uchar *ccbegin;  pcre_uchar *ccbegin;
8812  pcre_uchar *ccprev;  pcre_uchar *ccprev;
 jump_list *jumplist = NULL;  
 jump_list *jumplistitem = NULL;  
8813  pcre_uchar bra = OP_BRA;  pcre_uchar bra = OP_BRA;
8814  pcre_uchar ket;  pcre_uchar ket;
8815  assert_backtrack *assert;  assert_backtrack *assert;
8816  BOOL has_alternatives;  BOOL has_alternatives;
8817  BOOL needs_control_head = FALSE;  BOOL needs_control_head = FALSE;
8818  struct sljit_jump *brazero = NULL;  struct sljit_jump *brazero = NULL;
8819    struct sljit_jump *alt1 = NULL;
8820    struct sljit_jump *alt2 = NULL;
8821  struct sljit_jump *once = NULL;  struct sljit_jump *once = NULL;
8822  struct sljit_jump *cond = NULL;  struct sljit_jump *cond = NULL;
8823  struct sljit_label *rmin_label = NULL;  struct sljit_label *rmin_label = NULL;
# Line 8554  if (SLJIT_UNLIKELY(opcode == OP_COND) && Line 8855  if (SLJIT_UNLIKELY(opcode == OP_COND) &&
8855  if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))  if (SLJIT_UNLIKELY(opcode == OP_ONCE_NC))
8856    opcode = OP_ONCE;    opcode = OP_ONCE;
8857    
8858    alt_max = has_alternatives ? no_alternatives(ccbegin) : 0;
8859    
8860  /* Decoding the needs_control_head in framesize. */  /* Decoding the needs_control_head in framesize. */
8861  if (opcode == OP_ONCE)  if (opcode == OP_ONCE)
8862    {    {
# Line 8667  else if (SLJIT_UNLIKELY(opcode == OP_CON Line 8970  else if (SLJIT_UNLIKELY(opcode == OP_CON
8970      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
8971      free_stack(common, 1);      free_stack(common, 1);
8972    
8973      jumplistitem = sljit_alloc_memory(compiler, sizeof(jump_list));      alt_max = 2;
8974      if (SLJIT_UNLIKELY(!jumplistitem))      alt1 = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
       return;  
     jumplist = jumplistitem;  
     jumplistitem->next = NULL;  
     jumplistitem->jump = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, 1);  
8975      }      }
8976    }    }
8977  else if (*cc == OP_ALT)  else if (has_alternatives)
8978    {    {
   /* Build a jump list. Get the last successfully matched branch index. */  
8979    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
8980    free_stack(common, 1);    free_stack(common, 1);
   count = 1;  
   do  
     {  
     /* Append as the last item. */  
     if (jumplist != NULL)  
       {  
       jumplistitem->next = sljit_alloc_memory(compiler, sizeof(jump_list));  
       jumplistitem = jumplistitem->next;  
       }  
     else  
       {  
       jumplistitem = sljit_alloc_memory(compiler, sizeof(jump_list));  
       jumplist = jumplistitem;  
       }  
   
     if (SLJIT_UNLIKELY(!jumplistitem))  
       return;  
8981    
8982      jumplistitem->next = NULL;    if (alt_max > 4)
8983      jumplistitem->jump = CMP(SLJIT_C_EQUAL, TMP1, 0, SLJIT_IMM, count++);      {
8984      cc += GET(cc, 1);      /* Table jump if alt_max is greater than 4. */
8985        sljit_emit_ijump(compiler, SLJIT_JUMP, SLJIT_MEM1(TMP1), (sljit_sw)common->read_only_data_ptr);
8986        add_label_addr(common);
8987        }
8988      else
8989        {
8990        if (alt_max == 4)
8991          alt2 = CMP(SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
8992        alt1 = CMP(SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, sizeof(sljit_uw));
8993      }      }
   while (*cc == OP_ALT);  
   
   cc = ccbegin + GET(ccbegin, 1);  
8994    }    }
8995    
8996  COMPILE_BACKTRACKINGPATH(current->top);  COMPILE_BACKTRACKINGPATH(current->top);
# Line 8739  if (SLJIT_UNLIKELY(opcode == OP_COND) || Line 9025  if (SLJIT_UNLIKELY(opcode == OP_COND) ||
9025    
9026  if (has_alternatives)  if (has_alternatives)
9027    {    {
9028    count = 1;    alt_count = sizeof(sljit_uw);
9029    do    do
9030      {      {
9031      current->top = NULL;      current->top = NULL;
# Line 8815  if (has_alternatives) Line 9101  if (has_alternatives)
9101        stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);        stacksize = match_capture_common(common, stacksize, offset, private_data_ptr);
9102    
9103      if (opcode != OP_ONCE)      if (opcode != OP_ONCE)
9104        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, count++);        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, alt_count);
9105    
9106      if (offset != 0 && ket == OP_KETRMAX && common->optimized_cbracket[offset >> 1] != 0)      if (offset != 0 && ket == OP_KETRMAX && common->optimized_cbracket[offset >> 1] != 0)
9107        {        {
# Line 8828  if (has_alternatives) Line 9114  if (has_alternatives)
9114    
9115      if (opcode != OP_ONCE)      if (opcode != OP_ONCE)
9116        {        {
9117        SLJIT_ASSERT(jumplist);        if (alt_max > 4)
9118        JUMPHERE(jumplist->jump);          add_label_addr(common);
9119        jumplist = jumplist->next;        else
9120            {
9121            if (alt_count != 2 * sizeof(sljit_uw))
9122              {
9123              JUMPHERE(alt1);
9124              if (alt_max == 3 && alt_count == sizeof(sljit_uw))
9125                alt2 = CMP(SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 2 * sizeof(sljit_uw));
9126              }
9127            else
9128              {
9129              JUMPHERE(alt2);
9130              if (alt_max == 4)
9131                alt1 = CMP(SLJIT_C_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 3 * sizeof(sljit_uw));
9132              }
9133            }
9134          alt_count += sizeof(sljit_uw);
9135        }        }
9136    
9137      COMPILE_BACKTRACKINGPATH(current->top);      COMPILE_BACKTRACKINGPATH(current->top);
# Line 8839  if (has_alternatives) Line 9140  if (has_alternatives)
9140      SLJIT_ASSERT(!current->nextbacktracks);      SLJIT_ASSERT(!current->nextbacktracks);
9141      }      }
9142    while (*cc == OP_ALT);    while (*cc == OP_ALT);
   SLJIT_ASSERT(!jumplist);  
9143    
9144    if (cond != NULL)    if (cond != NULL)
9145      {      {
# Line 9440  pcre_uchar *ccend; Line 9740  pcre_uchar *ccend;
9740  executable_functions *functions;  executable_functions *functions;
9741  void *executable_func;  void *executable_func;
9742  sljit_uw executable_size;  sljit_uw executable_size;
9743    sljit_uw total_length;
9744    label_addr_list *label_addr;
9745  struct sljit_label *mainloop_label = NULL;  struct sljit_label *mainloop_label = NULL;
9746  struct sljit_label *continue_match_label;  struct sljit_label *continue_match_label;
9747  struct sljit_label *empty_match_found_label;  struct sljit_label *empty_match_found_label = NULL;
9748  struct sljit_label *empty_match_backtrack_label;  struct sljit_label *empty_match_backtrack_label = NULL;
9749  struct sljit_label *reset_match_label;  struct sljit_label *reset_match_label;
9750    struct sljit_label *quit_label;
9751  struct sljit_jump *jump;  struct sljit_jump *jump;
9752  struct sljit_jump *minlength_check_failed = NULL;  struct sljit_jump *minlength_check_failed = NULL;
9753  struct sljit_jump *reqbyte_notfound = NULL;  struct sljit_jump *reqbyte_notfound = NULL;
9754  struct sljit_jump *empty_match;  struct sljit_jump *empty_match = NULL;
 struct sljit_label *quit_label;  
9755    
9756  SLJIT_ASSERT((extra->flags & PCRE_EXTRA_STUDY_DATA) != 0);  SLJIT_ASSERT((extra->flags & PCRE_EXTRA_STUDY_DATA) != 0);
9757  study = extra->study_data;  study = extra->study_data;
# Line 9462  memset(common, 0, sizeof(compiler_common Line 9764  memset(common, 0, sizeof(compiler_common
9764  rootbacktrack.cc = (pcre_uchar *)re + re->name_table_offset + re->name_count * re->name_entry_size;  rootbacktrack.cc = (pcre_uchar *)re + re->name_table_offset + re->name_count * re->name_entry_size;
9765    
9766  common->start = rootbacktrack.cc;  common->start = rootbacktrack.cc;
9767    common->read_only_data = NULL;
9768    common->read_only_data_size = 0;
9769    common->read_only_data_ptr = NULL;
9770  common->fcc = tables + fcc_offset;  common->fcc = tables + fcc_offset;
9771  common->lcc = (sljit_sw)(tables + lcc_offset);  common->lcc = (sljit_sw)(tables + lcc_offset);
9772  common->mode = mode;  common->mode = mode;
9773    common->might_be_empty = study->minlength == 0;
9774  common->nltype = NLTYPE_FIXED;  common->nltype = NLTYPE_FIXED;
9775  switch(re->options & PCRE_NEWLINE_BITS)  switch(re->options & PCRE_NEWLINE_BITS)
9776    {    {
# Line 9537  if (common->utf) Line 9843  if (common->utf)
9843    common->bsr_nlmin = (CHAR_CR < CHAR_NL) ? CHAR_CR : CHAR_NL;    common->bsr_nlmin = (CHAR_CR < CHAR_NL) ? CHAR_CR : CHAR_NL;
9844    }    }
9845  #endif /* SUPPORT_UTF */  #endif /* SUPPORT_UTF */
9846  ccend = bracketend(rootbacktrack.cc);  ccend = bracketend(common->start);
9847    
9848  /* Calculate the local space size on the stack. */  /* Calculate the local space size on the stack. */
9849  common->ovector_start = LIMIT_MATCH + sizeof(sljit_sw);  common->ovector_start = LIMIT_MATCH + sizeof(sljit_sw);
# Line 9550  memset(common->optimized_cbracket, 0, re Line 9856  memset(common->optimized_cbracket, 0, re
9856  memset(common->optimized_cbracket, 1, re->top_bracket + 1);  memset(common->optimized_cbracket, 1, re->top_bracket + 1);
9857  #endif  #endif
9858    
9859  SLJIT_ASSERT(*rootbacktrack.cc == OP_BRA && ccend[-(1 + LINK_SIZE)] == OP_KET);  SLJIT_ASSERT(*common->start == OP_BRA && ccend[-(1 + LINK_SIZE)] == OP_KET);
9860  #if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 2  #if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 2
9861  common->capture_last_ptr = common->ovector_start;  common->capture_last_ptr = common->ovector_start;
9862  common->ovector_start += sizeof(sljit_sw);  common->ovector_start += sizeof(sljit_sw);
9863  #endif  #endif
9864  if (!check_opcode_types(common, rootbacktrack.cc, ccend))  if (!check_opcode_types(common, common->start, ccend))
9865    {    {
9866    SLJIT_FREE(common->optimized_cbracket);    SLJIT_FREE(common->optimized_cbracket);
9867    return;    return;
# Line 9618  if (common->capture_last_ptr != 0) Line 9924  if (common->capture_last_ptr != 0)
9924  SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));  SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));
9925  common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);  common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
9926    
9927  common->private_data_ptrs = (int *)SLJIT_MALLOC((ccend - rootbacktrack.cc) * sizeof(sljit_si));  total_length = ccend - common->start;
9928    common->private_data_ptrs = (sljit_si *)SLJIT_MALLOC(total_length * (sizeof(sljit_si) + (common->has_then ? 1 : 0)));
9929  if (!common->private_data_ptrs)  if (!common->private_data_ptrs)
9930    {    {
9931    SLJIT_FREE(common->optimized_cbracket);    SLJIT_FREE(common->optimized_cbracket);
9932    return;    return;
9933    }    }
9934  memset(common->private_data_ptrs, 0, (ccend - rootbacktrack.cc) * sizeof(int));  memset(common->private_data_ptrs, 0, total_length * sizeof(sljit_si));
9935    
9936  private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);  private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
9937  set_private_data_ptrs(common, &private_data_size, ccend);  set_private_data_ptrs(common, &private_data_size, ccend);
# Line 9637  if (private_data_size > SLJIT_MAX_LOCAL_ Line 9944  if (private_data_size > SLJIT_MAX_LOCAL_
9944    
9945  if (common->has_then)  if (common->has_then)
9946    {    {
9947    common->then_offsets = (pcre_uint8 *)SLJIT_MALLOC(ccend - rootbacktrack.cc);    common->then_offsets = (pcre_uint8 *)(common->private_data_ptrs + total_length);
9948    if (!common->then_offsets)    memset(common->then_offsets, 0, total_length);
9949      set_then_offsets(common, common->start, NULL);
9950      }
9951    
9952    if (common->read_only_data_size > 0)
9953      {
9954      common->read_only_data = (sljit_uw *)SLJIT_MALLOC(common->read_only_data_size);
9955      if (common->read_only_data == NULL)
9956      {      {
9957      SLJIT_FREE(common->optimized_cbracket);      SLJIT_FREE(common->optimized_cbracket);
9958      SLJIT_FREE(common->private_data_ptrs);      SLJIT_FREE(common->private_data_ptrs);
9959      return;      return;
9960      }      }
9961    memset(common->then_offsets, 0, ccend - rootbacktrack.cc);    common->read_only_data_ptr = common->read_only_data;
   set_then_offsets(common, rootbacktrack.cc, NULL);  
9962    }    }
9963    
9964  compiler = sljit_create_compiler();  compiler = sljit_create_compiler();
# Line 9653  if (!compiler) Line 9966  if (!compiler)
9966    {    {
9967    SLJIT_FREE(common->optimized_cbracket);    SLJIT_FREE(common->optimized_cbracket);
9968    SLJIT_FREE(common->private_data_ptrs);    SLJIT_FREE(common->private_data_ptrs);
9969    if (common->has_then)    if (common->read_only_data)
9970      SLJIT_FREE(common->then_offsets);      SLJIT_FREE(common->read_only_data);
9971    return;    return;
9972    }    }
9973  common->compiler = compiler;  common->compiler = compiler;
# Line 9693  if ((re->options & PCRE_ANCHORED) == 0) Line 10006  if ((re->options & PCRE_ANCHORED) == 0)
10006    if ((re->options & PCRE_NO_START_OPTIMIZE) == 0)    if ((re->options & PCRE_NO_START_OPTIMIZE) == 0)
10007      {      {
10008      if (mode == JIT_COMPILE && fast_forward_first_n_chars(common, (re->options & PCRE_FIRSTLINE) != 0))      if (mode == JIT_COMPILE && fast_forward_first_n_chars(common, (re->options & PCRE_FIRSTLINE) != 0))
10009        { /* Do nothing */ }        {
10010          /* If read_only_data is reallocated, we might have an allocation failure. */
10011          if (common->read_only_data_size > 0 && common->read_only_data == NULL)
10012            {
10013            sljit_free_compiler(compiler);
10014            SLJIT_FREE(common->optimized_cbracket);
10015            SLJIT_FREE(common->private_data_ptrs);
10016            return;
10017            }
10018          }
10019      else if ((re->flags & PCRE_FIRSTSET) != 0)      else if ((re->flags & PCRE_FIRSTSET) != 0)
10020        fast_forward_first_char(common, (pcre_uchar)re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0, (re->options & PCRE_FIRSTLINE) != 0);        fast_forward_first_char(common, (pcre_uchar)re->first_char, (re->flags & PCRE_FCH_CASELESS) != 0, (re->options & PCRE_FIRSTLINE) != 0);
10021      else if ((re->flags & PCRE_STARTLINE) != 0)      else if ((re->flags & PCRE_STARTLINE) != 0)
# Line 9740  if (mode == JIT_PARTIAL_SOFT_COMPILE) Line 10062  if (mode == JIT_PARTIAL_SOFT_COMPILE)
10062  else if (mode == JIT_PARTIAL_HARD_COMPILE)  else if (mode == JIT_PARTIAL_HARD_COMPILE)
10063    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_LOCALS_REG), common->start_used_ptr, STR_PTR, 0);
10064    
10065  compile_matchingpath(common, rootbacktrack.cc, ccend, &rootbacktrack);  compile_matchingpath(common, common->start, ccend, &rootbacktrack);
10066  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
10067    {    {
10068    sljit_free_compiler(compiler);    sljit_free_compiler(compiler);
10069    SLJIT_FREE(common->optimized_cbracket);    SLJIT_FREE(common->optimized_cbracket);
10070    SLJIT_FREE(common->private_data_ptrs);    SLJIT_FREE(common->private_data_ptrs);
10071    if (common->has_then)    if (common->read_only_data)
10072      SLJIT_FREE(common->then_offsets);      SLJIT_FREE(common->read_only_data);
10073    return;    return;
10074    }    }
10075    
10076  empty_match = CMP(SLJIT_C_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));  if (common->might_be_empty)
10077  empty_match_found_label = LABEL();    {
10078      empty_match = CMP(SLJIT_C_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), OVECTOR(0));
10079      empty_match_found_label = LABEL();
10080      }
10081    
10082  common->accept_label = LABEL();  common->accept_label = LABEL();
10083  if (common->accept != NULL)  if (common->accept != NULL)
# Line 9776  if (mode != JIT_COMPILE) Line 10101  if (mode != JIT_COMPILE)
10101    return_with_partial_match(common, common->quit_label);    return_with_partial_match(common, common->quit_label);
10102    }    }
10103    
10104  empty_match_backtrack_label = LABEL();  if (common->might_be_empty)
10105      empty_match_backtrack_label = LABEL();
10106  compile_backtrackingpath(common, rootbacktrack.top);  compile_backtrackingpath(common, rootbacktrack.top);
10107  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))  if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
10108    {    {
10109    sljit_free_compiler(compiler);    sljit_free_compiler(compiler);
10110    SLJIT_FREE(common->optimized_cbracket);    SLJIT_FREE(common->optimized_cbracket);
10111    SLJIT_FREE(common->private_data_ptrs);    SLJIT_FREE(common->private_data_ptrs);
10112    if (common->has_then)    if (common->read_only_data)
10113      SLJIT_FREE(common->then_offsets);      SLJIT_FREE(common->read_only_data);
10114    return;    return;
10115    }    }
10116    
# Line 9812  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SL Line 10138  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SL
10138    
10139  if ((re->options & PCRE_ANCHORED) == 0)  if ((re->options & PCRE_ANCHORED) == 0)
10140    {    {
10141    if ((re->options & PCRE_FIRSTLINE) == 0)    if (common->ff_newline_shortcut != NULL)
10142      CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, mainloop_label);      {
10143        if ((re->options & PCRE_FIRSTLINE) == 0)
10144          CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, common->ff_newline_shortcut);
10145        /* There cannot be more newlines here. */
10146        }
10147    else    else
10148      CMPTO(SLJIT_C_LESS, STR_PTR, 0, TMP1, 0, mainloop_label);      {
10149        if ((re->options & PCRE_FIRSTLINE) == 0)
10150          CMPTO(SLJIT_C_LESS, STR_PTR, 0, STR_END, 0, mainloop_label);
10151        else
10152          CMPTO(SLJIT_C_LESS, STR_PTR, 0, TMP1, 0, mainloop_label);
10153        }
10154    }    }
10155    
10156  /* No more remaining characters. */  /* No more remaining characters. */
# Line 9830  JUMPTO(SLJIT_JUMP, common->quit_label); Line 10165  JUMPTO(SLJIT_JUMP, common->quit_label);
10165    
10166  flush_stubs(common);  flush_stubs(common);
10167    
10168  JUMPHERE(empty_match);  if (common->might_be_empty)
10169  OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);    {
10170  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));    JUMPHERE(empty_match);
10171  CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_backtrack_label);    OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
10172  OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));    OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty));
10173  CMPTO(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_found_label);    CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_backtrack_label);
10174  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));    OP1(SLJIT_MOV_UB, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, notempty_atstart));
10175  CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, STR_PTR, 0, empty_match_found_label);    CMPTO(SLJIT_C_EQUAL, TMP2, 0, SLJIT_IMM, 0, empty_match_found_label);
10176  JUMPTO(SLJIT_JUMP, empty_match_backtrack_label);    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, str));
10177      CMPTO(SLJIT_C_NOT_EQUAL, TMP2, 0, STR_PTR, 0, empty_match_found_label);
10178      JUMPTO(SLJIT_JUMP, empty_match_backtrack_label);
10179      }
10180    
10181  common->currententry = common->entries;  common->currententry = common->entries;
10182  common->local_exit = TRUE;  common->local_exit = TRUE;
# Line 9852  while (common->currententry != NULL) Line 10190  while (common->currententry != NULL)
10190      sljit_free_compiler(compiler);      sljit_free_compiler(compiler);
10191      SLJIT_FREE(common->optimized_cbracket);      SLJIT_FREE(common->optimized_cbracket);
10192      SLJIT_FREE(common->private_data_ptrs);      SLJIT_FREE(common->private_data_ptrs);
10193      if (common->has_then)      if (common->read_only_data)
10194        SLJIT_FREE(common->then_offsets);        SLJIT_FREE(common->read_only_data);
10195      return;      return;
10196      }      }
10197    flush_stubs(common);    flush_stubs(common);
# Line 9963  if (common->getucd != NULL) Line 10301  if (common->getucd != NULL)
10301    }    }
10302  #endif  #endif
10303    
10304    SLJIT_ASSERT(common->read_only_data + (common->read_only_data_size >> SLJIT_WORD_SHIFT) == common->read_only_data_ptr);
10305  SLJIT_FREE(common->optimized_cbracket);  SLJIT_FREE(common->optimized_cbracket);
10306  SLJIT_FREE(common->private_data_ptrs);  SLJIT_FREE(common->private_data_ptrs);
 if (common->has_then)  
   SLJIT_FREE(common->then_offsets);  
10307    
10308  executable_func = sljit_generate_code(compiler);  executable_func = sljit_generate_code(compiler);
10309  executable_size = sljit_get_generated_code_size(compiler);  executable_size = sljit_get_generated_code_size(compiler);
10310    label_addr = common->label_addrs;
10311    while (label_addr != NULL)
10312      {
10313      *label_addr->addr = sljit_get_label_addr(label_addr->label);
10314      label_addr = label_addr->next;
10315      }
10316  sljit_free_compiler(compiler);  sljit_free_compiler(compiler);
10317  if (executable_func == NULL)  if (executable_func == NULL)
10318      {
10319      if (common->read_only_data)
10320        SLJIT_FREE(common->read_only_data);
10321    return;    return;
10322      }
10323    
10324  /* Reuse the function descriptor if possible. */  /* Reuse the function descriptor if possible. */
10325  if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 && extra->executable_jit != NULL)  if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0 && extra->executable_jit != NULL)
# Line 9992  else Line 10339  else
10339    if (functions == NULL)    if (functions == NULL)
10340      {      {
10341      /* This case is highly unlikely since we just recently      /* This case is highly unlikely since we just recently
10342      freed a lot of memory. Although not impossible. */      freed a lot of memory. Not impossible though. */
10343      sljit_free_code(executable_func);      sljit_free_code(executable_func);
10344        if (common->read_only_data)
10345          SLJIT_FREE(common->read_only_data);
10346      return;      return;
10347      }      }
10348    memset(functions, 0, sizeof(executable_functions));    memset(functions, 0, sizeof(executable_functions));
# Line 10004  else Line 10353  else
10353    }    }
10354    
10355  functions->executable_funcs[mode] = executable_func;  functions->executable_funcs[mode] = executable_func;
10356    functions->read_only_data[mode] = common->read_only_data;
10357  functions->executable_sizes[mode] = executable_size;  functions->executable_sizes[mode] = executable_size;
10358  }  }
10359    
# Line 10190  for (i = 0; i < JIT_NUMBER_OF_COMPILE_MO Line 10540  for (i = 0; i < JIT_NUMBER_OF_COMPILE_MO
10540    {    {
10541    if (functions->executable_funcs[i] != NULL)    if (functions->executable_funcs[i] != NULL)
10542      sljit_free_code(functions->executable_funcs[i]);      sljit_free_code(functions->executable_funcs[i]);
10543      if (functions->read_only_data[i] != NULL)
10544        SLJIT_FREE(functions->read_only_data[i]);
10545    }    }
10546  SLJIT_FREE(functions);  SLJIT_FREE(functions);
10547  }  }

Legend:
Removed from v.1427  
changed lines
  Added in v.1474

  ViewVC Help
Powered by ViewVC 1.1.5