Should fix the infinite loop on a dynamic %ENV fetch
[p5sagit/p5-mst-13.2.git] / regexec.c
index 770fca6..464ceaf 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -25,7 +25,7 @@
 #    define PERL_IN_XSUB_RE
 #  endif
 /* need access to debugger hooks */
-#  ifndef DEBUGGING
+#  if defined(PERL_EXT_RE_DEBUG) && !defined(DEBUGGING)
 #    define DEBUGGING
 #  endif
 #endif
 #  define Perl_regexec_flags my_regexec
 #  define Perl_regdump my_regdump
 #  define Perl_regprop my_regprop
+#  define Perl_re_intuit_start my_re_intuit_start
 /* *These* symbols are masked to allow static link. */
 #  define Perl_pregexec my_pregexec
-#  define Perl_reginitcolors my_reginitcolors 
-#endif 
+#  define Perl_reginitcolors my_reginitcolors
+#  define Perl_regclass_swash my_regclass_swash
+
+#  define PERL_NO_GET_CONTEXT
+#endif
 
 /*SUPPRESS 112*/
 /*
@@ -63,7 +67,8 @@
  *
  ****    Alterations to Henry's code are...
  ****
- ****    Copyright (c) 1991-1998, Larry Wall
+ ****    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ ****    2000, 2001, 2002, 2003, by Larry Wall and others
  ****
  ****    You may distribute under the terms of either the GNU General Public
  ****    License or the Artistic License, as specified in the README file.
@@ -73,6 +78,7 @@
  * regular-expression syntax might require a total rethink.
  */
 #include "EXTERN.h"
+#define PERL_IN_REGEXEC_C
 #include "perl.h"
 
 #include "regcomp.h"
@@ -81,8 +87,9 @@
 #define RF_warned      2               /* warned about big count? */
 #define RF_evaled      4               /* Did an EVAL with setting? */
 #define RF_utf8                8               /* String contains multibyte chars? */
+#define RF_false       16              /* odd number of nested negatives */
 
-#define UTF (PL_reg_flags & RF_utf8)
+#define UTF ((PL_reg_flags & RF_utf8) != 0)
 
 #define RS_init                1               /* eval environment created */
 #define RS_set         2               /* replsv value is set */
 #define        STATIC  static
 #endif
 
-#ifndef PERL_OBJECT
-typedef I32 CHECKPOINT;
+#define REGINCLASS(p,c)  (ANYOF_FLAGS(p) ? reginclass(p,c,0,0) : ANYOF_BITMAP_TEST(p,*(c)))
 
 /*
  * Forwards.
  */
 
-static I32 regmatch _((regnode *prog));
-static I32 regrepeat _((regnode *p, I32 max));
-static I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp));
-static I32 regtry _((regexp *prog, char *startpos));
-
-static bool reginclass _((char *p, I32 c));
-static bool reginclassutf8 _((regnode *f, U8* p));
-static CHECKPOINT regcppush _((I32 parenfloor));
-static char * regcppop _((void));
-static char * regcp_set_to _((I32 ss));
-static void cache_re _((regexp *prog));
-static void restore_pos _((void *arg));
-#endif
-
-#define REGINCLASS(p,c)  (*(p) ? reginclass(p,c) : ANYOF_TEST(p,c))
-#define REGINCLASSUTF8(f,p)  (ARG1(f) ? reginclassutf8(f,p) : swash_fetch((SV*)PL_regdata->data[ARG2(f)],p))
+#define CHR_SVLEN(sv) (do_utf8 ? sv_len_utf8(sv) : SvCUR(sv))
+#define CHR_DIST(a,b) (PL_reg_match_utf8 ? utf8_distance(a,b) : a - b)
 
-#define CHR_SVLEN(sv) (UTF ? sv_len_utf8(sv) : SvCUR(sv))
-#define CHR_DIST(a,b) (UTF ? utf8_distance(a,b) : a - b)
-
-#ifndef PERL_OBJECT
-static U8 * reghop _((U8 *pos, I32 off));
-static U8 * reghopmaybe _((U8 *pos, I32 off));
-#endif
 #define reghop_c(pos,off) ((char*)reghop((U8*)pos, off))
 #define reghopmaybe_c(pos,off) ((char*)reghopmaybe((U8*)pos, off))
-#define HOP(pos,off) (UTF ? reghop((U8*)pos, off) : (U8*)(pos + off))
-#define HOPMAYBE(pos,off) (UTF ? reghopmaybe((U8*)pos, off) : (U8*)(pos + off))
+#define HOP(pos,off) (PL_reg_match_utf8 ? reghop((U8*)pos, off) : (U8*)(pos + off))
+#define HOPMAYBE(pos,off) (PL_reg_match_utf8 ? reghopmaybe((U8*)pos, off) : (U8*)(pos + off))
 #define HOPc(pos,off) ((char*)HOP(pos,off))
 #define HOPMAYBEc(pos,off) ((char*)HOPMAYBE(pos,off))
 
+#define HOPBACK(pos, off) (            \
+    (PL_reg_match_utf8)                        \
+       ? reghopmaybe((U8*)pos, -off)   \
+    : (pos - off >= PL_bostr)          \
+       ? (U8*)(pos - off)              \
+    : (U8*)NULL                                \
+)
+#define HOPBACKc(pos, off) (char*)HOPBACK(pos, off)
+
+#define reghop3_c(pos,off,lim) ((char*)reghop3((U8*)pos, off, (U8*)lim))
+#define reghopmaybe3_c(pos,off,lim) ((char*)reghopmaybe3((U8*)pos, off, (U8*)lim))
+#define HOP3(pos,off,lim) (PL_reg_match_utf8 ? reghop3((U8*)pos, off, (U8*)lim) : (U8*)(pos + off))
+#define HOPMAYBE3(pos,off,lim) (PL_reg_match_utf8 ? reghopmaybe3((U8*)pos, off, (U8*)lim) : (U8*)(pos + off))
+#define HOP3c(pos,off,lim) ((char*)HOP3(pos,off,lim))
+#define HOPMAYBE3c(pos,off,lim) ((char*)HOPMAYBE3(pos,off,lim))
+
+#define LOAD_UTF8_CHARCLASS(a,b) STMT_START { if (!CAT2(PL_utf8_,a)) { ENTER; save_re_context(); (void)CAT2(is_utf8_, a)((U8*)b); LEAVE; } } STMT_END
+
+/* for use after a quantifier and before an EXACT-like node -- japhy */
+#define JUMPABLE(rn) ( \
+    OP(rn) == OPEN || OP(rn) == CLOSE || OP(rn) == EVAL || \
+    OP(rn) == SUSPEND || OP(rn) == IFMATCH || \
+    OP(rn) == PLUS || OP(rn) == MINMOD || \
+    (PL_regkind[(U8)OP(rn)] == CURLY && ARG1(rn) > 0) \
+)
+
+#define HAS_TEXT(rn) ( \
+    PL_regkind[(U8)OP(rn)] == EXACT || PL_regkind[(U8)OP(rn)] == REF \
+)
+
+/*
+  Search for mandatory following text node; for lookahead, the text must
+  follow but for lookbehind (rn->flags != 0) we skip to the next step.
+*/
+#define FIND_NEXT_IMPT(rn) STMT_START { \
+    while (JUMPABLE(rn)) \
+       if (OP(rn) == SUSPEND || PL_regkind[(U8)OP(rn)] == CURLY) \
+           rn = NEXTOPER(NEXTOPER(rn)); \
+       else if (OP(rn) == PLUS) \
+           rn = NEXTOPER(rn); \
+       else if (OP(rn) == IFMATCH) \
+           rn = (rn->flags == 0) ? NEXTOPER(NEXTOPER(rn)) : rn + ARG(rn); \
+       else rn += NEXT_OFF(rn); \
+} STMT_END 
+
+static void restore_pos(pTHX_ void *arg);
+
 STATIC CHECKPOINT
-regcppush(I32 parenfloor)
+S_regcppush(pTHX_ I32 parenfloor)
 {
-    dTHR;
     int retval = PL_savestack_ix;
-    int i = (PL_regsize - parenfloor) * 4;
+#define REGCP_PAREN_ELEMS 4
+    int paren_elems_to_push = (PL_regsize - parenfloor) * REGCP_PAREN_ELEMS;
     int p;
 
-    SSCHECK(i + 5);
+    if (paren_elems_to_push < 0)
+       Perl_croak(aTHX_ "panic: paren_elems_to_push < 0");
+
+#define REGCP_OTHER_ELEMS 6
+    SSGROW(paren_elems_to_push + REGCP_OTHER_ELEMS);
     for (p = PL_regsize; p > parenfloor; p--) {
-       SSPUSHPTR(PL_regendp[p]);
-       SSPUSHPTR(PL_regstartp[p]);
+/* REGCP_PARENS_ELEMS are pushed per pairs of parentheses. */
+       SSPUSHINT(PL_regendp[p]);
+       SSPUSHINT(PL_regstartp[p]);
        SSPUSHPTR(PL_reg_start_tmp[p]);
        SSPUSHINT(p);
     }
+/* REGCP_OTHER_ELEMS are pushed in any case, parentheses or no. */
     SSPUSHINT(PL_regsize);
     SSPUSHINT(*PL_reglastparen);
+    SSPUSHINT(*PL_reglastcloseparen);
     SSPUSHPTR(PL_reginput);
-    SSPUSHINT(i + 3);
-    SSPUSHINT(SAVEt_REGCONTEXT);
+#define REGCP_FRAME_ELEMS 2
+/* REGCP_FRAME_ELEMS are part of the REGCP_OTHER_ELEMS and
+ * are needed for the regexp context stack bookkeeping. */
+    SSPUSHINT(paren_elems_to_push + REGCP_OTHER_ELEMS - REGCP_FRAME_ELEMS);
+    SSPUSHINT(SAVEt_REGCONTEXT); /* Magic cookie. */
+
     return retval;
 }
 
 /* These are needed since we do not localize EVAL nodes: */
-#  define REGCP_SET  DEBUG_r(PerlIO_printf(Perl_debug_log,             \
-                            "  Setting an EVAL scope, savestack=%i\n", \
-                            PL_savestack_ix)); lastcp = PL_savestack_ix
+#  define REGCP_SET(cp)  DEBUG_r(PerlIO_printf(Perl_debug_log,         \
+                            "  Setting an EVAL scope, savestack=%"IVdf"\n",    \
+                            (IV)PL_savestack_ix)); cp = PL_savestack_ix
 
-#  define REGCP_UNWIND  DEBUG_r(lastcp != PL_savestack_ix ?            \
+#  define REGCP_UNWIND(cp)  DEBUG_r(cp != PL_savestack_ix ?            \
                                PerlIO_printf(Perl_debug_log,           \
-                               "  Clearing an EVAL scope, savestack=%i..%i\n", \
-                               lastcp, PL_savestack_ix) : 0); regcpblow(lastcp)
+                               "  Clearing an EVAL scope, savestack=%"IVdf"..%"IVdf"\n", \
+                               (IV)(cp), (IV)PL_savestack_ix) : 0); regcpblow(cp)
 
 STATIC char *
-regcppop(void)
+S_regcppop(pTHX)
 {
-    dTHR;
-    I32 i = SSPOPINT;
+    I32 i;
     U32 paren = 0;
     char *input;
-    char *tmps;
-    assert(i == SAVEt_REGCONTEXT);
+    I32 tmps;
+
+    /* Pop REGCP_OTHER_ELEMS before the parentheses loop starts. */
     i = SSPOPINT;
+    assert(i == SAVEt_REGCONTEXT); /* Check that the magic cookie is there. */
+    i = SSPOPINT; /* Parentheses elements to pop. */
     input = (char *) SSPOPPTR;
+    *PL_reglastcloseparen = SSPOPINT;
     *PL_reglastparen = SSPOPINT;
     PL_regsize = SSPOPINT;
-    for (i -= 3; i > 0; i -= 4) {
+
+    /* Now restore the parentheses context. */
+    for (i -= (REGCP_OTHER_ELEMS - REGCP_FRAME_ELEMS);
+        i > 0; i -= REGCP_PAREN_ELEMS) {
        paren = (U32)SSPOPINT;
        PL_reg_start_tmp[paren] = (char *) SSPOPPTR;
-       PL_regstartp[paren] = (char *) SSPOPPTR;
-       tmps = (char*)SSPOPPTR;
+       PL_regstartp[paren] = SSPOPINT;
+       tmps = SSPOPINT;
        if (paren <= *PL_reglastparen)
            PL_regendp[paren] = tmps;
        DEBUG_r(
            PerlIO_printf(Perl_debug_log,
-                         "     restoring \\%d to %d(%d)..%d%s\n",
-                         paren, PL_regstartp[paren] - PL_regbol, 
-                         PL_reg_start_tmp[paren] - PL_regbol,
-                         PL_regendp[paren] - PL_regbol, 
+                         "     restoring \\%"UVuf" to %"IVdf"(%"IVdf")..%"IVdf"%s\n",
+                         (UV)paren, (IV)PL_regstartp[paren],
+                         (IV)(PL_reg_start_tmp[paren] - PL_bostr),
+                         (IV)PL_regendp[paren],
                          (paren > *PL_reglastparen ? "(no)" : ""));
        );
     }
     DEBUG_r(
-       if (*PL_reglastparen + 1 <= PL_regnpar) {
+       if ((I32)(*PL_reglastparen + 1) <= PL_regnpar) {
            PerlIO_printf(Perl_debug_log,
-                         "     restoring \\%d..\\%d to undef\n",
-                         *PL_reglastparen + 1, PL_regnpar);
+                         "     restoring \\%"IVdf"..\\%"IVdf" to undef\n",
+                         (IV)(*PL_reglastparen + 1), (IV)PL_regnpar);
        }
     );
-    for (paren = *PL_reglastparen + 1; paren <= PL_regnpar; paren++) {
-       if (paren > PL_regsize)
-           PL_regstartp[paren] = Nullch;
-       PL_regendp[paren] = Nullch;
+#if 1
+    /* It would seem that the similar code in regtry()
+     * already takes care of this, and in fact it is in
+     * a better location to since this code can #if 0-ed out
+     * but the code in regtry() is needed or otherwise tests
+     * requiring null fields (pat.t#187 and split.t#{13,14}
+     * (as of patchlevel 7877)  will fail.  Then again,
+     * this code seems to be necessary or otherwise
+     * building DynaLoader will fail:
+     * "Error: '*' not in typemap in DynaLoader.xs, line 164"
+     * --jhi */
+    for (paren = *PL_reglastparen + 1; (I32)paren <= PL_regnpar; paren++) {
+       if ((I32)paren > PL_regsize)
+           PL_regstartp[paren] = -1;
+       PL_regendp[paren] = -1;
     }
+#endif
     return input;
 }
 
 STATIC char *
-regcp_set_to(I32 ss)
+S_regcp_set_to(pTHX_ I32 ss)
 {
-    dTHR;
     I32 tmp = PL_savestack_ix;
 
     PL_savestack_ix = ss;
@@ -227,7 +287,23 @@ typedef struct re_cc_state
     regexp *re;
 } re_cc_state;
 
-#define regcpblow(cp) LEAVE_SCOPE(cp)
+#define regcpblow(cp) LEAVE_SCOPE(cp)  /* Ignores regcppush()ed data. */
+
+#define TRYPAREN(paren, n, input) {                            \
+    if (paren) {                                               \
+       if (n) {                                                \
+           PL_regstartp[paren] = HOPc(input, -1) - PL_bostr;   \
+           PL_regendp[paren] = input - PL_bostr;               \
+       }                                                       \
+       else                                                    \
+           PL_regendp[paren] = -1;                             \
+    }                                                          \
+    if (regmatch(next))                                                \
+       sayYES;                                                 \
+    if (paren && n)                                            \
+       PL_regendp[paren] = -1;                                 \
+}
+
 
 /*
  * pregexec and friends
@@ -237,7 +313,7 @@ typedef struct re_cc_state
  - pregexec - match a regexp against a string
  */
 I32
-pregexec(register regexp *prog, char *stringarg, register char *strend,
+Perl_pregexec(pTHX_ register regexp *prog, char *stringarg, register char *strend,
         char *strbeg, I32 minend, SV *screamer, U32 nosave)
 /* strend: pointer to null at end of string */
 /* strbeg: real beginning of string */
@@ -245,724 +321,1684 @@ pregexec(register regexp *prog, char *stringarg, register char *strend,
 /* nosave: For optimizations. */
 {
     return
-       regexec_flags(prog, stringarg, strend, strbeg, minend, screamer, NULL, 
+       regexec_flags(prog, stringarg, strend, strbeg, minend, screamer, NULL,
                      nosave ? 0 : REXEC_COPY_STR);
 }
 
 STATIC void
-cache_re(regexp *prog)
+S_cache_re(pTHX_ regexp *prog)
 {
-    dTHR;
     PL_regprecomp = prog->precomp;             /* Needed for FAIL. */
 #ifdef DEBUGGING
     PL_regprogram = prog->program;
 #endif
     PL_regnpar = prog->nparens;
-    PL_regdata = prog->data;    
-    PL_reg_re = prog;    
+    PL_regdata = prog->data;
+    PL_reg_re = prog;
 }
 
-STATIC void
-restore_pos(void *arg)
-{
-    dTHR;
-    if (PL_reg_eval_set) {    
-       PL_reg_magic->mg_len = PL_reg_oldpos;
-       PL_reg_eval_set = 0;
-       PL_curpm = PL_reg_oldcurpm;
-    }  
-}
+/*
+ * Need to implement the following flags for reg_anch:
+ *
+ * USE_INTUIT_NOML             - Useful to call re_intuit_start() first
+ * USE_INTUIT_ML
+ * INTUIT_AUTORITATIVE_NOML    - Can trust a positive answer
+ * INTUIT_AUTORITATIVE_ML
+ * INTUIT_ONCE_NOML            - Intuit can match in one location only.
+ * INTUIT_ONCE_ML
+ *
+ * Another flag for this function: SECOND_TIME (so that float substrs
+ * with giant delta may be not rechecked).
+ */
 
+/* Assumptions: if ANCH_GPOS, then strpos is anchored. XXXX Check GPOS logic */
 
-/*
- - regexec_flags - match a regexp against a string
+/* If SCREAM, then SvPVX(sv) should be compatible with strpos and strend.
+   Otherwise, only SvCUR(sv) is used to get strbeg. */
+
+/* XXXX We assume that strpos is strbeg unless sv. */
+
+/* XXXX Some places assume that there is a fixed substring.
+       An update may be needed if optimizer marks as "INTUITable"
+       RExen without fixed substrings.  Similarly, it is assumed that
+       lengths of all the strings are no more than minlen, thus they
+       cannot come from lookahead.
+       (Or minlen should take into account lookahead.) */
+
+/* A failure to find a constant substring means that there is no need to make
+   an expensive call to REx engine, thus we celebrate a failure.  Similarly,
+   finding a substring too deep into the string means that less calls to
+   regtry() should be needed.
+
+   REx compiler's optimizer found 4 possible hints:
+       a) Anchored substring;
+       b) Fixed substring;
+       c) Whether we are anchored (beginning-of-line or \G);
+       d) First node (of those at offset 0) which may distingush positions;
+   We use a)b)d) and multiline-part of c), and try to find a position in the
+   string which does not contradict any of them.
  */
-I32
-regexec_flags(register regexp *prog, char *stringarg, register char *strend,
-             char *strbeg, I32 minend, SV *sv, void *data, U32 flags)
-/* strend: pointer to null at end of string */
-/* strbeg: real beginning of string */
-/* minend: end of match must be >=minend after stringarg. */
-/* data: May be used for some additional optimizations. */
-/* nosave: For optimizations. */
-{
-    dTHR;
-    register char *s;
-    register regnode *c;
-    register char *startpos = stringarg;
-    register I32 tmp;
-    I32 minlen;                /* must match at least this many chars */
-    I32 dontbother = 0;        /* how many characters not to try at end */
-    CURCUR cc;
-    I32 start_shift = 0;               /* Offset of the start to find
-                                        constant substr. */            /* CC */
-    I32 end_shift = 0;                 /* Same for the end. */         /* CC */
-    I32 scream_pos = -1;               /* Internal iterator of scream. */
-    char *scream_olds;
-    SV* oreplsv = GvSV(PL_replgv);
 
-    cc.cur = 0;
-    cc.oldcc = 0;
-    PL_regcc = &cc;
+/* Most of decisions we do here should have been done at compile time.
+   The nodes of the REx which we used for the search should have been
+   deleted from the finite automaton. */
 
-    cache_re(prog);
+char *
+Perl_re_intuit_start(pTHX_ regexp *prog, SV *sv, char *strpos,
+                    char *strend, U32 flags, re_scream_pos_data *data)
+{
+    register I32 start_shift = 0;
+    /* Should be nonnegative! */
+    register I32 end_shift   = 0;
+    register char *s;
+    register SV *check;
+    char *strbeg;
+    char *t;
+    int do_utf8 = sv ? SvUTF8(sv) : 0; /* if no sv we have to assume bytes */
+    I32 ml_anch;
+    register char *other_last = Nullch;        /* other substr checked before this */
+    char *check_at = Nullch;           /* check substr found at this pos */
 #ifdef DEBUGGING
-    PL_regnarrate = PL_debug & 512;
+    char *i_strpos = strpos;
+    SV *dsv = PERL_DEBUG_PAD_ZERO(0);
 #endif
+    RX_MATCH_UTF8_set(prog,do_utf8);
 
-    /* Be paranoid... */
-    if (prog == NULL || startpos == NULL) {
-       croak("NULL regexp parameter");
-       return 0;
+    if (prog->reganch & ROPT_UTF8) {
+       DEBUG_r(PerlIO_printf(Perl_debug_log,
+                             "UTF-8 regex...\n"));
+       PL_reg_flags |= RF_utf8;
     }
 
-    minlen = prog->minlen;
-    if (strend - startpos < minlen) goto phooey;
+    DEBUG_r({
+        char *s   = PL_reg_match_utf8 ?
+                        sv_uni_display(dsv, sv, 60, UNI_DISPLAY_REGEX) :
+                        strpos;
+        int   len = PL_reg_match_utf8 ?
+                        strlen(s) : strend - strpos;
+        if (!PL_colorset)
+             reginitcolors();
+        if (PL_reg_match_utf8)
+            DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                  "UTF-8 target...\n"));
+        PerlIO_printf(Perl_debug_log,
+                      "%sGuessing start of match, REx%s `%s%.60s%s%s' against `%s%.*s%s%s'...\n",
+                      PL_colors[4],PL_colors[5],PL_colors[0],
+                      prog->precomp,
+                      PL_colors[1],
+                      (strlen(prog->precomp) > 60 ? "..." : ""),
+                      PL_colors[0],
+                      (int)(len > 60 ? 60 : len),
+                      s, PL_colors[1],
+                      (len > 60 ? "..." : "")
+             );
+    });
 
-    if (startpos == strbeg)    /* is ^ valid at stringarg? */
-       PL_regprev = '\n';
-    else {
-       PL_regprev = (U32)stringarg[-1];
-       if (!PL_multiline && PL_regprev == '\n')
-           PL_regprev = '\0';          /* force ^ to NOT match */
+    /* CHR_DIST() would be more correct here but it makes things slow. */
+    if (prog->minlen > strend - strpos) {
+       DEBUG_r(PerlIO_printf(Perl_debug_log,
+                             "String too short... [re_intuit_start]\n"));
+       goto fail;
     }
-
-    /* Check validity of program. */
-    if (UCHARAT(prog->program) != REG_MAGIC) {
-       FAIL("corrupted regexp program");
+    strbeg = (sv && SvPOK(sv)) ? strend - SvCUR(sv) : strpos;
+    PL_regeol = strend;
+    if (do_utf8) {
+       if (!prog->check_utf8 && prog->check_substr)
+           to_utf8_substr(prog);
+       check = prog->check_utf8;
+    } else {
+       if (!prog->check_substr && prog->check_utf8)
+           to_byte_substr(prog);
+       check = prog->check_substr;
+    }
+   if (check == &PL_sv_undef) {
+       DEBUG_r(PerlIO_printf(Perl_debug_log,
+               "Non-utf string cannot match utf check string\n"));
+       goto fail;
     }
+    if (prog->reganch & ROPT_ANCH) {   /* Match at beg-of-str or after \n */
+       ml_anch = !( (prog->reganch & ROPT_ANCH_SINGLE)
+                    || ( (prog->reganch & ROPT_ANCH_BOL)
+                         && !PL_multiline ) ); /* Check after \n? */
 
-    PL_reg_flags = 0;
-    PL_reg_eval_set = 0;
+       if (!ml_anch) {
+         if ( !(prog->reganch & (ROPT_ANCH_GPOS /* Checked by the caller */
+                                 | ROPT_IMPLICIT)) /* not a real BOL */
+              /* SvCUR is not set on references: SvRV and SvPVX overlap */
+              && sv && !SvROK(sv)
+              && (strpos != strbeg)) {
+             DEBUG_r(PerlIO_printf(Perl_debug_log, "Not at start...\n"));
+             goto fail;
+         }
+         if (prog->check_offset_min == prog->check_offset_max &&
+             !(prog->reganch & ROPT_CANY_SEEN)) {
+           /* Substring at constant offset from beg-of-str... */
+           I32 slen;
 
-    if (prog->reganch & ROPT_UTF8)
-       PL_reg_flags |= RF_utf8;
+           s = HOP3c(strpos, prog->check_offset_min, strend);
+           if (SvTAIL(check)) {
+               slen = SvCUR(check);    /* >= 1 */
 
-    /* Mark beginning of line for ^ and lookbehind. */
-    PL_regbol = startpos;
-    PL_bostr  = strbeg;
-    PL_reg_sv = sv;
+               if ( strend - s > slen || strend - s < slen - 1
+                    || (strend - s == slen && strend[-1] != '\n')) {
+                   DEBUG_r(PerlIO_printf(Perl_debug_log, "String too long...\n"));
+                   goto fail_finish;
+               }
+               /* Now should match s[0..slen-2] */
+               slen--;
+               if (slen && (*SvPVX(check) != *s
+                            || (slen > 1
+                                && memNE(SvPVX(check), s, slen)))) {
+                 report_neq:
+                   DEBUG_r(PerlIO_printf(Perl_debug_log, "String not equal...\n"));
+                   goto fail_finish;
+               }
+           }
+           else if (*SvPVX(check) != *s
+                    || ((slen = SvCUR(check)) > 1
+                        && memNE(SvPVX(check), s, slen)))
+               goto report_neq;
+           goto success_at_start;
+         }
+       }
+       /* Match is anchored, but substr is not anchored wrt beg-of-str. */
+       s = strpos;
+       start_shift = prog->check_offset_min; /* okay to underestimate on CC */
+       end_shift = prog->minlen - start_shift -
+           CHR_SVLEN(check) + (SvTAIL(check) != 0);
+       if (!ml_anch) {
+           I32 end = prog->check_offset_max + CHR_SVLEN(check)
+                                        - (SvTAIL(check) != 0);
+           I32 eshift = CHR_DIST((U8*)strend, (U8*)s) - end;
 
-    /* Mark end of line for $ (and such) */
-    PL_regeol = strend;
+           if (end_shift < eshift)
+               end_shift = eshift;
+       }
+    }
+    else {                             /* Can match at random position */
+       ml_anch = 0;
+       s = strpos;
+       start_shift = prog->check_offset_min; /* okay to underestimate on CC */
+       /* Should be nonnegative! */
+       end_shift = prog->minlen - start_shift -
+           CHR_SVLEN(check) + (SvTAIL(check) != 0);
+    }
 
-    /* see how far we have to get to not match where we matched before */
-    PL_regtill = startpos+minend;
+#ifdef DEBUGGING       /* 7/99: reports of failure (with the older version) */
+    if (end_shift < 0)
+       Perl_croak(aTHX_ "panic: end_shift");
+#endif
 
-    /* We start without call_cc context.  */
-    PL_reg_call_cc = 0;
+  restart:
+    /* Find a possible match in the region s..strend by looking for
+       the "check" substring in the region corrected by start/end_shift. */
+    if (flags & REXEC_SCREAM) {
+       I32 p = -1;                     /* Internal iterator of scream. */
+       I32 *pp = data ? data->scream_pos : &p;
 
-    /* If there is a "must appear" string, look for it. */
-    s = startpos;
-    if (!(flags & REXEC_CHECKED) 
-       && prog->check_substr != Nullsv &&
-       !(prog->reganch & ROPT_ANCH_GPOS) &&
-       (!(prog->reganch & (ROPT_ANCH_BOL | ROPT_ANCH_MBOL))
-        || (PL_multiline && prog->check_substr == prog->anchored_substr)) )
-    {
-       char *t;
-       start_shift = prog->check_offset_min;   /* okay to underestimate on CC */
-       /* Should be nonnegative! */
-       end_shift = minlen - start_shift - CHR_SVLEN(prog->check_substr);
-       if (flags & REXEC_SCREAM) {
-           if (PL_screamfirst[BmRARE(prog->check_substr)] >= 0)
-                   s = screaminstr(sv, prog->check_substr, 
-                                   start_shift + (stringarg - strbeg),
-                                   end_shift, &scream_pos, 0);
-           else
-                   s = Nullch;
-           scream_olds = s;
-       }
-       else
-           s = fbm_instr((unsigned char*)s + start_shift,
-                         (unsigned char*)strend - end_shift,
-               prog->check_substr, 0);
-       if (!s) {
-           ++BmUSEFUL(prog->check_substr);     /* hooray */
-           goto phooey;        /* not present */
-       }
-       else if (s - stringarg > prog->check_offset_max &&
-                (UTF 
-                   ? ((t = reghopmaybe_c(s, -(prog->check_offset_max))) && t >= stringarg)
-                   : (t = s - prog->check_offset_max) != 0
-                )
-               )
-       {
-           ++BmUSEFUL(prog->check_substr);     /* hooray/2 */
-           s = t;
-       }
-       else if (!(prog->reganch & ROPT_NAUGHTY)
-                  && --BmUSEFUL(prog->check_substr) < 0
-                  && prog->check_substr == prog->float_substr) { /* boo */
-           SvREFCNT_dec(prog->check_substr);
-           prog->check_substr = Nullsv;        /* disable */
-           prog->float_substr = Nullsv;        /* clear */
-           s = startpos;
-       }
+       if (PL_screamfirst[BmRARE(check)] >= 0
+           || ( BmRARE(check) == '\n'
+                && (BmPREVIOUS(check) == SvCUR(check) - 1)
+                && SvTAIL(check) ))
+           s = screaminstr(sv, check,
+                           start_shift + (s - strbeg), end_shift, pp, 0);
        else
-           s = startpos;
+           goto fail_finish;
+       /* we may be pointing at the wrong string */
+       if (s && RX_MATCH_COPIED(prog))
+           s = strbeg + (s - SvPVX(sv));
+       if (data)
+           *data->scream_olds = s;
     }
+    else if (prog->reganch & ROPT_CANY_SEEN)
+       s = fbm_instr((U8*)(s + start_shift),
+                     (U8*)(strend - end_shift),
+                     check, PL_multiline ? FBMrf_MULTILINE : 0);
+    else
+       s = fbm_instr(HOP3(s, start_shift, strend),
+                     HOP3(strend, -end_shift, strbeg),
+                     check, PL_multiline ? FBMrf_MULTILINE : 0);
 
-    DEBUG_r(if (!PL_colorset) reginitcolors());
-    DEBUG_r(PerlIO_printf(Perl_debug_log, 
-                     "%sMatching%s `%s%.60s%s%s' against `%s%.*s%s%s'\n",
-                     PL_colors[4],PL_colors[5],PL_colors[0],
-                     prog->precomp,
-                     PL_colors[1],
-                     (strlen(prog->precomp) > 60 ? "..." : ""),
-                     PL_colors[0], 
-                     (strend - startpos > 60 ? 60 : strend - startpos),
-                     startpos, PL_colors[1],
-                     (strend - startpos > 60 ? "..." : ""))
-       );
+    /* Update the count-of-usability, remove useless subpatterns,
+       unshift s.  */
 
-    if (prog->reganch & ROPT_GPOS_SEEN) {
-       MAGIC *mg;
-       int pos = 0;
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%s %s substr `%s%.*s%s'%s%s",
+                         (s ? "Found" : "Did not find"),
+                         (check == (do_utf8 ? prog->anchored_utf8 : prog->anchored_substr) ? "anchored" : "floating"),
+                         PL_colors[0],
+                         (int)(SvCUR(check) - (SvTAIL(check)!=0)),
+                         SvPVX(check),
+                         PL_colors[1], (SvTAIL(check) ? "$" : ""),
+                         (s ? " at offset " : "...\n") ) );
 
-       if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) 
-           && (mg = mg_find(sv, 'g')) && mg->mg_len >= 0)
-           pos = mg->mg_len;
-       PL_reg_ganch = startpos + pos;
-    }
+    if (!s)
+       goto fail_finish;
 
-    /* Simplest case:  anchored match need be tried only once. */
-    /*  [unless only anchor is BOL and multiline is set] */
-    if (prog->reganch & (ROPT_ANCH & ~ROPT_ANCH_GPOS)) {
-       if (regtry(prog, startpos))
-           goto got_it;
-       else if (PL_multiline || (prog->reganch & ROPT_IMPLICIT)
-                || (prog->reganch & ROPT_ANCH_MBOL)) /* XXXX SBOL? */
-       {
-           if (minlen)
-               dontbother = minlen - 1;
-           strend = HOPc(strend, -dontbother);
-           /* for multiline we only have to try after newlines */
-           if (s > startpos)
-               s--;
-           while (s < strend) {
-               if (*s++ == '\n') {     /* don't need PL_utf8skip here */
-                   if (s < strend && regtry(prog, s))
-                       goto got_it;
+    check_at = s;
+
+    /* Finish the diagnostic message */
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%ld...\n", (long)(s - i_strpos)) );
+
+    /* Got a candidate.  Check MBOL anchoring, and the *other* substr.
+       Start with the other substr.
+       XXXX no SCREAM optimization yet - and a very coarse implementation
+       XXXX /ttx+/ results in anchored=`ttx', floating=`x'.  floating will
+               *always* match.  Probably should be marked during compile...
+       Probably it is right to do no SCREAM here...
+     */
+
+    if (do_utf8 ? (prog->float_utf8 && prog->anchored_utf8) : (prog->float_substr && prog->anchored_substr)) {
+       /* Take into account the "other" substring. */
+       /* XXXX May be hopelessly wrong for UTF... */
+       if (!other_last)
+           other_last = strpos;
+       if (check == (do_utf8 ? prog->float_utf8 : prog->float_substr)) {
+         do_other_anchored:
+           {
+               char *last = HOP3c(s, -start_shift, strbeg), *last1, *last2;
+               char *s1 = s;
+               SV* must;
+
+               t = s - prog->check_offset_max;
+               if (s - strpos > prog->check_offset_max  /* signed-corrected t > strpos */
+                   && (!do_utf8
+                       || ((t = reghopmaybe3_c(s, -(prog->check_offset_max), strpos))
+                           && t > strpos)))
+                   /* EMPTY */;
+               else
+                   t = strpos;
+               t = HOP3c(t, prog->anchored_offset, strend);
+               if (t < other_last)     /* These positions already checked */
+                   t = other_last;
+               last2 = last1 = HOP3c(strend, -prog->minlen, strbeg);
+               if (last < last1)
+                   last1 = last;
+ /* XXXX It is not documented what units *_offsets are in.  Assume bytes.  */
+               /* On end-of-str: see comment below. */
+               must = do_utf8 ? prog->anchored_utf8 : prog->anchored_substr;
+               if (must == &PL_sv_undef) {
+                   s = (char*)NULL;
+                   DEBUG_r(must = prog->anchored_utf8);        /* for debug */
+               }
+               else
+                   s = fbm_instr(
+                       (unsigned char*)t,
+                       HOP3(HOP3(last1, prog->anchored_offset, strend)
+                               + SvCUR(must), -(SvTAIL(must)!=0), strbeg),
+                       must,
+                       PL_multiline ? FBMrf_MULTILINE : 0
+                   );
+               DEBUG_r(PerlIO_printf(Perl_debug_log,
+                       "%s anchored substr `%s%.*s%s'%s",
+                       (s ? "Found" : "Contradicts"),
+                       PL_colors[0],
+                         (int)(SvCUR(must)
+                         - (SvTAIL(must)!=0)),
+                         SvPVX(must),
+                         PL_colors[1], (SvTAIL(must) ? "$" : "")));
+               if (!s) {
+                   if (last1 >= last2) {
+                       DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                               ", giving up...\n"));
+                       goto fail_finish;
+                   }
+                   DEBUG_r(PerlIO_printf(Perl_debug_log,
+                       ", trying floating at offset %ld...\n",
+                       (long)(HOP3c(s1, 1, strend) - i_strpos)));
+                   other_last = HOP3c(last1, prog->anchored_offset+1, strend);
+                   s = HOP3c(last, 1, strend);
+                   goto restart;
+               }
+               else {
+                   DEBUG_r(PerlIO_printf(Perl_debug_log, " at offset %ld...\n",
+                         (long)(s - i_strpos)));
+                   t = HOP3c(s, -prog->anchored_offset, strbeg);
+                   other_last = HOP3c(s, 1, strend);
+                   s = s1;
+                   if (t == strpos)
+                       goto try_at_start;
+                   goto try_at_offset;
                }
            }
        }
-       goto phooey;
-    } else if (prog->reganch & ROPT_ANCH_GPOS) {
-       if (regtry(prog, PL_reg_ganch))
-           goto got_it;
-       goto phooey;
-    }
+       else {          /* Take into account the floating substring. */
+           char *last, *last1;
+           char *s1 = s;
+           SV* must;
 
-    /* Messy cases:  unanchored match. */
-    if (prog->anchored_substr && prog->reganch & ROPT_SKIP) { 
-       /* we have /x+whatever/ */
-       /* it must be a one character string */
-       char ch = SvPVX(prog->anchored_substr)[0];
-       if (UTF) {
-           while (s < strend) {
-               if (*s == ch) {
-                   if (regtry(prog, s)) goto got_it;
-                   s += UTF8SKIP(s);
-                   while (s < strend && *s == ch)
-                       s += UTF8SKIP(s);
+           t = HOP3c(s, -start_shift, strbeg);
+           last1 = last =
+               HOP3c(strend, -prog->minlen + prog->float_min_offset, strbeg);
+           if (CHR_DIST((U8*)last, (U8*)t) > prog->float_max_offset)
+               last = HOP3c(t, prog->float_max_offset, strend);
+           s = HOP3c(t, prog->float_min_offset, strend);
+           if (s < other_last)
+               s = other_last;
+ /* XXXX It is not documented what units *_offsets are in.  Assume bytes.  */
+           must = do_utf8 ? prog->float_utf8 : prog->float_substr;
+           /* fbm_instr() takes into account exact value of end-of-str
+              if the check is SvTAIL(ed).  Since false positives are OK,
+              and end-of-str is not later than strend we are OK. */
+           if (must == &PL_sv_undef) {
+               s = (char*)NULL;
+               DEBUG_r(must = prog->float_utf8);       /* for debug message */
+           }
+           else
+               s = fbm_instr((unsigned char*)s,
+                             (unsigned char*)last + SvCUR(must)
+                                 - (SvTAIL(must)!=0),
+                             must, PL_multiline ? FBMrf_MULTILINE : 0);
+           DEBUG_r(PerlIO_printf(Perl_debug_log, "%s floating substr `%s%.*s%s'%s",
+                   (s ? "Found" : "Contradicts"),
+                   PL_colors[0],
+                     (int)(SvCUR(must) - (SvTAIL(must)!=0)),
+                     SvPVX(must),
+                     PL_colors[1], (SvTAIL(must) ? "$" : "")));
+           if (!s) {
+               if (last1 == last) {
+                   DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                           ", giving up...\n"));
+                   goto fail_finish;
                }
-               s += UTF8SKIP(s);
+               DEBUG_r(PerlIO_printf(Perl_debug_log,
+                   ", trying anchored starting at offset %ld...\n",
+                   (long)(s1 + 1 - i_strpos)));
+               other_last = last;
+               s = HOP3c(t, 1, strend);
+               goto restart;
+           }
+           else {
+               DEBUG_r(PerlIO_printf(Perl_debug_log, " at offset %ld...\n",
+                     (long)(s - i_strpos)));
+               other_last = s; /* Fix this later. --Hugo */
+               s = s1;
+               if (t == strpos)
+                   goto try_at_start;
+               goto try_at_offset;
            }
        }
-       else {
-           while (s < strend) {
-               if (*s == ch) {
-                   if (regtry(prog, s)) goto got_it;
-                   s++;
-                   while (s < strend && *s == ch)
-                       s++;
+    }
+
+    t = s - prog->check_offset_max;
+    if (s - strpos > prog->check_offset_max  /* signed-corrected t > strpos */
+        && (!do_utf8
+           || ((t = reghopmaybe3_c(s, -prog->check_offset_max, strpos))
+                && t > strpos))) {
+       /* Fixed substring is found far enough so that the match
+          cannot start at strpos. */
+      try_at_offset:
+       if (ml_anch && t[-1] != '\n') {
+           /* Eventually fbm_*() should handle this, but often
+              anchored_offset is not 0, so this check will not be wasted. */
+           /* XXXX In the code below we prefer to look for "^" even in
+              presence of anchored substrings.  And we search even
+              beyond the found float position.  These pessimizations
+              are historical artefacts only.  */
+         find_anchor:
+           while (t < strend - prog->minlen) {
+               if (*t == '\n') {
+                   if (t < check_at - prog->check_offset_min) {
+                       if (do_utf8 ? prog->anchored_utf8 : prog->anchored_substr) {
+                           /* Since we moved from the found position,
+                              we definitely contradict the found anchored
+                              substr.  Due to the above check we do not
+                              contradict "check" substr.
+                              Thus we can arrive here only if check substr
+                              is float.  Redo checking for "other"=="fixed".
+                            */
+                           strpos = t + 1;                     
+                           DEBUG_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m at offset %ld, rescanning for anchored from offset %ld...\n",
+                               PL_colors[0],PL_colors[1], (long)(strpos - i_strpos), (long)(strpos - i_strpos + prog->anchored_offset)));
+                           goto do_other_anchored;
+                       }
+                       /* We don't contradict the found floating substring. */
+                       /* XXXX Why not check for STCLASS? */
+                       s = t + 1;
+                       DEBUG_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m at offset %ld...\n",
+                           PL_colors[0],PL_colors[1], (long)(s - i_strpos)));
+                       goto set_useful;
+                   }
+                   /* Position contradicts check-string */
+                   /* XXXX probably better to look for check-string
+                      than for "\n", so one should lower the limit for t? */
+                   DEBUG_r(PerlIO_printf(Perl_debug_log, "Found /%s^%s/m, restarting lookup for check-string at offset %ld...\n",
+                       PL_colors[0],PL_colors[1], (long)(t + 1 - i_strpos)));
+                   other_last = strpos = s = t + 1;
+                   goto restart;
                }
-               s++;
+               t++;
            }
+           DEBUG_r(PerlIO_printf(Perl_debug_log, "Did not find /%s^%s/m...\n",
+                       PL_colors[0],PL_colors[1]));
+           goto fail_finish;
+       }
+       else {
+           DEBUG_r(PerlIO_printf(Perl_debug_log, "Starting position does not contradict /%s^%s/m...\n",
+                       PL_colors[0],PL_colors[1]));
        }
+       s = t;
+      set_useful:
+       ++BmUSEFUL(do_utf8 ? prog->check_utf8 : prog->check_substr);    /* hooray/5 */
     }
-    /*SUPPRESS 560*/
-    else if (prog->anchored_substr != Nullsv
-            || (prog->float_substr != Nullsv 
-                && prog->float_max_offset < strend - s)) {
-       SV *must = prog->anchored_substr 
-           ? prog->anchored_substr : prog->float_substr;
-       I32 back_max = 
-           prog->anchored_substr ? prog->anchored_offset : prog->float_max_offset;
-       I32 back_min = 
-           prog->anchored_substr ? prog->anchored_offset : prog->float_min_offset;
-       I32 delta = back_max - back_min;
-       char *last = HOPc(strend, 0-(CHR_SVLEN(must) + back_min)); /* Cannot start after this */
-       char *last1;            /* Last position checked before */
-
-       if (s > PL_bostr)
-           last1 = HOPc(s, -1);
+    else {
+       /* The found string does not prohibit matching at strpos,
+          - no optimization of calling REx engine can be performed,
+          unless it was an MBOL and we are not after MBOL,
+          or a future STCLASS check will fail this. */
+      try_at_start:
+       /* Even in this situation we may use MBOL flag if strpos is offset
+          wrt the start of the string. */
+       if (ml_anch && sv && !SvROK(sv) /* See prev comment on SvROK */
+           && (strpos != strbeg) && strpos[-1] != '\n'
+           /* May be due to an implicit anchor of m{.*foo}  */
+           && !(prog->reganch & ROPT_IMPLICIT))
+       {
+           t = strpos;
+           goto find_anchor;
+       }
+       DEBUG_r( if (ml_anch)
+           PerlIO_printf(Perl_debug_log, "Position at offset %ld does not contradict /%s^%s/m...\n",
+                       (long)(strpos - i_strpos), PL_colors[0],PL_colors[1]);
+       );
+      success_at_start:
+       if (!(prog->reganch & ROPT_NAUGHTY)     /* XXXX If strpos moved? */
+           && (do_utf8 ? (
+               prog->check_utf8                /* Could be deleted already */
+               && --BmUSEFUL(prog->check_utf8) < 0
+               && (prog->check_utf8 == prog->float_utf8)
+           ) : (
+               prog->check_substr              /* Could be deleted already */
+               && --BmUSEFUL(prog->check_substr) < 0
+               && (prog->check_substr == prog->float_substr)
+           )))
+       {
+           /* If flags & SOMETHING - do not do it many times on the same match */
+           DEBUG_r(PerlIO_printf(Perl_debug_log, "... Disabling check substring...\n"));
+           SvREFCNT_dec(do_utf8 ? prog->check_utf8 : prog->check_substr);
+           if (do_utf8 ? prog->check_substr : prog->check_utf8)
+               SvREFCNT_dec(do_utf8 ? prog->check_substr : prog->check_utf8);
+           prog->check_substr = prog->check_utf8 = Nullsv;     /* disable */
+           prog->float_substr = prog->float_utf8 = Nullsv;     /* clear */
+           check = Nullsv;                     /* abort */
+           s = strpos;
+           /* XXXX This is a remnant of the old implementation.  It
+                   looks wasteful, since now INTUIT can use many
+                   other heuristics. */
+           prog->reganch &= ~RE_USE_INTUIT;
+       }
        else
-           last1 = s - 1;      /* bogus */
+           s = strpos;
+    }
 
-       /* XXXX check_substr already used to find `s', can optimize if
-          check_substr==must. */
-       scream_pos = -1;
-       dontbother = end_shift;
-       strend = HOPc(strend, -dontbother);
-       while ( (s <= last) &&
-               ((flags & REXEC_SCREAM) 
-                ? (s = screaminstr(sv, must, HOPc(s, back_min) - strbeg,
-                                   end_shift, &scream_pos, 0))
-                : (s = fbm_instr((unsigned char*)HOP(s, back_min),
-                                 (unsigned char*)strend, must, 0))) ) {
-           if (HOPc(s, -back_max) > last1) {
-               last1 = HOPc(s, -back_min);
-               s = HOPc(s, -back_max);
-           }
-           else {
-               char *t = (last1 >= PL_bostr) ? HOPc(last1, 1) : last1 + 1;
+    /* Last resort... */
+    /* XXXX BmUSEFUL already changed, maybe multiple change is meaningful... */
+    if (prog->regstclass) {
+       /* minlen == 0 is possible if regstclass is \b or \B,
+          and the fixed substr is ''$.
+          Since minlen is already taken into account, s+1 is before strend;
+          accidentally, minlen >= 1 guaranties no false positives at s + 1
+          even for \b or \B.  But (minlen? 1 : 0) below assumes that
+          regstclass does not come from lookahead...  */
+       /* If regstclass takes bytelength more than 1: If charlength==1, OK.
+          This leaves EXACTF only, which is dealt with in find_byclass().  */
+       U8* str = (U8*)STRING(prog->regstclass);
+       int cl_l = (PL_regkind[(U8)OP(prog->regstclass)] == EXACT
+                   ? CHR_DIST(str+STR_LEN(prog->regstclass), str)
+                   : 1);
+       char *endpos = (prog->anchored_substr || prog->anchored_utf8 || ml_anch)
+               ? HOP3c(s, (prog->minlen ? cl_l : 0), strend)
+               : (prog->float_substr || prog->float_utf8
+                  ? HOP3c(HOP3c(check_at, -start_shift, strbeg),
+                          cl_l, strend)
+                  : strend);
+       char *startpos = strbeg;
 
-               last1 = HOPc(s, -back_min);
-               s = t;          
+       t = s;
+       cache_re(prog);
+       s = find_byclass(prog, prog->regstclass, s, endpos, startpos, 1);
+       if (!s) {
+#ifdef DEBUGGING
+           char *what = 0;
+#endif
+           if (endpos == strend) {
+               DEBUG_r( PerlIO_printf(Perl_debug_log,
+                               "Could not match STCLASS...\n") );
+               goto fail;
            }
-           if (UTF) {
-               while (s <= last1) {
-                   if (regtry(prog, s))
-                       goto got_it;
-                   s += UTF8SKIP(s);
+           DEBUG_r( PerlIO_printf(Perl_debug_log,
+                                  "This position contradicts STCLASS...\n") );
+           if ((prog->reganch & ROPT_ANCH) && !ml_anch)
+               goto fail;
+           /* Contradict one of substrings */
+           if (prog->anchored_substr || prog->anchored_utf8) {
+               if ((do_utf8 ? prog->anchored_utf8 : prog->anchored_substr) == check) {
+                   DEBUG_r( what = "anchored" );
+                 hop_and_restart:
+                   s = HOP3c(t, 1, strend);
+                   if (s + start_shift + end_shift > strend) {
+                       /* XXXX Should be taken into account earlier? */
+                       DEBUG_r( PerlIO_printf(Perl_debug_log,
+                                              "Could not match STCLASS...\n") );
+                       goto fail;
+                   }
+                   if (!check)
+                       goto giveup;
+                   DEBUG_r( PerlIO_printf(Perl_debug_log,
+                               "Looking for %s substr starting at offset %ld...\n",
+                                what, (long)(s + start_shift - i_strpos)) );
+                   goto restart;
                }
+               /* Have both, check_string is floating */
+               if (t + start_shift >= check_at) /* Contradicts floating=check */
+                   goto retry_floating_check;
+               /* Recheck anchored substring, but not floating... */
+               s = check_at;
+               if (!check)
+                   goto giveup;
+               DEBUG_r( PerlIO_printf(Perl_debug_log,
+                         "Looking for anchored substr starting at offset %ld...\n",
+                         (long)(other_last - i_strpos)) );
+               goto do_other_anchored;
            }
-           else {
-               while (s <= last1) {
-                   if (regtry(prog, s))
-                       goto got_it;
-                   s++;
-               }
+           /* Another way we could have checked stclass at the
+               current position only: */
+           if (ml_anch) {
+               s = t = t + 1;
+               if (!check)
+                   goto giveup;
+               DEBUG_r( PerlIO_printf(Perl_debug_log,
+                         "Looking for /%s^%s/m starting at offset %ld...\n",
+                         PL_colors[0],PL_colors[1], (long)(t - i_strpos)) );
+               goto try_at_offset;
            }
+           if (!(do_utf8 ? prog->float_utf8 : prog->float_substr))     /* Could have been deleted */
+               goto fail;
+           /* Check is floating subtring. */
+         retry_floating_check:
+           t = check_at - start_shift;
+           DEBUG_r( what = "floating" );
+           goto hop_and_restart;
        }
-       goto phooey;
+       if (t != s) {
+            DEBUG_r(PerlIO_printf(Perl_debug_log,
+                       "By STCLASS: moving %ld --> %ld\n",
+                                  (long)(t - i_strpos), (long)(s - i_strpos))
+                   );
+        }
+        else {
+            DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                  "Does not contradict STCLASS...\n"); 
+                   );
+        }
     }
-    else if (c = prog->regstclass) {
+  giveup:
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%s%s:%s match at offset %ld\n",
+                         PL_colors[4], (check ? "Guessed" : "Giving up"),
+                         PL_colors[5], (long)(s - i_strpos)) );
+    return s;
+
+  fail_finish:                         /* Substring not found */
+    if (prog->check_substr || prog->check_utf8)                /* could be removed already */
+       BmUSEFUL(do_utf8 ? prog->check_utf8 : prog->check_substr) += 5; /* hooray */
+  fail:
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%sMatch rejected by optimizer%s\n",
+                         PL_colors[4],PL_colors[5]));
+    return Nullch;
+}
+
+/* We know what class REx starts with.  Try to find this position... */
+STATIC char *
+S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *startpos, I32 norun)
+{
        I32 doevery = (prog->reganch & ROPT_SKIP) == 0;
-       char *cc;
+       char *m;
+       STRLEN ln;
+       STRLEN lnc;
+       unsigned int c1;
+       unsigned int c2;
+       char *e;
+       register I32 tmp = 1;   /* Scratch variable? */
+       register bool do_utf8 = PL_reg_match_utf8;
 
-       if (minlen)
-           dontbother = minlen - 1;
-       strend = HOPc(strend, -dontbother);     /* don't bother with what can't match */
-       tmp = 1;
        /* We know what class it must start with. */
        switch (OP(c)) {
-       case ANYOFUTF8:
-           cc = (char *) OPERAND(c);
-           while (s < strend) {
-               if (REGINCLASSUTF8(c, (U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
-                   else
-                       tmp = doevery;
-               }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
+       case ANYOF:
+           if (do_utf8) {
+                while (s < strend) {
+                     if ((ANYOF_FLAGS(c) & ANYOF_UNICODE) ||
+                         !UTF8_IS_INVARIANT((U8)s[0]) ?
+                         reginclass(c, (U8*)s, 0, do_utf8) :
+                         REGINCLASS(c, (U8*)s)) {
+                          if (tmp && (norun || regtry(prog, s)))
+                               goto got_it;
+                          else
+                               tmp = doevery;
+                     }
+                     else 
+                          tmp = 1;
+                     s += UTF8SKIP(s);
+                }
+           }
+           else {
+                while (s < strend) {
+                     STRLEN skip = 1;
+
+                     if (REGINCLASS(c, (U8*)s) ||
+                         (ANYOF_FOLD_SHARP_S(c, s, strend) &&
+                          /* The assignment of 2 is intentional:
+                           * for the folded sharp s, the skip is 2. */
+                          (skip = SHARP_S_SKIP))) {
+                          if (tmp && (norun || regtry(prog, s)))
+                               goto got_it;
+                          else
+                               tmp = doevery;
+                     }
+                     else 
+                          tmp = 1;
+                     s += skip;
+                }
            }
            break;
-       case ANYOF:
-           cc = (char *) OPERAND(c);
+       case CANY:
            while (s < strend) {
-               if (REGINCLASS(cc, *s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
-                   else
-                       tmp = doevery;
-               }
+               if (tmp && (norun || regtry(prog, s)))
+                   goto got_it;
                else
-                   tmp = 1;
+                   tmp = doevery;
                s++;
            }
            break;
-       case BOUNDL:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case BOUND:
-           if (minlen) {
-               dontbother++;
-               strend -= 1;
-           }
-           tmp = (s != startpos) ? UCHARAT(s - 1) : PL_regprev;
-           tmp = ((OP(c) == BOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
-           while (s < strend) {
-               if (tmp == !(OP(c) == BOUND ? isALNUM(*s) : isALNUM_LC(*s))) {
-                   tmp = !tmp;
-                   if (regtry(prog, s))
-                       goto got_it;
+       case EXACTF:
+           m   = STRING(c);
+           ln  = STR_LEN(c);   /* length to match in octets/bytes */
+           lnc = (I32) ln;     /* length to match in characters */
+           if (UTF) {
+               STRLEN ulen1, ulen2;
+               U8 *sm = (U8 *) m;
+               U8 tmpbuf1[UTF8_MAXLEN_UCLC+1];
+               U8 tmpbuf2[UTF8_MAXLEN_UCLC+1];
+
+               to_utf8_lower((U8*)m, tmpbuf1, &ulen1);
+               to_utf8_upper((U8*)m, tmpbuf2, &ulen2);
+
+               c1 = utf8n_to_uvchr(tmpbuf1, UTF8_MAXLEN_UCLC, 
+                                   0, ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY);
+               c2 = utf8n_to_uvchr(tmpbuf2, UTF8_MAXLEN_UCLC,
+                                   0, ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY);
+               lnc = 0;
+               while (sm < ((U8 *) m + ln)) {
+                   lnc++;
+                   sm += UTF8SKIP(sm);
                }
-               s++;
            }
-           if ((minlen || tmp) && regtry(prog,s))
-               goto got_it;
-           break;
-       case BOUNDLUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case BOUNDUTF8:
-           if (minlen) {
-               dontbother++;
-               strend = reghop_c(strend, -1);
+           else {
+               c1 = *(U8*)m;
+               c2 = PL_fold[c1];
            }
-           tmp = (I32)(s != startpos) ? utf8_to_uv(reghop((U8*)s, -1), 0) : PL_regprev;
-           tmp = ((OP(c) == BOUND ? isALNUM_uni(tmp) : isALNUM_LC_uni(tmp)) != 0);
-           while (s < strend) {
-               if (tmp == !(OP(c) == BOUND ?
-                            swash_fetch(PL_utf8_alnum, (U8*)s) :
-                            isALNUM_LC_utf8((U8*)s)))
-               {
-                   tmp = !tmp;
-                   if (regtry(prog, s))
-                       goto got_it;
+           goto do_exactf;
+       case EXACTFL:
+           m   = STRING(c);
+           ln  = STR_LEN(c);
+           lnc = (I32) ln;
+           c1 = *(U8*)m;
+           c2 = PL_fold_locale[c1];
+         do_exactf:
+           e = HOP3c(strend, -((I32)lnc), s);
+
+           if (norun && e < s)
+               e = s;                  /* Due to minlen logic of intuit() */
+
+           /* The idea in the EXACTF* cases is to first find the
+            * first character of the EXACTF* node and then, if
+            * necessary, case-insensitively compare the full
+            * text of the node.  The c1 and c2 are the first
+            * characters (though in Unicode it gets a bit
+            * more complicated because there are more cases
+            * than just upper and lower: one needs to use
+            * the so-called folding case for case-insensitive
+            * matching (called "loose matching" in Unicode).
+            * ibcmp_utf8() will do just that. */
+
+           if (do_utf8) {
+               UV c, f;
+               U8 tmpbuf [UTF8_MAXLEN+1];
+               U8 foldbuf[UTF8_MAXLEN_FOLD+1];
+               STRLEN len, foldlen;
+               
+               if (c1 == c2) {
+                   /* Upper and lower of 1st char are equal -
+                    * probably not a "letter". */
+                   while (s <= e) {
+                       c = utf8n_to_uvchr((U8*)s, UTF8_MAXLEN, &len,
+                                          ckWARN(WARN_UTF8) ?
+                                          0 : UTF8_ALLOW_ANY);
+                       if ( c == c1
+                            && (ln == len ||
+                                ibcmp_utf8(s, (char **)0, 0,  do_utf8,
+                                           m, (char **)0, ln, (bool)UTF))
+                            && (norun || regtry(prog, s)) )
+                           goto got_it;
+                       else {
+                            uvchr_to_utf8(tmpbuf, c);
+                            f = to_utf8_fold(tmpbuf, foldbuf, &foldlen);
+                            if ( f != c
+                                 && (f == c1 || f == c2)
+                                 && (ln == foldlen ||
+                                     !ibcmp_utf8((char *) foldbuf,
+                                                 (char **)0, foldlen, do_utf8,
+                                                 m,
+                                                 (char **)0, ln, (bool)UTF))
+                                 && (norun || regtry(prog, s)) )
+                                 goto got_it;
+                       }
+                       s += len;
+                   }
+               }
+               else {
+                   while (s <= e) {
+                     c = utf8n_to_uvchr((U8*)s, UTF8_MAXLEN, &len,
+                                          ckWARN(WARN_UTF8) ?
+                                          0 : UTF8_ALLOW_ANY);
+
+                       /* Handle some of the three Greek sigmas cases.
+                        * Note that not all the possible combinations
+                        * are handled here: some of them are handled
+                        * by the standard folding rules, and some of
+                        * them (the character class or ANYOF cases)
+                        * are handled during compiletime in
+                        * regexec.c:S_regclass(). */
+                       if (c == (UV)UNICODE_GREEK_CAPITAL_LETTER_SIGMA ||
+                           c == (UV)UNICODE_GREEK_SMALL_LETTER_FINAL_SIGMA)
+                           c = (UV)UNICODE_GREEK_SMALL_LETTER_SIGMA;
+
+                       if ( (c == c1 || c == c2)
+                            && (ln == len ||
+                                ibcmp_utf8(s, (char **)0, 0,  do_utf8,
+                                           m, (char **)0, ln, (bool)UTF))
+                            && (norun || regtry(prog, s)) )
+                           goto got_it;
+                       else {
+                            uvchr_to_utf8(tmpbuf, c);
+                            f = to_utf8_fold(tmpbuf, foldbuf, &foldlen);
+                            if ( f != c
+                                 && (f == c1 || f == c2)
+                                 && (ln == foldlen ||
+                                     !ibcmp_utf8((char *) foldbuf,
+                                                 (char **)0, foldlen, do_utf8,
+                                                 m,
+                                                 (char **)0, ln, (bool)UTF))
+                                 && (norun || regtry(prog, s)) )
+                                 goto got_it;
+                       }
+                       s += len;
+                   }
                }
-               s += UTF8SKIP(s);
            }
-           if ((minlen || tmp) && regtry(prog,s))
-               goto got_it;
+           else {
+               if (c1 == c2)
+                   while (s <= e) {
+                       if ( *(U8*)s == c1
+                            && (ln == 1 || !(OP(c) == EXACTF
+                                             ? ibcmp(s, m, ln)
+                                             : ibcmp_locale(s, m, ln)))
+                            && (norun || regtry(prog, s)) )
+                           goto got_it;
+                       s++;
+                   }
+               else
+                   while (s <= e) {
+                       if ( (*(U8*)s == c1 || *(U8*)s == c2)
+                            && (ln == 1 || !(OP(c) == EXACTF
+                                             ? ibcmp(s, m, ln)
+                                             : ibcmp_locale(s, m, ln)))
+                            && (norun || regtry(prog, s)) )
+                           goto got_it;
+                       s++;
+                   }
+           }
            break;
-       case NBOUNDL:
+       case BOUNDL:
            PL_reg_flags |= RF_tainted;
            /* FALL THROUGH */
-       case NBOUND:
-           if (minlen) {
-               dontbother++;
-               strend -= 1;
+       case BOUND:
+           if (do_utf8) {
+               if (s == PL_bostr)
+                   tmp = '\n';
+               else {
+                   U8 *r = reghop3((U8*)s, -1, (U8*)PL_bostr);
+               
+                   tmp = utf8n_to_uvchr(r, UTF8SKIP(r), 0, 0);
+               }
+               tmp = ((OP(c) == BOUND ?
+                       isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0);
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               while (s < strend) {
+                   if (tmp == !(OP(c) == BOUND ?
+                                swash_fetch(PL_utf8_alnum, (U8*)s, do_utf8) :
+                                isALNUM_LC_utf8((U8*)s)))
+                   {
+                       tmp = !tmp;
+                       if ((norun || regtry(prog, s)))
+                           goto got_it;
+                   }
+                   s += UTF8SKIP(s);
+               }
            }
-           tmp = (s != startpos) ? UCHARAT(s - 1) : PL_regprev;
-           tmp = ((OP(c) == NBOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
-           while (s < strend) {
-               if (tmp == !(OP(c) == NBOUND ? isALNUM(*s) : isALNUM_LC(*s)))
-                   tmp = !tmp;
-               else if (regtry(prog, s))
-                   goto got_it;
-               s++;
+           else {
+               tmp = (s != PL_bostr) ? UCHARAT(s - 1) : '\n';
+               tmp = ((OP(c) == BOUND ? isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
+               while (s < strend) {
+                   if (tmp ==
+                       !(OP(c) == BOUND ? isALNUM(*s) : isALNUM_LC(*s))) {
+                       tmp = !tmp;
+                       if ((norun || regtry(prog, s)))
+                           goto got_it;
+                   }
+                   s++;
+               }
            }
-           if ((minlen || !tmp) && regtry(prog,s))
+           if ((!prog->minlen && tmp) && (norun || regtry(prog, s)))
                goto got_it;
            break;
-       case NBOUNDLUTF8:
+       case NBOUNDL:
            PL_reg_flags |= RF_tainted;
            /* FALL THROUGH */
-       case NBOUNDUTF8:
-           if (minlen) {
-               dontbother++;
-               strend = reghop_c(strend, -1);
+       case NBOUND:
+           if (do_utf8) {
+               if (s == PL_bostr)
+                   tmp = '\n';
+               else {
+                   U8 *r = reghop3((U8*)s, -1, (U8*)PL_bostr);
+               
+                   tmp = utf8n_to_uvchr(r, UTF8SKIP(r), 0, 0);
+               }
+               tmp = ((OP(c) == NBOUND ?
+                       isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0);
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               while (s < strend) {
+                   if (tmp == !(OP(c) == NBOUND ?
+                                swash_fetch(PL_utf8_alnum, (U8*)s, do_utf8) :
+                                isALNUM_LC_utf8((U8*)s)))
+                       tmp = !tmp;
+                   else if ((norun || regtry(prog, s)))
+                       goto got_it;
+                   s += UTF8SKIP(s);
+               }
            }
-           tmp = (I32)(s != startpos) ? utf8_to_uv(reghop((U8*)s, -1), 0) : PL_regprev;
-           tmp = ((OP(c) == NBOUND ? isALNUM_uni(tmp) : isALNUM_LC_uni(tmp)) != 0);
-           while (s < strend) {
-               if (tmp == !(OP(c) == NBOUND ?
-                            swash_fetch(PL_utf8_alnum, (U8*)s) :
-                            isALNUM_LC_utf8((U8*)s)))
-                   tmp = !tmp;
-               else if (regtry(prog, s))
-                   goto got_it;
-               s += UTF8SKIP(s);
+           else {
+               tmp = (s != PL_bostr) ? UCHARAT(s - 1) : '\n';
+               tmp = ((OP(c) == NBOUND ?
+                       isALNUM(tmp) : isALNUM_LC(tmp)) != 0);
+               while (s < strend) {
+                   if (tmp ==
+                       !(OP(c) == NBOUND ? isALNUM(*s) : isALNUM_LC(*s)))
+                       tmp = !tmp;
+                   else if ((norun || regtry(prog, s)))
+                       goto got_it;
+                   s++;
+               }
            }
-           if ((minlen || !tmp) && regtry(prog,s))
+           if ((!prog->minlen && !tmp) && (norun || regtry(prog, s)))
                goto got_it;
            break;
        case ALNUM:
-           while (s < strend) {
-               if (isALNUM(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               while (s < strend) {
+                   if (swash_fetch(PL_utf8_alnum, (U8*)s, do_utf8)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case ALNUMUTF8:
-           while (s < strend) {
-               if (swash_fetch(PL_utf8_alnum, (U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (isALNUM(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case ALNUML:
            PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (isALNUM_LC(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (isALNUM_LC_utf8((U8*)s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case ALNUMLUTF8:
-           PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (isALNUM_LC_utf8((U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (isALNUM_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case NALNUM:
-           while (s < strend) {
-               if (!isALNUM(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               while (s < strend) {
+                   if (!swash_fetch(PL_utf8_alnum, (U8*)s, do_utf8)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case NALNUMUTF8:
-           while (s < strend) {
-               if (!swash_fetch(PL_utf8_alnum, (U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (!isALNUM(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case NALNUML:
            PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (!isALNUM_LC(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (!isALNUM_LC_utf8((U8*)s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case NALNUMLUTF8:
-           PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (!isALNUM_LC_utf8((U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (!isALNUM_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case SPACE:
-           while (s < strend) {
-               if (isSPACE(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(space," ");
+               while (s < strend) {
+                   if (*s == ' ' || swash_fetch(PL_utf8_space,(U8*)s, do_utf8)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case SPACEUTF8:
-           while (s < strend) {
-               if (*s == ' ' || swash_fetch(PL_utf8_space,(U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (isSPACE(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case SPACEL:
            PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (isSPACE_LC(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (*s == ' ' || isSPACE_LC_utf8((U8*)s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case SPACELUTF8:
-           PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (*s == ' ' || isSPACE_LC_utf8((U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (isSPACE_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case NSPACE:
-           while (s < strend) {
-               if (!isSPACE(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(space," ");
+               while (s < strend) {
+                   if (!(*s == ' ' || swash_fetch(PL_utf8_space,(U8*)s, do_utf8))) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case NSPACEUTF8:
-           while (s < strend) {
-               if (!(*s == ' ' || swash_fetch(PL_utf8_space,(U8*)s))) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (!isSPACE(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case NSPACEL:
            PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (!isSPACE_LC(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (!(*s == ' ' || isSPACE_LC_utf8((U8*)s))) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
-               s++;
            }
-           break;
-       case NSPACELUTF8:
-           PL_reg_flags |= RF_tainted;
-           while (s < strend) {
-               if (!(*s == ' ' || isSPACE_LC_utf8((U8*)s))) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           else {
+               while (s < strend) {
+                   if (!isSPACE_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case DIGIT:
-           while (s < strend) {
-               if (isDIGIT(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(digit,"0");
+               while (s < strend) {
+                   if (swash_fetch(PL_utf8_digit,(U8*)s, do_utf8)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
+               }
+           }
+           else {
+               while (s < strend) {
+                   if (isDIGIT(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
+                   else
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s++;
            }
            break;
-       case DIGITUTF8:
-           while (s < strend) {
-               if (swash_fetch(PL_utf8_digit,(U8*)s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+       case DIGITL:
+           PL_reg_flags |= RF_tainted;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (isDIGIT_LC_utf8((U8*)s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
+               }
+           }
+           else {
+               while (s < strend) {
+                   if (isDIGIT_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
+                   else
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s += UTF8SKIP(s);
            }
            break;
        case NDIGIT:
-           while (s < strend) {
-               if (!isDIGIT(*s)) {
-                   if (tmp && regtry(prog, s))
-                       goto got_it;
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(digit,"0");
+               while (s < strend) {
+                   if (!swash_fetch(PL_utf8_digit,(U8*)s, do_utf8)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
                    else
-                       tmp = doevery;
+                       tmp = 1;
+                   s += UTF8SKIP(s);
+               }
+           }
+           else {
+               while (s < strend) {
+                   if (!isDIGIT(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
+                   else
+                       tmp = 1;
+                   s++;
                }
-               else
-                   tmp = 1;
-               s++;
            }
            break;
-       case NDIGITUTF8:
-           while (s < strend) {
-               if (!swash_fetch(PL_utf8_digit,(U8*)s)) {
-                   if (tmp && regtry(prog, s))
+       case NDIGITL:
+           PL_reg_flags |= RF_tainted;
+           if (do_utf8) {
+               while (s < strend) {
+                   if (!isDIGIT_LC_utf8((U8*)s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
+                   else
+                       tmp = 1;
+                   s += UTF8SKIP(s);
+               }
+           }
+           else {
+               while (s < strend) {
+                   if (!isDIGIT_LC(*s)) {
+                       if (tmp && (norun || regtry(prog, s)))
+                           goto got_it;
+                       else
+                           tmp = doevery;
+                   }
+                   else
+                       tmp = 1;
+                   s++;
+               }
+           }
+           break;
+       default:
+           Perl_croak(aTHX_ "panic: unknown regstclass %d", (int)OP(c));
+           break;
+       }
+       return 0;
+      got_it:
+       return s;
+}
+
+/*
+ - regexec_flags - match a regexp against a string
+ */
+I32
+Perl_regexec_flags(pTHX_ register regexp *prog, char *stringarg, register char *strend,
+             char *strbeg, I32 minend, SV *sv, void *data, U32 flags)
+/* strend: pointer to null at end of string */
+/* strbeg: real beginning of string */
+/* minend: end of match must be >=minend after stringarg. */
+/* data: May be used for some additional optimizations. */
+/* nosave: For optimizations. */
+{
+    register char *s;
+    register regnode *c;
+    register char *startpos = stringarg;
+    I32 minlen;                /* must match at least this many chars */
+    I32 dontbother = 0;        /* how many characters not to try at end */
+    /* I32 start_shift = 0; */         /* Offset of the start to find
+                                        constant substr. */            /* CC */
+    I32 end_shift = 0;                 /* Same for the end. */         /* CC */
+    I32 scream_pos = -1;               /* Internal iterator of scream. */
+    char *scream_olds;
+    SV* oreplsv = GvSV(PL_replgv);
+    bool do_utf8 = DO_UTF8(sv);
+#ifdef DEBUGGING
+    SV *dsv0 = PERL_DEBUG_PAD_ZERO(0);
+    SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
+#endif
+    RX_MATCH_UTF8_set(prog,do_utf8);
+
+    PL_regcc = 0;
+
+    cache_re(prog);
+#ifdef DEBUGGING
+    PL_regnarrate = DEBUG_r_TEST;
+#endif
+
+    /* Be paranoid... */
+    if (prog == NULL || startpos == NULL) {
+       Perl_croak(aTHX_ "NULL regexp parameter");
+       return 0;
+    }
+
+    minlen = prog->minlen;
+    if (strend - startpos < minlen) {
+        DEBUG_r(PerlIO_printf(Perl_debug_log,
+                             "String too short [regexec_flags]...\n"));
+       goto phooey;
+    }
+
+    /* Check validity of program. */
+    if (UCHARAT(prog->program) != REG_MAGIC) {
+       Perl_croak(aTHX_ "corrupted regexp program");
+    }
+
+    PL_reg_flags = 0;
+    PL_reg_eval_set = 0;
+    PL_reg_maxiter = 0;
+
+    if (prog->reganch & ROPT_UTF8)
+       PL_reg_flags |= RF_utf8;
+
+    /* Mark beginning of line for ^ and lookbehind. */
+    PL_regbol = startpos;
+    PL_bostr  = strbeg;
+    PL_reg_sv = sv;
+
+    /* Mark end of line for $ (and such) */
+    PL_regeol = strend;
+
+    /* see how far we have to get to not match where we matched before */
+    PL_regtill = startpos+minend;
+
+    /* We start without call_cc context.  */
+    PL_reg_call_cc = 0;
+
+    /* If there is a "must appear" string, look for it. */
+    s = startpos;
+
+    if (prog->reganch & ROPT_GPOS_SEEN) { /* Need to have PL_reg_ganch */
+       MAGIC *mg;
+
+       if (flags & REXEC_IGNOREPOS)    /* Means: check only at start */
+           PL_reg_ganch = startpos;
+       else if (sv && SvTYPE(sv) >= SVt_PVMG
+                 && SvMAGIC(sv)
+                 && (mg = mg_find(sv, PERL_MAGIC_regex_global))
+                 && mg->mg_len >= 0) {
+           PL_reg_ganch = strbeg + mg->mg_len; /* Defined pos() */
+           if (prog->reganch & ROPT_ANCH_GPOS) {
+               if (s > PL_reg_ganch)
+                   goto phooey;
+               s = PL_reg_ganch;
+           }
+       }
+       else                            /* pos() not defined */
+           PL_reg_ganch = strbeg;
+    }
+
+    if (!(flags & REXEC_CHECKED) && (prog->check_substr != Nullsv || prog->check_utf8 != Nullsv)) {
+       re_scream_pos_data d;
+
+       d.scream_olds = &scream_olds;
+       d.scream_pos = &scream_pos;
+       s = re_intuit_start(prog, sv, s, strend, flags, &d);
+       if (!s) {
+           DEBUG_r(PerlIO_printf(Perl_debug_log, "Not present...\n"));
+           goto phooey;        /* not present */
+       }
+    }
+
+    DEBUG_r({
+        char *s0   = UTF ?
+          pv_uni_display(dsv0, (U8*)prog->precomp, prog->prelen, 60,
+                         UNI_DISPLAY_REGEX) :
+          prog->precomp;
+        int   len0 = UTF ? SvCUR(dsv0) : prog->prelen;
+        char *s1   = do_utf8 ? sv_uni_display(dsv1, sv, 60,
+                                              UNI_DISPLAY_REGEX) : startpos;
+        int   len1 = do_utf8 ? SvCUR(dsv1) : strend - startpos;
+        if (!PL_colorset)
+            reginitcolors();
+        PerlIO_printf(Perl_debug_log,
+                      "%sMatching REx%s `%s%*.*s%s%s' against `%s%.*s%s%s'\n",
+                      PL_colors[4],PL_colors[5],PL_colors[0],
+                      len0, len0, s0,
+                      PL_colors[1],
+                      len0 > 60 ? "..." : "",
+                      PL_colors[0],
+                      (int)(len1 > 60 ? 60 : len1),
+                      s1, PL_colors[1],
+                      (len1 > 60 ? "..." : "")
+             );
+    });
+
+    /* Simplest case:  anchored match need be tried only once. */
+    /*  [unless only anchor is BOL and multiline is set] */
+    if (prog->reganch & (ROPT_ANCH & ~ROPT_ANCH_GPOS)) {
+       if (s == startpos && regtry(prog, startpos))
+           goto got_it;
+       else if (PL_multiline || (prog->reganch & ROPT_IMPLICIT)
+                || (prog->reganch & ROPT_ANCH_MBOL)) /* XXXX SBOL? */
+       {
+           char *end;
+
+           if (minlen)
+               dontbother = minlen - 1;
+           end = HOP3c(strend, -dontbother, strbeg) - 1;
+           /* for multiline we only have to try after newlines */
+           if (prog->check_substr || prog->check_utf8) {
+               if (s == startpos)
+                   goto after_try;
+               while (1) {
+                   if (regtry(prog, s))
                        goto got_it;
+                 after_try:
+                   if (s >= end)
+                       goto phooey;
+                   if (prog->reganch & RE_USE_INTUIT) {
+                       s = re_intuit_start(prog, sv, s + 1, strend, flags, NULL);
+                       if (!s)
+                           goto phooey;
+                   }
                    else
-                       tmp = doevery;
+                       s++;
+               }               
+           } else {
+               if (s > startpos)
+                   s--;
+               while (s < end) {
+                   if (*s++ == '\n') { /* don't need PL_utf8skip here */
+                       if (regtry(prog, s))
+                           goto got_it;
+                   }
+               }               
+           }
+       }
+       goto phooey;
+    } else if (prog->reganch & ROPT_ANCH_GPOS) {
+       if (regtry(prog, PL_reg_ganch))
+           goto got_it;
+       goto phooey;
+    }
+
+    /* Messy cases:  unanchored match. */
+    if ((prog->anchored_substr || prog->anchored_utf8) && prog->reganch & ROPT_SKIP) {
+       /* we have /x+whatever/ */
+       /* it must be a one character string (XXXX Except UTF?) */
+       char ch;
+#ifdef DEBUGGING
+       int did_match = 0;
+#endif
+       if (!(do_utf8 ? prog->anchored_utf8 : prog->anchored_substr))
+           do_utf8 ? to_utf8_substr(prog) : to_byte_substr(prog);
+       ch = SvPVX(do_utf8 ? prog->anchored_utf8 : prog->anchored_substr)[0];
+
+       if (do_utf8) {
+           while (s < strend) {
+               if (*s == ch) {
+                   DEBUG_r( did_match = 1 );
+                   if (regtry(prog, s)) goto got_it;
+                   s += UTF8SKIP(s);
+                   while (s < strend && *s == ch)
+                       s += UTF8SKIP(s);
                }
-               else
-                   tmp = 1;
                s += UTF8SKIP(s);
            }
-           break;
        }
+       else {
+           while (s < strend) {
+               if (*s == ch) {
+                   DEBUG_r( did_match = 1 );
+                   if (regtry(prog, s)) goto got_it;
+                   s++;
+                   while (s < strend && *s == ch)
+                       s++;
+               }
+               s++;
+           }
+       }
+       DEBUG_r(if (!did_match)
+               PerlIO_printf(Perl_debug_log,
+                                  "Did not find anchored character...\n")
+               );
+    }
+    /*SUPPRESS 560*/
+    else if (prog->anchored_substr != Nullsv
+             || prog->anchored_utf8 != Nullsv
+             || ((prog->float_substr != Nullsv || prog->float_utf8 != Nullsv)
+                 && prog->float_max_offset < strend - s)) {
+       SV *must;
+       I32 back_max;
+       I32 back_min;
+       char *last;
+       char *last1;            /* Last position checked before */
+#ifdef DEBUGGING
+       int did_match = 0;
+#endif
+       if (prog->anchored_substr || prog->anchored_utf8) {
+           if (!(do_utf8 ? prog->anchored_utf8 : prog->anchored_substr))
+               do_utf8 ? to_utf8_substr(prog) : to_byte_substr(prog);
+           must = do_utf8 ? prog->anchored_utf8 : prog->anchored_substr;
+           back_max = back_min = prog->anchored_offset;
+       } else {
+           if (!(do_utf8 ? prog->float_utf8 : prog->float_substr))
+               do_utf8 ? to_utf8_substr(prog) : to_byte_substr(prog);
+           must = do_utf8 ? prog->float_utf8 : prog->float_substr;
+           back_max = prog->float_max_offset;
+           back_min = prog->float_min_offset;
+       }
+       if (must == &PL_sv_undef)
+           /* could not downgrade utf8 check substring, so must fail */
+           goto phooey;
+
+       last = HOP3c(strend,    /* Cannot start after this */
+                         -(I32)(CHR_SVLEN(must)
+                                - (SvTAIL(must) != 0) + back_min), strbeg);
+
+       if (s > PL_bostr)
+           last1 = HOPc(s, -1);
+       else
+           last1 = s - 1;      /* bogus */
+
+       /* XXXX check_substr already used to find `s', can optimize if
+          check_substr==must. */
+       scream_pos = -1;
+       dontbother = end_shift;
+       strend = HOPc(strend, -dontbother);
+       while ( (s <= last) &&
+               ((flags & REXEC_SCREAM)
+                ? (s = screaminstr(sv, must, HOP3c(s, back_min, strend) - strbeg,
+                                   end_shift, &scream_pos, 0))
+                : (s = fbm_instr((unsigned char*)HOP3(s, back_min, strend),
+                                 (unsigned char*)strend, must,
+                                 PL_multiline ? FBMrf_MULTILINE : 0))) ) {
+           /* we may be pointing at the wrong string */
+           if ((flags & REXEC_SCREAM) && RX_MATCH_COPIED(prog))
+               s = strbeg + (s - SvPVX(sv));
+           DEBUG_r( did_match = 1 );
+           if (HOPc(s, -back_max) > last1) {
+               last1 = HOPc(s, -back_min);
+               s = HOPc(s, -back_max);
+           }
+           else {
+               char *t = (last1 >= PL_bostr) ? HOPc(last1, 1) : last1 + 1;
+
+               last1 = HOPc(s, -back_min);
+               s = t;          
+           }
+           if (do_utf8) {
+               while (s <= last1) {
+                   if (regtry(prog, s))
+                       goto got_it;
+                   s += UTF8SKIP(s);
+               }
+           }
+           else {
+               while (s <= last1) {
+                   if (regtry(prog, s))
+                       goto got_it;
+                   s++;
+               }
+           }
+       }
+       DEBUG_r(if (!did_match)
+                    PerlIO_printf(Perl_debug_log, 
+                                  "Did not find %s substr `%s%.*s%s'%s...\n",
+                             ((must == prog->anchored_substr || must == prog->anchored_utf8)
+                              ? "anchored" : "floating"),
+                             PL_colors[0],
+                             (int)(SvCUR(must) - (SvTAIL(must)!=0)),
+                             SvPVX(must),
+                                  PL_colors[1], (SvTAIL(must) ? "$" : ""))
+               );
+       goto phooey;
+    }
+    else if ((c = prog->regstclass)) {
+       if (minlen) {
+           I32 op = (U8)OP(prog->regstclass);
+           /* don't bother with what can't match */
+           if (PL_regkind[op] != EXACT && op != CANY)
+               strend = HOPc(strend, -(minlen - 1));
+       }
+       DEBUG_r({
+           SV *prop = sv_newmortal();
+           char *s0;
+           char *s1;
+           int len0;
+           int len1;
+
+           regprop(prop, c);
+           s0 = UTF ?
+             pv_uni_display(dsv0, (U8*)SvPVX(prop), SvCUR(prop), 60,
+                            UNI_DISPLAY_REGEX) :
+             SvPVX(prop);
+           len0 = UTF ? SvCUR(dsv0) : SvCUR(prop);
+           s1 = UTF ?
+             sv_uni_display(dsv1, sv, 60, UNI_DISPLAY_REGEX) : s;
+           len1 = UTF ? SvCUR(dsv1) : strend - s;
+           PerlIO_printf(Perl_debug_log,
+                         "Matching stclass `%*.*s' against `%*.*s'\n",
+                         len0, len0, s0,
+                         len1, len1, s1);
+       });
+       if (find_byclass(prog, c, s, strend, startpos, 0))
+           goto got_it;
+       DEBUG_r(PerlIO_printf(Perl_debug_log, "Contradicts stclass...\n"));
     }
     else {
        dontbother = 0;
-       if (prog->float_substr != Nullsv) {     /* Trim the end. */
+       if (prog->float_substr != Nullsv || prog->float_utf8 != Nullsv) {
+           /* Trim the end. */
            char *last;
-           I32 oldpos = scream_pos;
+           SV* float_real;
+
+           if (!(do_utf8 ? prog->float_utf8 : prog->float_substr))
+               do_utf8 ? to_utf8_substr(prog) : to_byte_substr(prog);
+           float_real = do_utf8 ? prog->float_utf8 : prog->float_substr;
 
            if (flags & REXEC_SCREAM) {
-               last = screaminstr(sv, prog->float_substr, s - strbeg,
+               last = screaminstr(sv, float_real, s - strbeg,
                                   end_shift, &scream_pos, 1); /* last one */
-               if (!last) {
-                   last = scream_olds; /* Only one occurence. */
-               }
+               if (!last)
+                   last = scream_olds; /* Only one occurrence. */
+               /* we may be pointing at the wrong string */
+               else if (RX_MATCH_COPIED(prog))
+                   s = strbeg + (s - SvPVX(sv));
            }
            else {
                STRLEN len;
-               char *little = SvPV(prog->float_substr, len);
-               if (len) 
-                   last = rninstr(s, strend, little, little + len);
-               else
-                   last = strend;      /* matching `$' */
+               char *little = SvPV(float_real, len);
+
+               if (SvTAIL(float_real)) {
+                   if (memEQ(strend - len + 1, little, len - 1))
+                       last = strend - len + 1;
+                   else if (!PL_multiline)
+                       last = memEQ(strend - len, little, len)
+                           ? strend - len : Nullch;
+                   else
+                       goto find_last;
+               } else {
+                 find_last:
+                   if (len)
+                       last = rninstr(s, strend, little, little + len);
+                   else
+                       last = strend;  /* matching `$' */
+               }
+           }
+           if (last == NULL) {
+               DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                     "%sCan't trim the tail, match fails (should not happen)%s\n",
+                                     PL_colors[4],PL_colors[5]));
+               goto phooey; /* Should not happen! */
            }
-           if (last == NULL) goto phooey; /* Should not happen! */
            dontbother = strend - last + prog->float_min_offset;
        }
        if (minlen && (dontbother < minlen))
            dontbother = minlen - 1;
        strend -= dontbother;              /* this one's always in bytes! */
        /* We don't know much -- general case. */
-       if (UTF) {
+       if (do_utf8) {
            for (;;) {
                if (regtry(prog, s))
                    goto got_it;
@@ -983,48 +2019,55 @@ regexec_flags(register regexp *prog, char *stringarg, register char *strend,
     goto phooey;
 
 got_it:
-    prog->subbeg = strbeg;
-    prog->subend = PL_regeol;  /* strend may have been modified */
     RX_MATCH_TAINTED_set(prog, PL_reg_flags & RF_tainted);
 
-    /* make sure $`, $&, $', and $digit will work later */
-    if (strbeg != prog->subbase) {     /* second+ //g match.  */
-       if (!(flags & REXEC_COPY_STR)) {
-           if (prog->subbase) {
-               Safefree(prog->subbase);
-               prog->subbase = Nullch;
-           }
-       }
-       else {
-           I32 i = PL_regeol - startpos + (stringarg - strbeg);
-           s = savepvn(strbeg, i);
-           Safefree(prog->subbase);
-           prog->subbase = s;
-           prog->subbeg = prog->subbase;
-           prog->subend = prog->subbase + i;
-           s = prog->subbase + (stringarg - strbeg);
-           for (i = 0; i <= prog->nparens; i++) {
-               if (prog->endp[i]) {
-                   prog->startp[i] = s + (prog->startp[i] - startpos);
-                   prog->endp[i] = s + (prog->endp[i] - startpos);
-               }
-           }
-       }
-    }
     if (PL_reg_eval_set) {
        /* Preserve the current value of $^R */
        if (oreplsv != GvSV(PL_replgv))
            sv_setsv(oreplsv, GvSV(PL_replgv));/* So that when GvSV(replgv) is
                                                  restored, the value remains
                                                  the same. */
-       restore_pos(0);
+       restore_pos(aTHX_ 0);
     }
-    
+
+    /* make sure $`, $&, $', and $digit will work later */
+    if ( !(flags & REXEC_NOT_FIRST) ) {
+       RX_MATCH_COPY_FREE(prog);
+       if (flags & REXEC_COPY_STR) {
+           I32 i = PL_regeol - startpos + (stringarg - strbeg);
+#ifdef PERL_COPY_ON_WRITE
+           if ((SvIsCOW(sv)
+                || (SvFLAGS(sv) & CAN_COW_MASK) == CAN_COW_FLAGS)) {
+               if (DEBUG_C_TEST) {
+                   PerlIO_printf(Perl_debug_log,
+                                 "Copy on write: regexp capture, type %d\n",
+                                 (int) SvTYPE(sv));
+               }
+               prog->saved_copy = sv_setsv_cow(prog->saved_copy, sv);
+               prog->subbeg = SvPVX(prog->saved_copy);
+               assert (SvPOKp(prog->saved_copy));
+           } else
+#endif
+           {
+               RX_MATCH_COPIED_on(prog);
+               s = savepvn(strbeg, i);
+               prog->subbeg = s;
+           }
+           prog->sublen = i;
+       }
+       else {
+           prog->subbeg = strbeg;
+           prog->sublen = PL_regeol - strbeg;  /* strend may have been modified */
+       }
+    }
+
     return 1;
 
 phooey:
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%sMatch failed%s\n",
+                         PL_colors[4],PL_colors[5]));
     if (PL_reg_eval_set)
-       restore_pos(0);
+       restore_pos(aTHX_ 0);
     return 0;
 }
 
@@ -1032,62 +2075,92 @@ phooey:
  - regtry - try match at specific point
  */
 STATIC I32                     /* 0 failure, 1 success */
-regtry(regexp *prog, char *startpos)
+S_regtry(pTHX_ regexp *prog, char *startpos)
 {
-    dTHR;
     register I32 i;
-    register char **sp;
-    register char **ep;
+    register I32 *sp;
+    register I32 *ep;
     CHECKPOINT lastcp;
 
+#ifdef DEBUGGING
+    PL_regindent = 0;  /* XXXX Not good when matches are reenterable... */
+#endif
     if ((prog->reganch & ROPT_EVAL_SEEN) && !PL_reg_eval_set) {
        MAGIC *mg;
 
        PL_reg_eval_set = RS_init;
        DEBUG_r(DEBUG_s(
-           PerlIO_printf(Perl_debug_log, "  setting stack tmpbase at %i\n",
-                         PL_stack_sp - PL_stack_base);
+           PerlIO_printf(Perl_debug_log, "  setting stack tmpbase at %"IVdf"\n",
+                         (IV)(PL_stack_sp - PL_stack_base));
            ));
-       SAVEINT(cxstack[cxstack_ix].blk_oldsp);
+       SAVEI32(cxstack[cxstack_ix].blk_oldsp);
        cxstack[cxstack_ix].blk_oldsp = PL_stack_sp - PL_stack_base;
        /* Otherwise OP_NEXTSTATE will free whatever on stack now.  */
        SAVETMPS;
        /* Apparently this is not needed, judging by wantarray. */
-       /* SAVEINT(cxstack[cxstack_ix].blk_gimme);
+       /* SAVEI8(cxstack[cxstack_ix].blk_gimme);
           cxstack[cxstack_ix].blk_gimme = G_SCALAR; */
 
        if (PL_reg_sv) {
            /* Make $_ available to executed code. */
-           if (PL_reg_sv != GvSV(PL_defgv)) {
-               SAVESPTR(GvSV(PL_defgv));
-               GvSV(PL_defgv) = PL_reg_sv;
+           if (PL_reg_sv != DEFSV) {
+               /* SAVE_DEFSV does *not* suffice here for USE_5005THREADS */
+               SAVESPTR(DEFSV);
+               DEFSV = PL_reg_sv;
            }
        
-           if (!(SvTYPE(PL_reg_sv) >= SVt_PVMG && SvMAGIC(PL_reg_sv) 
-                 && (mg = mg_find(PL_reg_sv, 'g')))) {
+           if (!(SvTYPE(PL_reg_sv) >= SVt_PVMG && SvMAGIC(PL_reg_sv)
+                 && (mg = mg_find(PL_reg_sv, PERL_MAGIC_regex_global)))) {
                /* prepare for quick setting of pos */
-               sv_magic(PL_reg_sv, (SV*)0, 'g', Nullch, 0);
-               mg = mg_find(PL_reg_sv, 'g');
+               sv_magic(PL_reg_sv, (SV*)0,
+                       PERL_MAGIC_regex_global, Nullch, 0);
+               mg = mg_find(PL_reg_sv, PERL_MAGIC_regex_global);
                mg->mg_len = -1;
            }
            PL_reg_magic    = mg;
            PL_reg_oldpos   = mg->mg_len;
-           SAVEDESTRUCTOR(restore_pos, 0);
+           SAVEDESTRUCTOR_X(restore_pos, 0);
+        }
+        if (!PL_reg_curpm) {
+           Newz(22,PL_reg_curpm, 1, PMOP);
+#ifdef USE_ITHREADS
+            {
+                SV* repointer = newSViv(0);
+                /* so we know which PL_regex_padav element is PL_reg_curpm */
+                SvFLAGS(repointer) |= SVf_BREAK;
+                av_push(PL_regex_padav,repointer);
+                PL_reg_curpm->op_pmoffset = av_len(PL_regex_padav);
+                PL_regex_pad = AvARRAY(PL_regex_padav);
+            }
+#endif      
         }
-       if (!PL_reg_curpm)
-           New(22,PL_reg_curpm, 1, PMOP);
-       PL_reg_curpm->op_pmregexp = prog;
+       PM_SETRE(PL_reg_curpm, prog);
        PL_reg_oldcurpm = PL_curpm;
        PL_curpm = PL_reg_curpm;
+       if (RX_MATCH_COPIED(prog)) {
+           /*  Here is a serious problem: we cannot rewrite subbeg,
+               since it may be needed if this match fails.  Thus
+               $` inside (?{}) could fail... */
+           PL_reg_oldsaved = prog->subbeg;
+           PL_reg_oldsavedlen = prog->sublen;
+#ifdef PERL_COPY_ON_WRITE
+           PL_nrs = prog->saved_copy;
+#endif
+           RX_MATCH_COPIED_off(prog);
+       }
+       else
+           PL_reg_oldsaved = Nullch;
        prog->subbeg = PL_bostr;
-       prog->subend = PL_regeol;       /* strend may have been modified */
+       prog->sublen = PL_regeol - PL_bostr; /* strend may have been modified */
     }
-    prog->startp[0] = startpos;
+    prog->startp[0] = startpos - PL_bostr;
     PL_reginput = startpos;
     PL_regstartp = prog->startp;
     PL_regendp = prog->endp;
     PL_reglastparen = &prog->lastparen;
+    PL_reglastcloseparen = &prog->lastcloseparen;
     prog->lastparen = 0;
+    prog->lastcloseparen = 0;
     PL_regsize = 0;
     DEBUG_r(PL_reg_starttry = startpos);
     if (PL_reg_start_tmpl <= prog->nparens) {
@@ -1100,24 +2173,78 @@ regtry(regexp *prog, char *startpos)
 
     /* XXXX What this code is doing here?!!!  There should be no need
        to do this again and again, PL_reglastparen should take care of
-       this!  */
+       this!  --ilya*/
+
+    /* Tests pat.t#187 and split.t#{13,14} seem to depend on this code.
+     * Actually, the code in regcppop() (which Ilya may be meaning by
+     * PL_reglastparen), is not needed at all by the test suite
+     * (op/regexp, op/pat, op/split), but that code is needed, oddly
+     * enough, for building DynaLoader, or otherwise this
+     * "Error: '*' not in typemap in DynaLoader.xs, line 164"
+     * will happen.  Meanwhile, this code *is* needed for the
+     * above-mentioned test suite tests to succeed.  The common theme
+     * on those tests seems to be returning null fields from matches.
+     * --jhi */
+#if 1
     sp = prog->startp;
     ep = prog->endp;
     if (prog->nparens) {
-       for (i = prog->nparens; i >= 1; i--) {
-           *++sp = NULL;
-           *++ep = NULL;
+       for (i = prog->nparens; i > (I32)*PL_reglastparen; i--) {
+           *++sp = -1;
+           *++ep = -1;
        }
     }
-    REGCP_SET;
+#endif
+    REGCP_SET(lastcp);
     if (regmatch(prog->program + 1)) {
-       prog->endp[0] = PL_reginput;
+       prog->endp[0] = PL_reginput - PL_bostr;
        return 1;
     }
-    REGCP_UNWIND;
+    REGCP_UNWIND(lastcp);
     return 0;
 }
 
+#define RE_UNWIND_BRANCH       1
+#define RE_UNWIND_BRANCHJ      2
+
+union re_unwind_t;
+
+typedef struct {               /* XX: makes sense to enlarge it... */
+    I32 type;
+    I32 prev;
+    CHECKPOINT lastcp;
+} re_unwind_generic_t;
+
+typedef struct {
+    I32 type;
+    I32 prev;
+    CHECKPOINT lastcp;
+    I32 lastparen;
+    regnode *next;
+    char *locinput;
+    I32 nextchr;
+#ifdef DEBUGGING
+    int regindent;
+#endif
+} re_unwind_branch_t;
+
+typedef union re_unwind_t {
+    I32 type;
+    re_unwind_generic_t generic;
+    re_unwind_branch_t branch;
+} re_unwind_t;
+
+#define sayYES goto yes
+#define sayNO goto no
+#define sayNO_ANYOF goto no_anyof
+#define sayYES_FINAL goto yes_final
+#define sayYES_LOUD  goto yes_loud
+#define sayNO_FINAL  goto no_final
+#define sayNO_SILENT goto do_no
+#define saySAME(x) if (x) goto yes; else goto no
+
+#define REPORT_CODE_OFF 24
+
 /*
  - regmatch - main matching routine
  *
@@ -1133,20 +2260,30 @@ regtry(regexp *prog, char *startpos)
  * advantage of machines that use a register save mask on subroutine entry.
  */
 STATIC I32                     /* 0 failure, 1 success */
-regmatch(regnode *prog)
+S_regmatch(pTHX_ regnode *prog)
 {
-    dTHR;
     register regnode *scan;    /* Current node. */
     regnode *next;             /* Next node. */
     regnode *inner;            /* Next node in internal branch. */
     register I32 nextchr;      /* renamed nextchr - nextchar colides with
                                   function of same name */
     register I32 n;            /* no or next */
-    register I32 ln;           /* len or last */
-    register char *s;          /* operand or save */
+    register I32 ln = 0;       /* len or last */
+    register char *s = Nullch; /* operand or save */
     register char *locinput = PL_reginput;
-    register I32 c1, c2, paren;        /* case fold search, parenth */
+    register I32 c1 = 0, c2 = 0, paren;        /* case fold search, parenth */
     int minmod = 0, sw = 0, logical = 0;
+    I32 unwind = 0;
+#if 0
+    I32 firstcp = PL_savestack_ix;
+#endif
+    register bool do_utf8 = PL_reg_match_utf8;
+#ifdef DEBUGGING
+    SV *dsv0 = PERL_DEBUG_PAD_ZERO(0);
+    SV *dsv1 = PERL_DEBUG_PAD_ZERO(1);
+    SV *dsv2 = PERL_DEBUG_PAD_ZERO(2);
+#endif
+
 #ifdef DEBUGGING
     PL_regindent++;
 #endif
@@ -1155,46 +2292,71 @@ regmatch(regnode *prog)
     nextchr = UCHARAT(locinput);
     scan = prog;
     while (scan != NULL) {
-#define sayNO_L (logical ? (logical = 0, sw = 0, goto cont) : sayNO)
-#ifdef DEBUGGING
-#  define sayYES goto yes
-#  define sayNO goto no
-#  define saySAME(x) if (x) goto yes; else goto no
-#  define REPORT_CODE_OFF 24
-#else
-#  define sayYES return 1
-#  define sayNO return 0
-#  define saySAME(x) return x
-#endif
-       DEBUG_r( {
+
+        DEBUG_r( {
            SV *prop = sv_newmortal();
            int docolor = *PL_colors[0];
            int taill = (docolor ? 10 : 7); /* 3 chars for "> <" */
-           int l = (PL_regeol - locinput > taill ? taill : PL_regeol - locinput);
-           int pref_len = (locinput - PL_bostr > (5 + taill) - l 
-                           ? (5 + taill) - l : locinput - PL_bostr);
-           int pref0_len = pref_len  - (locinput - PL_reg_starttry);
+           int l = (PL_regeol - locinput) > taill ? taill : (PL_regeol - locinput);
+           /* The part of the string before starttry has one color
+              (pref0_len chars), between starttry and current
+              position another one (pref_len - pref0_len chars),
+              after the current position the third one.
+              We assume that pref0_len <= pref_len, otherwise we
+              decrease pref0_len.  */
+           int pref_len = (locinput - PL_bostr) > (5 + taill) - l
+               ? (5 + taill) - l : locinput - PL_bostr;
+           int pref0_len;
 
+           while (do_utf8 && UTF8_IS_CONTINUATION(*(U8*)(locinput - pref_len)))
+               pref_len++;
+           pref0_len = pref_len  - (locinput - PL_reg_starttry);
            if (l + pref_len < (5 + taill) && l < PL_regeol - locinput)
-               l = ( PL_regeol - locinput > (5 + taill) - pref_len 
+               l = ( PL_regeol - locinput > (5 + taill) - pref_len
                      ? (5 + taill) - pref_len : PL_regeol - locinput);
+           while (do_utf8 && UTF8_IS_CONTINUATION(*(U8*)(locinput + l)))
+               l--;
            if (pref0_len < 0)
                pref0_len = 0;
+           if (pref0_len > pref_len)
+               pref0_len = pref_len;
            regprop(prop, scan);
-           PerlIO_printf(Perl_debug_log, 
-                         "%4i <%s%.*s%s%s%.*s%s%s%s%.*s%s>%*s|%3d:%*s%s\n",
-                         locinput - PL_bostr, 
-                         PL_colors[4], pref0_len, 
-                         locinput - pref_len, PL_colors[5],
-                         PL_colors[2], pref_len - pref0_len, 
-                         locinput - pref_len + pref0_len, PL_colors[3],
-                         (docolor ? "" : "> <"),
-                         PL_colors[0], l, locinput, PL_colors[1],
-                         15 - l - pref_len + 1,
-                         "",
-                         scan - PL_regprogram, PL_regindent*2, "",
-                         SvPVX(prop));
-       } );
+           {
+             char *s0 =
+               do_utf8 && OP(scan) != CANY ?
+               pv_uni_display(dsv0, (U8*)(locinput - pref_len),
+                              pref0_len, 60, UNI_DISPLAY_REGEX) :
+               locinput - pref_len;
+             int len0 = do_utf8 ? strlen(s0) : pref0_len;
+             char *s1 = do_utf8 && OP(scan) != CANY ?
+               pv_uni_display(dsv1, (U8*)(locinput - pref_len + pref0_len),
+                              pref_len - pref0_len, 60, UNI_DISPLAY_REGEX) :
+               locinput - pref_len + pref0_len;
+             int len1 = do_utf8 ? strlen(s1) : pref_len - pref0_len;
+             char *s2 = do_utf8 && OP(scan) != CANY ?
+               pv_uni_display(dsv2, (U8*)locinput,
+                              PL_regeol - locinput, 60, UNI_DISPLAY_REGEX) :
+               locinput;
+             int len2 = do_utf8 ? strlen(s2) : l;
+             PerlIO_printf(Perl_debug_log,
+                           "%4"IVdf" <%s%.*s%s%s%.*s%s%s%s%.*s%s>%*s|%3"IVdf":%*s%s\n",
+                           (IV)(locinput - PL_bostr),
+                           PL_colors[4],
+                           len0, s0,
+                           PL_colors[5],
+                           PL_colors[2],
+                           len1, s1,
+                           PL_colors[3],
+                           (docolor ? "" : "> <"),
+                           PL_colors[0],
+                           len2, s2,
+                           PL_colors[1],
+                           15 - l - pref_len + 1,
+                           "",
+                           (IV)(scan - PL_regprogram), PL_regindent*2, "",
+                           SvPVX(prop));
+           }
+       });
 
        next = scan + NEXT_OFF(scan);
        if (next == scan)
@@ -1202,25 +2364,22 @@ regmatch(regnode *prog)
 
        switch (OP(scan)) {
        case BOL:
-           if (locinput == PL_bostr
-               ? PL_regprev == '\n'
-               : (PL_multiline && 
-                  (nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
+           if (locinput == PL_bostr || (PL_multiline &&
+               (nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
            {
                /* regtill = regbol; */
                break;
            }
            sayNO;
        case MBOL:
-           if (locinput == PL_bostr
-               ? PL_regprev == '\n'
-               : ((nextchr || locinput < PL_regeol) && locinput[-1] == '\n') )
+           if (locinput == PL_bostr ||
+               ((nextchr || locinput < PL_regeol) && locinput[-1] == '\n'))
            {
                break;
            }
            sayNO;
        case SBOL:
-           if (locinput == PL_regbol && PL_regprev == '\n')
+           if (locinput == PL_bostr)
                break;
            sayNO;
        case GPOS:
@@ -1248,43 +2407,77 @@ regmatch(regnode *prog)
            if (PL_regeol != locinput)
                sayNO;
            break;
-       case SANYUTF8:
-           if (nextchr & 0x80) {
-               locinput += PL_utf8skip[nextchr];
-               if (locinput > PL_regeol)
-                   sayNO;
-               nextchr = UCHARAT(locinput);
-               break;
-           }
+       case SANY:
            if (!nextchr && locinput >= PL_regeol)
                sayNO;
-           nextchr = UCHARAT(++locinput);
+           if (do_utf8) {
+               locinput += PL_utf8skip[nextchr];
+               if (locinput > PL_regeol)
+                   sayNO;
+               nextchr = UCHARAT(locinput);
+           }
+           else
+               nextchr = UCHARAT(++locinput);
            break;
-       case SANY:
+       case CANY:
            if (!nextchr && locinput >= PL_regeol)
                sayNO;
            nextchr = UCHARAT(++locinput);
            break;
-       case ANYUTF8:
-           if (nextchr & 0x80) {
+       case REG_ANY:
+           if ((!nextchr && locinput >= PL_regeol) || nextchr == '\n')
+               sayNO;
+           if (do_utf8) {
                locinput += PL_utf8skip[nextchr];
                if (locinput > PL_regeol)
                    sayNO;
                nextchr = UCHARAT(locinput);
-               break;
            }
-           if (!nextchr && locinput >= PL_regeol || nextchr == '\n')
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case REG_ANY:
-           if (!nextchr && locinput >= PL_regeol || nextchr == '\n')
-               sayNO;
-           nextchr = UCHARAT(++locinput);
+           else
+               nextchr = UCHARAT(++locinput);
            break;
        case EXACT:
-           s = (char *) OPERAND(scan);
-           ln = UCHARAT(s++);
+           s = STRING(scan);
+           ln = STR_LEN(scan);
+           if (do_utf8 != UTF) {
+               /* The target and the pattern have differing utf8ness. */
+               char *l = locinput;
+               char *e = s + ln;
+               STRLEN ulen;
+
+               if (do_utf8) {
+                   /* The target is utf8, the pattern is not utf8. */
+                   while (s < e) {
+                       if (l >= PL_regeol)
+                            sayNO;
+                       if (NATIVE_TO_UNI(*(U8*)s) !=
+                           utf8n_to_uvuni((U8*)l, UTF8_MAXLEN, &ulen,
+                                          ckWARN(WARN_UTF8) ?
+                                          0 : UTF8_ALLOW_ANY))
+                            sayNO;
+                       l += ulen;
+                       s ++;
+                   }
+               }
+               else {
+                   /* The target is not utf8, the pattern is utf8. */
+                   while (s < e) {
+                       if (l >= PL_regeol)
+                           sayNO;
+                       if (NATIVE_TO_UNI(*((U8*)l)) !=
+                           utf8n_to_uvuni((U8*)s, UTF8_MAXLEN, &ulen,
+                                          ckWARN(WARN_UTF8) ?
+                                          0 : UTF8_ALLOW_ANY))
+                           sayNO;
+                       s += ulen;
+                       l ++;
+                   }
+               }
+               locinput = l;
+               nextchr = UCHARAT(locinput);
+               break;
+           }
+           /* The target and the pattern have the same utf8ness. */
            /* Inline the first character, for speed. */
            if (UCHARAT(s) != nextchr)
                sayNO;
@@ -1299,30 +2492,36 @@ regmatch(regnode *prog)
            PL_reg_flags |= RF_tainted;
            /* FALL THROUGH */
        case EXACTF:
-           s = (char *) OPERAND(scan);
-           ln = UCHARAT(s++);
+           s = STRING(scan);
+           ln = STR_LEN(scan);
 
-           if (UTF) {
+           if (do_utf8 || UTF) {
+             /* Either target or the pattern are utf8. */
                char *l = locinput;
-               char *e = s + ln;
-               c1 = OP(scan) == EXACTF;
-               while (s < e) {
-                   if (l >= PL_regeol)
-                       sayNO;
-                   if (utf8_to_uv((U8*)s, 0) != (c1 ?
-                                                 toLOWER_utf8((U8*)l) :
-                                                 toLOWER_LC_utf8((U8*)l)))
-                   {
-                       sayNO;
-                   }
-                   s += UTF8SKIP(s);
-                   l += UTF8SKIP(l);
+               char *e = PL_regeol;
+
+               if (ibcmp_utf8(s, 0,  ln, (bool)UTF,
+                              l, &e, 0,  do_utf8)) {
+                    /* One more case for the sharp s:
+                     * pack("U0U*", 0xDF) =~ /ss/i,
+                     * the 0xC3 0x9F are the UTF-8
+                     * byte sequence for the U+00DF. */
+                    if (!(do_utf8 &&
+                          toLOWER(s[0]) == 's' &&
+                          ln >= 2 &&
+                          toLOWER(s[1]) == 's' &&
+                          (U8)l[0] == 0xC3 &&
+                          e - l >= 2 &&
+                          (U8)l[1] == 0x9F))
+                         sayNO;
                }
-               locinput = l;
+               locinput = e;
                nextchr = UCHARAT(locinput);
                break;
            }
 
+           /* Neither the target and the pattern are utf8. */
+
            /* Inline the first character, for speed. */
            if (UCHARAT(s) != nextchr &&
                UCHARAT(s) != ((OP(scan) == EXACTF)
@@ -1337,24 +2536,38 @@ regmatch(regnode *prog)
            locinput += ln;
            nextchr = UCHARAT(locinput);
            break;
-       case ANYOFUTF8:
-           s = (char *) OPERAND(scan);
-           if (!REGINCLASSUTF8(scan, (U8*)locinput))
-               sayNO;
-           if (locinput >= PL_regeol)
-               sayNO;
-           locinput += PL_utf8skip[nextchr];
-           nextchr = UCHARAT(locinput);
-           break;
        case ANYOF:
-           s = (char *) OPERAND(scan);
-           if (nextchr < 0)
+           if (do_utf8) {
+               STRLEN inclasslen = PL_regeol - locinput;
+
+               if (!reginclass(scan, (U8*)locinput, &inclasslen, do_utf8))
+                   sayNO_ANYOF;
+               if (locinput >= PL_regeol)
+                   sayNO;
+               locinput += inclasslen ? inclasslen : UTF8SKIP(locinput);
                nextchr = UCHARAT(locinput);
-           if (!REGINCLASS(s, nextchr))
-               sayNO;
-           if (!nextchr && locinput >= PL_regeol)
-               sayNO;
-           nextchr = UCHARAT(++locinput);
+               break;
+           }
+           else {
+               if (nextchr < 0)
+                   nextchr = UCHARAT(locinput);
+               if (!REGINCLASS(scan, (U8*)locinput))
+                   sayNO_ANYOF;
+               if (!nextchr && locinput >= PL_regeol)
+                   sayNO;
+               nextchr = UCHARAT(++locinput);
+               break;
+           }
+       no_anyof:
+           /* If we might have the case of the German sharp s
+            * in a casefolding Unicode character class. */
+
+           if (ANYOF_FOLD_SHARP_S(scan, locinput, PL_regeol)) {
+                locinput += SHARP_S_SKIP;
+                nextchr = UCHARAT(locinput);
+           }
+           else
+                sayNO;
            break;
        case ALNUML:
            PL_reg_flags |= RF_tainted;
@@ -1362,20 +2575,10 @@ regmatch(regnode *prog)
        case ALNUM:
            if (!nextchr)
                sayNO;
-           if (!(OP(scan) == ALNUM
-                 ? isALNUM(nextchr) : isALNUM_LC(nextchr)))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case ALNUMLUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case ALNUMUTF8:
-           if (!nextchr)
-               sayNO;
-           if (nextchr & 0x80) {
-               if (!(OP(scan) == ALNUMUTF8
-                     ? swash_fetch(PL_utf8_alnum, (U8*)locinput)
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               if (!(OP(scan) == ALNUM
+                     ? swash_fetch(PL_utf8_alnum, (U8*)locinput, do_utf8)
                      : isALNUM_LC_utf8((U8*)locinput)))
                {
                    sayNO;
@@ -1384,7 +2587,7 @@ regmatch(regnode *prog)
                nextchr = UCHARAT(locinput);
                break;
            }
-           if (!(OP(scan) == ALNUMUTF8
+           if (!(OP(scan) == ALNUM
                  ? isALNUM(nextchr) : isALNUM_LC(nextchr)))
                sayNO;
            nextchr = UCHARAT(++locinput);
@@ -1395,20 +2598,10 @@ regmatch(regnode *prog)
        case NALNUM:
            if (!nextchr && locinput >= PL_regeol)
                sayNO;
-           if (OP(scan) == NALNUM
-               ? isALNUM(nextchr) : isALNUM_LC(nextchr))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case NALNUMLUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case NALNUMUTF8:
-           if (!nextchr && locinput >= PL_regeol)
-               sayNO;
-           if (nextchr & 0x80) {
-               if (OP(scan) == NALNUMUTF8
-                   ? swash_fetch(PL_utf8_alnum, (U8*)locinput)
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(alnum,"a");
+               if (OP(scan) == NALNUM
+                   ? swash_fetch(PL_utf8_alnum, (U8*)locinput, do_utf8)
                    : isALNUM_LC_utf8((U8*)locinput))
                {
                    sayNO;
@@ -1417,7 +2610,7 @@ regmatch(regnode *prog)
                nextchr = UCHARAT(locinput);
                break;
            }
-           if (OP(scan) == NALNUMUTF8
+           if (OP(scan) == NALNUM
                ? isALNUM(nextchr) : isALNUM_LC(nextchr))
                sayNO;
            nextchr = UCHARAT(++locinput);
@@ -1429,91 +2622,81 @@ regmatch(regnode *prog)
        case BOUND:
        case NBOUND:
            /* was last char in word? */
-           ln = (locinput != PL_regbol) ? UCHARAT(locinput - 1) : PL_regprev;
-           if (OP(scan) == BOUND || OP(scan) == NBOUND) {
-               ln = isALNUM(ln);
-               n = isALNUM(nextchr);
-           }
-           else {
-               ln = isALNUM_LC(ln);
-               n = isALNUM_LC(nextchr);
-           }
-           if (((!ln) == (!n)) == (OP(scan) == BOUND || OP(scan) == BOUNDL))
-               sayNO;
-           break;
-       case BOUNDLUTF8:
-       case NBOUNDLUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case BOUNDUTF8:
-       case NBOUNDUTF8:
-           /* was last char in word? */
-           ln = (locinput != PL_regbol)
-               ? utf8_to_uv(reghop((U8*)locinput, -1), 0) : PL_regprev;
-           if (OP(scan) == BOUNDUTF8 || OP(scan) == NBOUNDUTF8) {
-               ln = isALNUM_uni(ln);
-               n = swash_fetch(PL_utf8_alnum, (U8*)locinput);
+           if (do_utf8) {
+               if (locinput == PL_bostr)
+                   ln = '\n';
+               else {
+                   U8 *r = reghop3((U8*)locinput, -1, (U8*)PL_bostr);
+               
+                   ln = utf8n_to_uvchr(r, UTF8SKIP(r), 0, 0);
+               }
+               if (OP(scan) == BOUND || OP(scan) == NBOUND) {
+                   ln = isALNUM_uni(ln);
+                   LOAD_UTF8_CHARCLASS(alnum,"a");
+                   n = swash_fetch(PL_utf8_alnum, (U8*)locinput, do_utf8);
+               }
+               else {
+                   ln = isALNUM_LC_uvchr(UNI_TO_NATIVE(ln));
+                   n = isALNUM_LC_utf8((U8*)locinput);
+               }
            }
            else {
-               ln = isALNUM_LC_uni(ln);
-               n = isALNUM_LC_utf8((U8*)locinput);
+               ln = (locinput != PL_bostr) ?
+                   UCHARAT(locinput - 1) : '\n';
+               if (OP(scan) == BOUND || OP(scan) == NBOUND) {
+                   ln = isALNUM(ln);
+                   n = isALNUM(nextchr);
+               }
+               else {
+                   ln = isALNUM_LC(ln);
+                   n = isALNUM_LC(nextchr);
+               }
            }
-           if (((!ln) == (!n)) == (OP(scan) == BOUNDUTF8 || OP(scan) == BOUNDLUTF8))
-               sayNO;
+           if (((!ln) == (!n)) == (OP(scan) == BOUND ||
+                                   OP(scan) == BOUNDL))
+                   sayNO;
            break;
        case SPACEL:
            PL_reg_flags |= RF_tainted;
            /* FALL THROUGH */
        case SPACE:
-           if (!nextchr && locinput >= PL_regeol)
-               sayNO;
-           if (!(OP(scan) == SPACE
-                 ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case SPACELUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case SPACEUTF8:
-           if (!nextchr && locinput >= PL_regeol)
+           if (!nextchr)
                sayNO;
-           if (nextchr & 0x80) {
-               if (!(OP(scan) == SPACEUTF8
-                     ? swash_fetch(PL_utf8_space,(U8*)locinput)
-                     : isSPACE_LC_utf8((U8*)locinput)))
-               {
-                   sayNO;
+           if (do_utf8) {
+               if (UTF8_IS_CONTINUED(nextchr)) {
+                   LOAD_UTF8_CHARCLASS(space," ");
+                   if (!(OP(scan) == SPACE
+                         ? swash_fetch(PL_utf8_space, (U8*)locinput, do_utf8)
+                         : isSPACE_LC_utf8((U8*)locinput)))
+                   {
+                       sayNO;
+                   }
+                   locinput += PL_utf8skip[nextchr];
+                   nextchr = UCHARAT(locinput);
+                   break;
                }
-               locinput += PL_utf8skip[nextchr];
-               nextchr = UCHARAT(locinput);
-               break;
+               if (!(OP(scan) == SPACE
+                     ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
+                   sayNO;
+               nextchr = UCHARAT(++locinput);
+           }
+           else {
+               if (!(OP(scan) == SPACE
+                     ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
+                   sayNO;
+               nextchr = UCHARAT(++locinput);
            }
-           if (!(OP(scan) == SPACEUTF8
-                 ? isSPACE(nextchr) : isSPACE_LC(nextchr)))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
            break;
        case NSPACEL:
            PL_reg_flags |= RF_tainted;
            /* FALL THROUGH */
        case NSPACE:
-           if (!nextchr)
-               sayNO;
-           if (OP(scan) == SPACE
-               ? isSPACE(nextchr) : isSPACE_LC(nextchr))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case NSPACELUTF8:
-           PL_reg_flags |= RF_tainted;
-           /* FALL THROUGH */
-       case NSPACEUTF8:
-           if (!nextchr)
+           if (!nextchr && locinput >= PL_regeol)
                sayNO;
-           if (nextchr & 0x80) {
-               if (OP(scan) == NSPACEUTF8
-                   ? swash_fetch(PL_utf8_space,(U8*)locinput)
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(space," ");
+               if (OP(scan) == NSPACE
+                   ? swash_fetch(PL_utf8_space, (U8*)locinput, do_utf8)
                    : isSPACE_LC_utf8((U8*)locinput))
                {
                    sayNO;
@@ -1522,57 +2705,73 @@ regmatch(regnode *prog)
                nextchr = UCHARAT(locinput);
                break;
            }
-           if (OP(scan) == NSPACEUTF8
+           if (OP(scan) == NSPACE
                ? isSPACE(nextchr) : isSPACE_LC(nextchr))
                sayNO;
            nextchr = UCHARAT(++locinput);
            break;
+       case DIGITL:
+           PL_reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case DIGIT:
-           if (!isDIGIT(nextchr))
+           if (!nextchr)
                sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case DIGITUTF8:
-           if (nextchr & 0x80) {
-               if (!(swash_fetch(PL_utf8_digit,(U8*)locinput)))
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(digit,"0");
+               if (!(OP(scan) == DIGIT
+                     ? swash_fetch(PL_utf8_digit, (U8*)locinput, do_utf8)
+                     : isDIGIT_LC_utf8((U8*)locinput)))
+               {
                    sayNO;
+               }
                locinput += PL_utf8skip[nextchr];
                nextchr = UCHARAT(locinput);
                break;
            }
-           if (!isDIGIT(nextchr))
+           if (!(OP(scan) == DIGIT
+                 ? isDIGIT(nextchr) : isDIGIT_LC(nextchr)))
                sayNO;
            nextchr = UCHARAT(++locinput);
            break;
+       case NDIGITL:
+           PL_reg_flags |= RF_tainted;
+           /* FALL THROUGH */
        case NDIGIT:
            if (!nextchr && locinput >= PL_regeol)
                sayNO;
-           if (isDIGIT(nextchr))
-               sayNO;
-           nextchr = UCHARAT(++locinput);
-           break;
-       case NDIGITUTF8:
-           if (!nextchr && locinput >= PL_regeol)
-               sayNO;
-           if (nextchr & 0x80) {
-               if (swash_fetch(PL_utf8_digit,(U8*)locinput))
+           if (do_utf8) {
+               LOAD_UTF8_CHARCLASS(digit,"0");
+               if (OP(scan) == NDIGIT
+                   ? swash_fetch(PL_utf8_digit, (U8*)locinput, do_utf8)
+                   : isDIGIT_LC_utf8((U8*)locinput))
+               {
                    sayNO;
+               }
                locinput += PL_utf8skip[nextchr];
                nextchr = UCHARAT(locinput);
                break;
            }
-           if (isDIGIT(nextchr))
+           if (OP(scan) == NDIGIT
+               ? isDIGIT(nextchr) : isDIGIT_LC(nextchr))
                sayNO;
            nextchr = UCHARAT(++locinput);
            break;
        case CLUMP:
-           if (locinput >= PL_regeol || swash_fetch(PL_utf8_mark,(U8*)locinput))
-               sayNO;
-           locinput += PL_utf8skip[nextchr];
-           while (locinput < PL_regeol && swash_fetch(PL_utf8_mark,(U8*)locinput))
-               locinput += UTF8SKIP(locinput);
-           if (locinput > PL_regeol)
+           if (locinput >= PL_regeol)
                sayNO;
+           if  (do_utf8) {
+               LOAD_UTF8_CHARCLASS(mark,"~");
+               if (swash_fetch(PL_utf8_mark,(U8*)locinput, do_utf8))
+                   sayNO;
+               locinput += PL_utf8skip[nextchr];
+               while (locinput < PL_regeol &&
+                      swash_fetch(PL_utf8_mark,(U8*)locinput, do_utf8))
+                   locinput += UTF8SKIP(locinput);
+               if (locinput > PL_regeol)
+                   sayNO;
+           } 
+           else
+              locinput++;
            nextchr = UCHARAT(locinput);
            break;
        case REFFL:
@@ -1581,38 +2780,35 @@ regmatch(regnode *prog)
         case REF:
        case REFF:
            n = ARG(scan);  /* which paren pair */
-           s = PL_regstartp[n];
-           if (*PL_reglastparen < n || !s)
+           ln = PL_regstartp[n];
+           PL_reg_leftiter = PL_reg_maxiter;           /* Void cache */
+           if ((I32)*PL_reglastparen < n || ln == -1)
                sayNO;                  /* Do not match unless seen CLOSEn. */
-           if (s == PL_regendp[n])
+           if (ln == PL_regendp[n])
                break;
 
-           if (UTF && OP(scan) != REF) {       /* REF can do byte comparison */
+           s = PL_bostr + ln;
+           if (do_utf8 && OP(scan) != REF) {   /* REF can do byte comparison */
                char *l = locinput;
-               char *e = PL_regendp[n];
+               char *e = PL_bostr + PL_regendp[n];
                /*
                 * Note that we can't do the "other character" lookup trick as
                 * in the 8-bit case (no pun intended) because in Unicode we
                 * have to map both upper and title case to lower case.
                 */
                if (OP(scan) == REFF) {
+                   STRLEN ulen1, ulen2;
+                   U8 tmpbuf1[UTF8_MAXLEN_UCLC+1];
+                   U8 tmpbuf2[UTF8_MAXLEN_UCLC+1];
                    while (s < e) {
                        if (l >= PL_regeol)
                            sayNO;
-                       if (toLOWER_utf8((U8*)s) != toLOWER_utf8((U8*)l))
-                           sayNO;
-                       s += UTF8SKIP(s);
-                       l += UTF8SKIP(l);
-                   }
-               }
-               else {
-                   while (s < e) {
-                       if (l >= PL_regeol)
-                           sayNO;
-                       if (toLOWER_LC_utf8((U8*)s) != toLOWER_LC_utf8((U8*)l))
+                       toLOWER_utf8((U8*)s, tmpbuf1, &ulen1);
+                       toLOWER_utf8((U8*)l, tmpbuf2, &ulen2);
+                       if (ulen1 != ulen2 || memNE((char *)tmpbuf1, (char *)tmpbuf2, ulen1))
                            sayNO;
-                       s += UTF8SKIP(s);
-                       l += UTF8SKIP(l);
+                       s += ulen1;
+                       l += ulen2;
                    }
                }
                locinput = l;
@@ -1626,7 +2822,7 @@ regmatch(regnode *prog)
                 (UCHARAT(s) != ((OP(scan) == REFF
                                  ? PL_fold : PL_fold_locale)[nextchr]))))
                sayNO;
-           ln = PL_regendp[n] - s;
+           ln = PL_regendp[n] - ln;
            if (locinput + ln > PL_regeol)
                sayNO;
            if (ln > 1 && (OP(scan) == REF
@@ -1649,38 +2845,49 @@ regmatch(regnode *prog)
            dSP;
            OP_4tree *oop = PL_op;
            COP *ocurcop = PL_curcop;
-           SV **ocurpad = PL_curpad;
+           PAD *old_comppad;
            SV *ret;
-           
+           struct regexp *oreg = PL_reg_re;
+       
            n = ARG(scan);
            PL_op = (OP_4tree*)PL_regdata->data[n];
-           DEBUG_r( PerlIO_printf(Perl_debug_log, "  re_eval 0x%x\n", PL_op) );
-           PL_curpad = AvARRAY((AV*)PL_regdata->data[n + 1]);
-           PL_reg_magic->mg_len = locinput - PL_bostr;
-           PL_regendp[0] = locinput;
-
-           CALLRUNOPS();                       /* Scalar context. */
-           SPAGAIN;
-           ret = POPs;
-           PUTBACK;
-           
+           DEBUG_r( PerlIO_printf(Perl_debug_log, "  re_eval 0x%"UVxf"\n", PTR2UV(PL_op)) );
+           PAD_SAVE_LOCAL(old_comppad, (PAD*)PL_regdata->data[n + 2]);
+           PL_regendp[0] = PL_reg_magic->mg_len = locinput - PL_bostr;
+
+           {
+               SV **before = SP;
+               CALLRUNOPS(aTHX);                       /* Scalar context. */
+               SPAGAIN;
+               if (SP == before)
+                   ret = &PL_sv_undef;   /* protect against empty (?{}) blocks. */
+               else {
+                   ret = POPs;
+                   PUTBACK;
+               }
+           }
+
            PL_op = oop;
-           PL_curpad = ocurpad;
+           PAD_RESTORE_LOCAL(old_comppad);
            PL_curcop = ocurcop;
            if (logical) {
                if (logical == 2) {     /* Postponed subexpression. */
                    regexp *re;
                    MAGIC *mg = Null(MAGIC*);
                    re_cc_state state;
-                   CURCUR cctmp;
                    CHECKPOINT cp, lastcp;
+                    int toggleutf;
+                   register SV *sv;
 
-                   if(SvROK(ret) || SvRMAGICAL(ret)) {
-                       SV *sv = SvROK(ret) ? SvRV(ret) : ret;
-
-                       if(SvMAGICAL(sv))
-                           mg = mg_find(sv, 'r');
+                   if(SvROK(ret) && SvSMAGICAL(sv = SvRV(ret)))
+                       mg = mg_find(sv, PERL_MAGIC_qr);
+                   else if (SvSMAGICAL(ret)) {
+                       if (SvGMAGICAL(ret))
+                           sv_unmagic(ret, PERL_MAGIC_qr);
+                       else
+                           mg = mg_find(ret, PERL_MAGIC_qr);
                    }
+
                    if (mg) {
                        re = (regexp *)mg->mg_obj;
                        (void)ReREFCNT_inc(re);
@@ -1693,17 +2900,20 @@ regmatch(regnode *prog)
                        I32 osize = PL_regsize;
                        I32 onpar = PL_regnpar;
 
-                       pm.op_pmflags = 0;
-                       re = CALLREGCOMP(t, t + len, &pm);
-                       if (!(SvFLAGS(ret) 
-                             & (SVs_TEMP | SVs_PADTMP | SVf_READONLY)))
-                           sv_magic(ret,(SV*)ReREFCNT_inc(re),'r',0,0);
+                       Zero(&pm, 1, PMOP);
+                        if (DO_UTF8(ret)) pm.op_pmdynflags |= PMdf_DYN_UTF8;
+                       re = CALLREGCOMP(aTHX_ t, t + len, &pm);
+                       if (!(SvFLAGS(ret)
+                             & (SVs_TEMP | SVs_PADTMP | SVf_READONLY
+                               | SVs_GMG)))
+                           sv_magic(ret,(SV*)ReREFCNT_inc(re),
+                                       PERL_MAGIC_qr,0,0);
                        PL_regprecomp = oprecomp;
                        PL_regsize = osize;
                        PL_regnpar = onpar;
                    }
                    DEBUG_r(
-                       PerlIO_printf(Perl_debug_log, 
+                       PerlIO_printf(Perl_debug_log,
                                      "Entering embedded `%s%.60s%s%s'\n",
                                      PL_colors[0],
                                      re->precomp,
@@ -1715,41 +2925,65 @@ regmatch(regnode *prog)
                    state.cc = PL_regcc;
                    state.re = PL_reg_re;
 
-                   cctmp.cur = 0;
-                   cctmp.oldcc = 0;
-                   PL_regcc = &cctmp;
-                   
+                   PL_regcc = 0;
+               
                    cp = regcppush(0);  /* Save *all* the positions. */
-                   REGCP_SET;
+                   REGCP_SET(lastcp);
                    cache_re(re);
                    state.ss = PL_savestack_ix;
                    *PL_reglastparen = 0;
+                   *PL_reglastcloseparen = 0;
                    PL_reg_call_cc = &state;
                    PL_reginput = locinput;
+                   toggleutf = ((PL_reg_flags & RF_utf8) != 0) ^
+                               ((re->reganch & ROPT_UTF8) != 0);
+                   if (toggleutf) PL_reg_flags ^= RF_utf8;
+
+                   /* XXXX This is too dramatic a measure... */
+                   PL_reg_maxiter = 0;
+
                    if (regmatch(re->program + 1)) {
+                       /* Even though we succeeded, we need to restore
+                          global variables, since we may be wrapped inside
+                          SUSPEND, thus the match may be not finished yet. */
+
+                       /* XXXX Do this only if SUSPENDed? */
+                       PL_reg_call_cc = state.prev;
+                       PL_regcc = state.cc;
+                       PL_reg_re = state.re;
+                       cache_re(PL_reg_re);
+                       if (toggleutf) PL_reg_flags ^= RF_utf8;
+
+                       /* XXXX This is too dramatic a measure... */
+                       PL_reg_maxiter = 0;
+
+                       /* These are needed even if not SUSPEND. */
                        ReREFCNT_dec(re);
                        regcpblow(cp);
                        sayYES;
                    }
-                   DEBUG_r(
-                       PerlIO_printf(Perl_debug_log,
-                                     "%*s  failed...\n",
-                                     REPORT_CODE_OFF+PL_regindent*2, "")
-                       );
                    ReREFCNT_dec(re);
-                   REGCP_UNWIND;
+                   REGCP_UNWIND(lastcp);
                    regcppop();
                    PL_reg_call_cc = state.prev;
                    PL_regcc = state.cc;
                    PL_reg_re = state.re;
                    cache_re(PL_reg_re);
+                   if (toggleutf) PL_reg_flags ^= RF_utf8;
+
+                   /* XXXX This is too dramatic a measure... */
+                   PL_reg_maxiter = 0;
+
+                   logical = 0;
                    sayNO;
                }
                sw = SvTRUE(ret);
                logical = 0;
            }
-           else
+           else {
                sv_setsv(save_scalar(PL_replgv), ret);
+               cache_re(oreg);
+           }
            break;
        }
        case OPEN:
@@ -1760,16 +2994,18 @@ regmatch(regnode *prog)
            break;
        case CLOSE:
            n = ARG(scan);  /* which paren pair */
-           PL_regstartp[n] = PL_reg_start_tmp[n];
-           PL_regendp[n] = locinput;
-           if (n > *PL_reglastparen)
+           PL_regstartp[n] = PL_reg_start_tmp[n] - PL_bostr;
+           PL_regendp[n] = locinput - PL_bostr;
+           if (n > (I32)*PL_reglastparen)
                *PL_reglastparen = n;
+           *PL_reglastcloseparen = n;
            break;
        case GROUPP:
            n = ARG(scan);  /* which paren pair */
-           sw = (*PL_reglastparen >= n && PL_regendp[n] != NULL);
+           sw = ((I32)*PL_reglastparen >= n && PL_regendp[n] != -1);
            break;
        case IFTHEN:
+           PL_reg_leftiter = PL_reg_maxiter;           /* Void cache */
            if (sw)
                next = NEXTOPER(NEXTOPER(scan));
            else {
@@ -1781,15 +3017,96 @@ regmatch(regnode *prog)
        case LOGICAL:
            logical = scan->flags;
            break;
+/*******************************************************************
+ PL_regcc contains infoblock about the innermost (...)* loop, and
+ a pointer to the next outer infoblock.
+
+ Here is how Y(A)*Z is processed (if it is compiled into CURLYX/WHILEM):
+
+   1) After matching X, regnode for CURLYX is processed;
+
+   2) This regnode creates infoblock on the stack, and calls
+      regmatch() recursively with the starting point at WHILEM node;
+
+   3) Each hit of WHILEM node tries to match A and Z (in the order
+      depending on the current iteration, min/max of {min,max} and
+      greediness).  The information about where are nodes for "A"
+      and "Z" is read from the infoblock, as is info on how many times "A"
+      was already matched, and greediness.
+
+   4) After A matches, the same WHILEM node is hit again.
+
+   5) Each time WHILEM is hit, PL_regcc is the infoblock created by CURLYX
+      of the same pair.  Thus when WHILEM tries to match Z, it temporarily
+      resets PL_regcc, since this Y(A)*Z can be a part of some other loop:
+      as in (Y(A)*Z)*.  If Z matches, the automaton will hit the WHILEM node
+      of the external loop.
+
+ Currently present infoblocks form a tree with a stem formed by PL_curcc
+ and whatever it mentions via ->next, and additional attached trees
+ corresponding to temporarily unset infoblocks as in "5" above.
+
+ In the following picture infoblocks for outer loop of
+ (Y(A)*?Z)*?T are denoted O, for inner I.  NULL starting block
+ is denoted by x.  The matched string is YAAZYAZT.  Temporarily postponed
+ infoblocks are drawn below the "reset" infoblock.
+
+ In fact in the picture below we do not show failed matches for Z and T
+ by WHILEM blocks.  [We illustrate minimal matches, since for them it is
+ more obvious *why* one needs to *temporary* unset infoblocks.]
+
+  Matched      REx position    InfoBlocks      Comment
+               (Y(A)*?Z)*?T    x
+               Y(A)*?Z)*?T     x <- O
+  Y            (A)*?Z)*?T      x <- O
+  Y            A)*?Z)*?T       x <- O <- I
+  YA           )*?Z)*?T        x <- O <- I
+  YA           A)*?Z)*?T       x <- O <- I
+  YAA          )*?Z)*?T        x <- O <- I
+  YAA          Z)*?T           x <- O          # Temporary unset I
+                                    I
+
+  YAAZ         Y(A)*?Z)*?T     x <- O
+                                    I
+
+  YAAZY                (A)*?Z)*?T      x <- O
+                                    I
+
+  YAAZY                A)*?Z)*?T       x <- O <- I
+                                    I
+
+  YAAZYA       )*?Z)*?T        x <- O <- I     
+                                    I
+
+  YAAZYA       Z)*?T           x <- O          # Temporary unset I
+                                    I,I
+
+  YAAZYAZ      )*?T            x <- O
+                                    I,I
+
+  YAAZYAZ      T               x               # Temporary unset O
+                               O
+                               I,I
+
+  YAAZYAZT                     x
+                               O
+                               I,I
+ *******************************************************************/
        case CURLYX: {
                CURCUR cc;
                CHECKPOINT cp = PL_savestack_ix;
+               /* No need to save/restore up to this paren */
+               I32 parenfloor = scan->flags;
 
                if (OP(PREVOPER(next)) == NOTHING) /* LONGJMP */
                    next += ARG(next);
                cc.oldcc = PL_regcc;
                PL_regcc = &cc;
-               cc.parenfloor = *PL_reglastparen;
+               /* XXXX Probably it is better to teach regpush to support
+                  parenfloor > PL_regsize... */
+               if (parenfloor > (I32)*PL_reglastparen)
+                   parenfloor = *PL_reglastparen; /* Pessimization... */
+               cc.parenfloor = parenfloor;
                cc.cur = -1;
                cc.min = ARG1(scan);
                cc.max  = ARG2(scan);
@@ -1808,7 +3125,7 @@ regmatch(regnode *prog)
                /*
                 * This is really hard to understand, because after we match
                 * what we're trying to match, we must make sure the rest of
-                * the RE is going to match for sure, and to do that we have
+                * the REx is going to match for sure, and to do that we have
                 * to go back UP the parse tree by recursing ever deeper.  And
                 * if it fails, we have to reset our parent's current state
                 * that we can try again after backing off.
@@ -1822,18 +3139,19 @@ regmatch(regnode *prog)
                PL_reginput = locinput;
 
                DEBUG_r(
-                   PerlIO_printf(Perl_debug_log, 
-                                 "%*s  %ld out of %ld..%ld  cc=%lx\n", 
+                   PerlIO_printf(Perl_debug_log,
+                                 "%*s  %ld out of %ld..%ld  cc=%"UVxf"\n",
                                  REPORT_CODE_OFF+PL_regindent*2, "",
-                                 (long)n, (long)cc->min, 
-                                 (long)cc->max, (long)cc)
+                                 (long)n, (long)cc->min,
+                                 (long)cc->max, PTR2UV(cc))
                    );
 
                /* If degenerate scan matches "", assume scan done. */
 
                if (locinput == cc->lastloc && n >= cc->min) {
                    PL_regcc = cc->oldcc;
-                   ln = PL_regcc->cur;
+                   if (PL_regcc)
+                       ln = PL_regcc->cur;
                    DEBUG_r(
                        PerlIO_printf(Perl_debug_log,
                           "%*s  empty match detected, try continuation...\n",
@@ -1841,12 +3159,8 @@ regmatch(regnode *prog)
                        );
                    if (regmatch(cc->next))
                        sayYES;
-                   DEBUG_r(
-                       PerlIO_printf(Perl_debug_log,
-                                     "%*s  failed...\n",
-                                     REPORT_CODE_OFF+PL_regindent*2, "")
-                       );
-                   PL_regcc->cur = ln;
+                   if (PL_regcc)
+                       PL_regcc->cur = ln;
                    PL_regcc = cc;
                    sayNO;
                }
@@ -1860,35 +3174,80 @@ regmatch(regnode *prog)
                        sayYES;
                    cc->cur = n - 1;
                    cc->lastloc = lastloc;
+                   sayNO;
+               }
+
+               if (scan->flags) {
+                   /* Check whether we already were at this position.
+                       Postpone detection until we know the match is not
+                       *that* much linear. */
+               if (!PL_reg_maxiter) {
+                   PL_reg_maxiter = (PL_regeol - PL_bostr + 1) * (scan->flags>>4);
+                   PL_reg_leftiter = PL_reg_maxiter;
+               }
+               if (PL_reg_leftiter-- == 0) {
+                   I32 size = (PL_reg_maxiter + 7)/8;
+                   if (PL_reg_poscache) {
+                       if ((I32)PL_reg_poscache_size < size) {
+                           Renew(PL_reg_poscache, size, char);
+                           PL_reg_poscache_size = size;
+                       }
+                       Zero(PL_reg_poscache, size, char);
+                   }
+                   else {
+                       PL_reg_poscache_size = size;
+                       Newz(29, PL_reg_poscache, size, char);
+                   }
+                   DEBUG_r(
+                       PerlIO_printf(Perl_debug_log,
+             "%sDetected a super-linear match, switching on caching%s...\n",
+                                     PL_colors[4], PL_colors[5])
+                       );
+               }
+               if (PL_reg_leftiter < 0) {
+                   I32 o = locinput - PL_bostr, b;
+
+                   o = (scan->flags & 0xf) - 1 + o * (scan->flags>>4);
+                   b = o % 8;
+                   o /= 8;
+                   if (PL_reg_poscache[o] & (1<<b)) {
                    DEBUG_r(
                        PerlIO_printf(Perl_debug_log,
-                                     "%*s  failed...\n",
+                                     "%*s  already tried at this position...\n",
                                      REPORT_CODE_OFF+PL_regindent*2, "")
                        );
-                   sayNO;
+                       if (PL_reg_flags & RF_false)
+                           sayYES;
+                       else
+                           sayNO_SILENT;
+                   }
+                   PL_reg_poscache[o] |= (1<<b);
+               }
                }
 
                /* Prefer next over scan for minimal matching. */
 
                if (cc->minmod) {
                    PL_regcc = cc->oldcc;
-                   ln = PL_regcc->cur;
+                   if (PL_regcc)
+                       ln = PL_regcc->cur;
                    cp = regcppush(cc->parenfloor);
-                   REGCP_SET;
+                   REGCP_SET(lastcp);
                    if (regmatch(cc->next)) {
                        regcpblow(cp);
                        sayYES; /* All done. */
                    }
-                   REGCP_UNWIND;
+                   REGCP_UNWIND(lastcp);
                    regcppop();
-                   PL_regcc->cur = ln;
+                   if (PL_regcc)
+                       PL_regcc->cur = ln;
                    PL_regcc = cc;
 
                    if (n >= cc->max) { /* Maximum greed exceeded? */
-                       if (ckWARN(WARN_UNSAFE) && n >= REG_INFTY 
+                       if (ckWARN(WARN_REGEXP) && n >= REG_INFTY
                            && !(PL_reg_flags & RF_warned)) {
                            PL_reg_flags |= RF_warned;
-                           warner(WARN_UNSAFE, "%s limit (%d) exceeded",
+                           Perl_warner(aTHX_ packWARN(WARN_REGEXP), "%s limit (%d) exceeded",
                                 "Complex regular subexpression recursion",
                                 REG_INFTY - 1);
                        }
@@ -1905,17 +3264,12 @@ regmatch(regnode *prog)
                    cc->cur = n;
                    cc->lastloc = locinput;
                    cp = regcppush(cc->parenfloor);
-                   REGCP_SET;
+                   REGCP_SET(lastcp);
                    if (regmatch(cc->scan)) {
                        regcpblow(cp);
                        sayYES;
                    }
-                   DEBUG_r(
-                       PerlIO_printf(Perl_debug_log,
-                                     "%*s  failed...\n",
-                                     REPORT_CODE_OFF+PL_regindent*2, "")
-                       );
-                   REGCP_UNWIND;
+                   REGCP_UNWIND(lastcp);
                    regcppop();
                    cc->cur = n - 1;
                    cc->lastloc = lastloc;
@@ -1928,12 +3282,12 @@ regmatch(regnode *prog)
                    cp = regcppush(cc->parenfloor);
                    cc->cur = n;
                    cc->lastloc = locinput;
-                   REGCP_SET;
+                   REGCP_SET(lastcp);
                    if (regmatch(cc->scan)) {
                        regcpblow(cp);
                        sayYES;
                    }
-                   REGCP_UNWIND;
+                   REGCP_UNWIND(lastcp);
                    regcppop();         /* Restore some previous $<digit>s? */
                    PL_reginput = locinput;
                    DEBUG_r(
@@ -1942,69 +3296,66 @@ regmatch(regnode *prog)
                                      REPORT_CODE_OFF+PL_regindent*2, "")
                        );
                }
-               if (ckWARN(WARN_UNSAFE) && n >= REG_INFTY 
+               if (ckWARN(WARN_REGEXP) && n >= REG_INFTY
                        && !(PL_reg_flags & RF_warned)) {
                    PL_reg_flags |= RF_warned;
-                   warner(WARN_UNSAFE, "%s limit (%d) exceeded",
+                   Perl_warner(aTHX_ packWARN(WARN_REGEXP), "%s limit (%d) exceeded",
                         "Complex regular subexpression recursion",
                         REG_INFTY - 1);
                }
 
                /* Failed deeper matches of scan, so see if this one works. */
                PL_regcc = cc->oldcc;
-               ln = PL_regcc->cur;
+               if (PL_regcc)
+                   ln = PL_regcc->cur;
                if (regmatch(cc->next))
-                   sayYES;
-               DEBUG_r(
-                   PerlIO_printf(Perl_debug_log, "%*s  failed...\n",
-                                 REPORT_CODE_OFF+PL_regindent*2, "")
-                   );
-               PL_regcc->cur = ln;
+                   sayYES;
+               if (PL_regcc)
+                   PL_regcc->cur = ln;
                PL_regcc = cc;
                cc->cur = n - 1;
                cc->lastloc = lastloc;
                sayNO;
            }
            /* NOT REACHED */
-       case BRANCHJ: 
+       case BRANCHJ:
            next = scan + ARG(scan);
            if (next == scan)
                next = NULL;
            inner = NEXTOPER(NEXTOPER(scan));
            goto do_branch;
-       case BRANCH: 
+       case BRANCH:
            inner = NEXTOPER(scan);
          do_branch:
            {
-               CHECKPOINT lastcp;
                c1 = OP(scan);
                if (OP(next) != c1)     /* No choice. */
                    next = inner;       /* Avoid recursion. */
                else {
-                   int lastparen = *PL_reglastparen;
+                   I32 lastparen = *PL_reglastparen;
+                   I32 unwind1;
+                   re_unwind_branch_t *uw;
 
-                   REGCP_SET;
-                   do {
-                       PL_reginput = locinput;
-                       if (regmatch(inner))
-                           sayYES;
-                       REGCP_UNWIND;
-                       for (n = *PL_reglastparen; n > lastparen; n--)
-                           PL_regendp[n] = 0;
-                       *PL_reglastparen = n;
-                       scan = next;
-                       /*SUPPRESS 560*/
-                       if (n = (c1 == BRANCH ? NEXT_OFF(next) : ARG(next)))
-                           next += n;
-                       else
-                           next = NULL;
-                       inner = NEXTOPER(scan);
-                       if (c1 == BRANCHJ) {
-                           inner = NEXTOPER(inner);
-                       }
-                   } while (scan != NULL && OP(scan) == c1);
-                   sayNO;
-                   /* NOTREACHED */
+                   /* Put unwinding data on stack */
+                   unwind1 = SSNEWt(1,re_unwind_branch_t);
+                   uw = SSPTRt(unwind1,re_unwind_branch_t);
+                   uw->prev = unwind;
+                   unwind = unwind1;
+                   uw->type = ((c1 == BRANCH)
+                               ? RE_UNWIND_BRANCH
+                               : RE_UNWIND_BRANCHJ);
+                   uw->lastparen = lastparen;
+                   uw->next = next;
+                   uw->locinput = locinput;
+                   uw->nextchr = nextchr;
+#ifdef DEBUGGING
+                   uw->regindent = ++PL_regindent;
+#endif
+
+                   REGCP_SET(uw->lastcp);
+
+                   /* Now go into the first branch */
+                   next = inner;
                }
            }
            break;
@@ -2015,7 +3366,7 @@ regmatch(regnode *prog)
        {
            I32 l = 0;
            CHECKPOINT lastcp;
-           
+       
            /* We suppose that the next guy does not need
               backtracking: in particular, it is of constant length,
               and has no parenths to influence future backrefs. */
@@ -2025,7 +3376,7 @@ regmatch(regnode *prog)
            if (paren) {
                if (paren > PL_regsize)
                    PL_regsize = paren;
-               if (paren > *PL_reglastparen)
+               if (paren > (I32)*PL_reglastparen)
                    *PL_reglastparen = paren;
            }
            scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
@@ -2036,25 +3387,40 @@ regmatch(regnode *prog)
                minmod = 0;
                if (ln && regrepeat_hard(scan, ln, &l) < ln)
                    sayNO;
-               if (ln && l == 0 && n >= ln
-                   /* In fact, this is tricky.  If paren, then the
-                      fact that we did/didnot match may influence
-                      future execution. */
-                   && !(paren && ln == 0))
-                   ln = n;
+               /* if we matched something zero-length we don't need to
+                  backtrack - capturing parens are already defined, so
+                  the caveat in the maximal case doesn't apply
+
+                  XXXX if ln == 0, we can redo this check first time
+                  through the following loop
+               */
+               if (ln && l == 0)
+                   n = ln;     /* don't backtrack */
                locinput = PL_reginput;
-               if (PL_regkind[(U8)OP(next)] == EXACT) {
-                   c1 = UCHARAT(OPERAND(next) + 1);
-                   if (OP(next) == EXACTF)
-                       c2 = PL_fold[c1];
-                   else if (OP(next) == EXACTFL)
-                       c2 = PL_fold_locale[c1];
-                   else
-                       c2 = c1;
+               if (HAS_TEXT(next) || JUMPABLE(next)) {
+                   regnode *text_node = next;
+
+                   if (! HAS_TEXT(text_node)) FIND_NEXT_IMPT(text_node);
+
+                   if (! HAS_TEXT(text_node)) c1 = c2 = -1000;
+                   else {
+                       if (PL_regkind[(U8)OP(text_node)] == REF) {
+                           c1 = c2 = -1000;
+                           goto assume_ok_MM;
+                       }
+                       else { c1 = (U8)*STRING(text_node); }
+                       if (OP(text_node) == EXACTF || OP(text_node) == REFF)
+                           c2 = PL_fold[c1];
+                       else if (OP(text_node) == EXACTFL || OP(text_node) == REFFL)
+                           c2 = PL_fold_locale[c1];
+                       else
+                           c2 = c1;
+                   }
                }
                else
                    c1 = c2 = -1000;
-               REGCP_SET;
+           assume_ok_MM:
+               REGCP_SET(lastcp);
                /* This may be improved if l == 0.  */
                while (n >= ln || (n == REG_INFTY && ln > 0 && l)) { /* ln overflow ? */
                    /* If it could work, try it. */
@@ -2063,16 +3429,17 @@ regmatch(regnode *prog)
                        UCHARAT(PL_reginput) == c2)
                    {
                        if (paren) {
-                           if (n) {
-                               PL_regstartp[paren] = HOPc(PL_reginput, -l);
-                               PL_regendp[paren] = PL_reginput;
+                           if (ln) {
+                               PL_regstartp[paren] =
+                                   HOPc(PL_reginput, -l) - PL_bostr;
+                               PL_regendp[paren] = PL_reginput - PL_bostr;
                            }
                            else
-                               PL_regendp[paren] = NULL;
+                               PL_regendp[paren] = -1;
                        }
                        if (regmatch(next))
                            sayYES;
-                       REGCP_UNWIND;
+                       REGCP_UNWIND(lastcp);
                    }
                    /* Couldn't or didn't -- move forward. */
                    PL_reginput = locinput;
@@ -2086,32 +3453,47 @@ regmatch(regnode *prog)
            }
            else {
                n = regrepeat_hard(scan, n, &l);
-               if (n != 0 && l == 0
-                   /* In fact, this is tricky.  If paren, then the
-                      fact that we did/didnot match may influence
-                      future execution. */
-                   && !(paren && ln == 0))
-                   ln = n;
+               /* if we matched something zero-length we don't need to
+                  backtrack, unless the minimum count is zero and we
+                  are capturing the result - in that case the capture
+                  being defined or not may affect later execution
+               */
+               if (n != 0 && l == 0 && !(paren && ln == 0))
+                   ln = n;     /* don't backtrack */
                locinput = PL_reginput;
                DEBUG_r(
                    PerlIO_printf(Perl_debug_log,
-                                 "%*s  matched %ld times, len=%ld...\n",
-                                 REPORT_CODE_OFF+PL_regindent*2, "", n, l)
+                                 "%*s  matched %"IVdf" times, len=%"IVdf"...\n",
+                                 (int)(REPORT_CODE_OFF+PL_regindent*2), "",
+                                 (IV) n, (IV)l)
                    );
                if (n >= ln) {
-                   if (PL_regkind[(U8)OP(next)] == EXACT) {
-                       c1 = UCHARAT(OPERAND(next) + 1);
-                       if (OP(next) == EXACTF)
-                           c2 = PL_fold[c1];
-                       else if (OP(next) == EXACTFL)
-                           c2 = PL_fold_locale[c1];
-                       else
-                           c2 = c1;
+                   if (HAS_TEXT(next) || JUMPABLE(next)) {
+                       regnode *text_node = next;
+
+                       if (! HAS_TEXT(text_node)) FIND_NEXT_IMPT(text_node);
+
+                       if (! HAS_TEXT(text_node)) c1 = c2 = -1000;
+                       else {
+                           if (PL_regkind[(U8)OP(text_node)] == REF) {
+                               c1 = c2 = -1000;
+                               goto assume_ok_REG;
+                           }
+                           else { c1 = (U8)*STRING(text_node); }
+
+                           if (OP(text_node) == EXACTF || OP(text_node) == REFF)
+                               c2 = PL_fold[c1];
+                           else if (OP(text_node) == EXACTFL || OP(text_node) == REFFL)
+                               c2 = PL_fold_locale[c1];
+                           else
+                               c2 = c1;
+                       }
                    }
                    else
                        c1 = c2 = -1000;
                }
-               REGCP_SET;
+           assume_ok_REG:
+               REGCP_SET(lastcp);
                while (n >= ln) {
                    /* If it could work, try it. */
                    if (c1 == -1000 ||
@@ -2120,20 +3502,20 @@ regmatch(regnode *prog)
                    {
                        DEBUG_r(
                                PerlIO_printf(Perl_debug_log,
-                                             "%*s  trying tail with n=%ld...\n",
-                                             REPORT_CODE_OFF+PL_regindent*2, "", n)
+                                             "%*s  trying tail with n=%"IVdf"...\n",
+                                             (int)(REPORT_CODE_OFF+PL_regindent*2), "", (IV)n)
                            );
                        if (paren) {
                            if (n) {
-                               PL_regstartp[paren] = HOPc(PL_reginput, -l);
-                               PL_regendp[paren] = PL_reginput;
+                               PL_regstartp[paren] = HOPc(PL_reginput, -l) - PL_bostr;
+                               PL_regendp[paren] = PL_reginput - PL_bostr;
                            }
                            else
-                               PL_regendp[paren] = NULL;
+                               PL_regendp[paren] = -1;
                        }
                        if (regmatch(next))
                            sayYES;
-                       REGCP_UNWIND;
+                       REGCP_UNWIND(lastcp);
                    }
                    /* Couldn't or didn't -- back up. */
                    n--;
@@ -2148,7 +3530,7 @@ regmatch(regnode *prog)
            paren = scan->flags;        /* Which paren to set */
            if (paren > PL_regsize)
                PL_regsize = paren;
-           if (paren > *PL_reglastparen)
+           if (paren > (I32)*PL_reglastparen)
                *PL_reglastparen = paren;
            ln = ARG1(scan);  /* min to match */
            n  = ARG2(scan);  /* max to match */
@@ -2176,17 +3558,61 @@ regmatch(regnode *prog)
            * Lookahead to avoid useless match attempts
            * when we know what character comes next.
            */
-           if (PL_regkind[(U8)OP(next)] == EXACT) {
-               c1 = UCHARAT(OPERAND(next) + 1);
-               if (OP(next) == EXACTF)
-                   c2 = PL_fold[c1];
-               else if (OP(next) == EXACTFL)
-                   c2 = PL_fold_locale[c1];
-               else
-                   c2 = c1;
+
+           /*
+           * Used to only do .*x and .*?x, but now it allows
+           * for )'s, ('s and (?{ ... })'s to be in the way
+           * of the quantifier and the EXACT-like node.  -- japhy
+           */
+
+           if (HAS_TEXT(next) || JUMPABLE(next)) {
+               U8 *s;
+               regnode *text_node = next;
+
+               if (! HAS_TEXT(text_node)) FIND_NEXT_IMPT(text_node);
+
+               if (! HAS_TEXT(text_node)) c1 = c2 = -1000;
+               else {
+                   if (PL_regkind[(U8)OP(text_node)] == REF) {
+                       c1 = c2 = -1000;
+                       goto assume_ok_easy;
+                   }
+                   else { s = (U8*)STRING(text_node); }
+
+                   if (!UTF) {
+                       c2 = c1 = *s;
+                       if (OP(text_node) == EXACTF || OP(text_node) == REFF)
+                           c2 = PL_fold[c1];
+                       else if (OP(text_node) == EXACTFL || OP(text_node) == REFFL)
+                           c2 = PL_fold_locale[c1];
+                   }
+                   else { /* UTF */
+                       if (OP(text_node) == EXACTF || OP(text_node) == REFF) {
+                            STRLEN ulen1, ulen2;
+                            U8 tmpbuf1[UTF8_MAXLEN_UCLC+1];
+                            U8 tmpbuf2[UTF8_MAXLEN_UCLC+1];
+
+                            to_utf8_lower((U8*)s, tmpbuf1, &ulen1);
+                            to_utf8_upper((U8*)s, tmpbuf2, &ulen2);
+
+                            c1 = utf8n_to_uvuni(tmpbuf1, UTF8_MAXLEN, 0,
+                                                ckWARN(WARN_UTF8) ?
+                                                0 : UTF8_ALLOW_ANY);
+                            c2 = utf8n_to_uvuni(tmpbuf2, UTF8_MAXLEN, 0,
+                                                ckWARN(WARN_UTF8) ?
+                                                0 : UTF8_ALLOW_ANY);
+                       }
+                       else {
+                           c2 = c1 = utf8n_to_uvchr(s, UTF8_MAXLEN, 0,
+                                                    ckWARN(WARN_UTF8) ?
+                                                    0 : UTF8_ALLOW_ANY);
+                       }
+                   }
+               }
            }
            else
                c1 = c2 = -1000;
+       assume_ok_easy:
            PL_reginput = locinput;
            if (minmod) {
                CHECKPOINT lastcp;
@@ -2194,24 +3620,116 @@ regmatch(regnode *prog)
                if (ln && regrepeat(scan, ln) < ln)
                    sayNO;
                locinput = PL_reginput;
-               REGCP_SET;
+               REGCP_SET(lastcp);
+               if (c1 != -1000) {
+                   char *e; /* Should not check after this */
+                   char *old = locinput;
+                   int count = 0;
+
+                   if  (n == REG_INFTY) {
+                       e = PL_regeol - 1;
+                       if (do_utf8)
+                           while (UTF8_IS_CONTINUATION(*(U8*)e))
+                               e--;
+                   }
+                   else if (do_utf8) {
+                       int m = n - ln;
+                       for (e = locinput;
+                            m >0 && e + UTF8SKIP(e) <= PL_regeol; m--)
+                           e += UTF8SKIP(e);
+                   }
+                   else {
+                       e = locinput + n - ln;
+                       if (e >= PL_regeol)
+                           e = PL_regeol - 1;
+                   }
+                   while (1) {
+                       /* Find place 'next' could work */
+                       if (!do_utf8) {
+                           if (c1 == c2) {
+                               while (locinput <= e &&
+                                      UCHARAT(locinput) != c1)
+                                   locinput++;
+                           } else {
+                               while (locinput <= e
+                                      && UCHARAT(locinput) != c1
+                                      && UCHARAT(locinput) != c2)
+                                   locinput++;
+                           }
+                           count = locinput - old;
+                       }
+                       else {
+                           STRLEN len;
+                           if (c1 == c2) {
+                               /* count initialised to
+                                * utf8_distance(old, locinput) */
+                               while (locinput <= e &&
+                                      utf8n_to_uvchr((U8*)locinput,
+                                                     UTF8_MAXLEN, &len,
+                                                     ckWARN(WARN_UTF8) ?
+                                                     0 : UTF8_ALLOW_ANY) != (UV)c1) {
+                                   locinput += len;
+                                   count++;
+                               }
+                           } else {
+                               /* count initialised to
+                                * utf8_distance(old, locinput) */
+                               while (locinput <= e) {
+                                   UV c = utf8n_to_uvchr((U8*)locinput,
+                                                         UTF8_MAXLEN, &len,
+                                                         ckWARN(WARN_UTF8) ?
+                                                         0 : UTF8_ALLOW_ANY);
+                                   if (c == (UV)c1 || c == (UV)c2)
+                                       break;
+                                   locinput += len;
+                                   count++;
+                               }
+                           }
+                       }
+                       if (locinput > e)
+                           sayNO;
+                       /* PL_reginput == old now */
+                       if (locinput != old) {
+                           ln = 1;     /* Did some */
+                           if (regrepeat(scan, count) < count)
+                               sayNO;
+                       }
+                       /* PL_reginput == locinput now */
+                       TRYPAREN(paren, ln, locinput);
+                       PL_reginput = locinput; /* Could be reset... */
+                       REGCP_UNWIND(lastcp);
+                       /* Couldn't or didn't -- move forward. */
+                       old = locinput;
+                       if (do_utf8)
+                           locinput += UTF8SKIP(locinput);
+                       else
+                           locinput++;
+                       count = 1;
+                   }
+               }
+               else
                while (n >= ln || (n == REG_INFTY && ln > 0)) { /* ln overflow ? */
+                   UV c;
+                   if (c1 != -1000) {
+                       if (do_utf8)
+                           c = utf8n_to_uvchr((U8*)PL_reginput,
+                                              UTF8_MAXLEN, 0,
+                                              ckWARN(WARN_UTF8) ?
+                                              0 : UTF8_ALLOW_ANY);
+                       else
+                           c = UCHARAT(PL_reginput);
+                       /* If it could work, try it. */
+                       if (c == (UV)c1 || c == (UV)c2)
+                       {
+                           TRYPAREN(paren, ln, PL_reginput);
+                           REGCP_UNWIND(lastcp);
+                       }
+                   }
                    /* If it could work, try it. */
-                   if (c1 == -1000 ||
-                       UCHARAT(PL_reginput) == c1 ||
-                       UCHARAT(PL_reginput) == c2)
+                   else if (c1 == -1000)
                    {
-                       if (paren) {
-                           if (n) {
-                               PL_regstartp[paren] = HOPc(PL_reginput, -1);
-                               PL_regendp[paren] = PL_reginput;
-                           }
-                           else
-                               PL_regendp[paren] = NULL;
-                       }
-                       if (regmatch(next))
-                           sayYES;
-                       REGCP_UNWIND;
+                       TRYPAREN(paren, ln, PL_reginput);
+                       REGCP_UNWIND(lastcp);
                    }
                    /* Couldn't or didn't -- move forward. */
                    PL_reginput = locinput;
@@ -2228,27 +3746,34 @@ regmatch(regnode *prog)
                n = regrepeat(scan, n);
                locinput = PL_reginput;
                if (ln < n && PL_regkind[(U8)OP(next)] == EOL &&
-                   (!PL_multiline  || OP(next) == SEOL))
+                   ((!PL_multiline && OP(next) != MEOL) ||
+                       OP(next) == SEOL || OP(next) == EOS))
+               {
                    ln = n;                     /* why back off? */
-               REGCP_SET;
+                   /* ...because $ and \Z can match before *and* after
+                      newline at the end.  Consider "\n\n" =~ /\n+\Z\n/.
+                      We should back off by one in this case. */
+                   if (UCHARAT(PL_reginput - 1) == '\n' && OP(next) != EOS)
+                       ln--;
+               }
+               REGCP_SET(lastcp);
                if (paren) {
+                   UV c = 0;
                    while (n >= ln) {
+                       if (c1 != -1000) {
+                           if (do_utf8)
+                               c = utf8n_to_uvchr((U8*)PL_reginput,
+                                                  UTF8_MAXLEN, 0,
+                                                  ckWARN(WARN_UTF8) ?
+                                                  0 : UTF8_ALLOW_ANY);
+                           else
+                               c = UCHARAT(PL_reginput);
+                       }
                        /* If it could work, try it. */
-                       if (c1 == -1000 ||
-                           UCHARAT(PL_reginput) == c1 ||
-                           UCHARAT(PL_reginput) == c2)
+                       if (c1 == -1000 || c == (UV)c1 || c == (UV)c2)
                            {
-                               if (paren && n) {
-                                   if (n) {
-                                       PL_regstartp[paren] = HOPc(PL_reginput, -1);
-                                       PL_regendp[paren] = PL_reginput;
-                                   }
-                                   else
-                                       PL_regendp[paren] = NULL;
-                               }
-                               if (regmatch(next))
-                                   sayYES;
-                               REGCP_UNWIND;
+                               TRYPAREN(paren, n, PL_reginput);
+                               REGCP_UNWIND(lastcp);
                            }
                        /* Couldn't or didn't -- back up. */
                        n--;
@@ -2256,15 +3781,22 @@ regmatch(regnode *prog)
                    }
                }
                else {
+                   UV c = 0;
                    while (n >= ln) {
+                       if (c1 != -1000) {
+                           if (do_utf8)
+                               c = utf8n_to_uvchr((U8*)PL_reginput,
+                                                  UTF8_MAXLEN, 0,
+                                                  ckWARN(WARN_UTF8) ?
+                                                  0 : UTF8_ALLOW_ANY);
+                           else
+                               c = UCHARAT(PL_reginput);
+                       }
                        /* If it could work, try it. */
-                       if (c1 == -1000 ||
-                           UCHARAT(PL_reginput) == c1 ||
-                           UCHARAT(PL_reginput) == c2)
+                       if (c1 == -1000 || c == (UV)c1 || c == (UV)c2)
                            {
-                               if (regmatch(next))
-                                   sayYES;
-                               REGCP_UNWIND;
+                               TRYPAREN(paren, n, PL_reginput);
+                               REGCP_UNWIND(lastcp);
                            }
                        /* Couldn't or didn't -- back up. */
                        n--;
@@ -2282,7 +3814,7 @@ regmatch(regnode *prog)
                CHECKPOINT cp, lastcp;
                
                cp = regcppush(0);      /* Save *all* the positions. */
-               REGCP_SET;
+               REGCP_SET(lastcp);
                regcp_set_to(PL_reg_call_cc->ss); /* Restore parens of
                                                    the caller. */
                PL_reginput = locinput; /* Make position available to
@@ -2295,7 +3827,7 @@ regmatch(regnode *prog)
                    regcpblow(cp);
                    sayYES;
                }
-               REGCP_UNWIND;
+               REGCP_UNWIND(lastcp);
                regcppop();
                PL_reg_call_cc = cur_call_cc;
                PL_regcc = cctmp;
@@ -2307,34 +3839,43 @@ regmatch(regnode *prog)
                                  "%*s  continuation failed...\n",
                                  REPORT_CODE_OFF+PL_regindent*2, "")
                    );
-               sayNO;
+               sayNO_SILENT;
            }
-           if (locinput < PL_regtill)
-               sayNO;                  /* Cannot match: too short. */
-           /* Fall through */
+           if (locinput < PL_regtill) {
+               DEBUG_r(PerlIO_printf(Perl_debug_log,
+                                     "%sMatch possible, but length=%ld is smaller than requested=%ld, failing!%s\n",
+                                     PL_colors[4],
+                                     (long)(locinput - PL_reg_starttry),
+                                     (long)(PL_regtill - PL_reg_starttry),
+                                     PL_colors[5]));
+               sayNO_FINAL;            /* Cannot match: too short. */
+           }
+           PL_reginput = locinput;     /* put where regtry can find it */
+           sayYES_FINAL;               /* Success! */
        case SUCCEED:
            PL_reginput = locinput;     /* put where regtry can find it */
-           sayYES;                     /* Success! */
+           sayYES_LOUD;                /* Success! */
        case SUSPEND:
            n = 1;
            PL_reginput = locinput;
-           goto do_ifmatch;        
+           goto do_ifmatch;    
        case UNLESSM:
            n = 0;
            if (scan->flags) {
-               s = HOPMAYBEc(locinput, -scan->flags);
+               s = HOPBACKc(locinput, scan->flags);
                if (!s)
                    goto say_yes;
                PL_reginput = s;
            }
            else
                PL_reginput = locinput;
+           PL_reg_flags ^= RF_false;
            goto do_ifmatch;
        case IFMATCH:
            n = 1;
            if (scan->flags) {
-               s = HOPMAYBEc(locinput, -scan->flags);
-               if (!s || s < PL_bostr)
+               s = HOPBACKc(locinput, scan->flags);
+               if (!s)
                    goto say_no;
                PL_reginput = s;
            }
@@ -2344,6 +3885,8 @@ regmatch(regnode *prog)
          do_ifmatch:
            inner = NEXTOPER(NEXTOPER(scan));
            if (regmatch(inner) != n) {
+               if (n == 0)
+                   PL_reg_flags ^= RF_false;
              say_no:
                if (logical) {
                    logical = 0;
@@ -2353,6 +3896,8 @@ regmatch(regnode *prog)
                else
                    sayNO;
            }
+           if (n == 0)
+               PL_reg_flags ^= RF_false;
          say_yes:
            if (logical) {
                logical = 0;
@@ -2370,10 +3915,11 @@ regmatch(regnode *prog)
                next = NULL;
            break;
        default:
-           PerlIO_printf(PerlIO_stderr(), "%lx %d\n",
-                         (unsigned long)scan, OP(scan));
-           FAIL("regexp memory corruption");
+           PerlIO_printf(Perl_error_log, "%"UVxf" %d\n",
+                         PTR2UV(scan), OP(scan));
+           Perl_croak(aTHX_ "regexp memory corruption");
        }
+      reenter:
        scan = next;
     }
 
@@ -2381,17 +3927,89 @@ regmatch(regnode *prog)
     * We get here only if there's trouble -- normally "case END" is
     * the terminating point.
     */
-    FAIL("corrupted regexp pointers");
+    Perl_croak(aTHX_ "corrupted regexp pointers");
     /*NOTREACHED*/
     sayNO;
 
+yes_loud:
+    DEBUG_r(
+       PerlIO_printf(Perl_debug_log,
+                     "%*s  %scould match...%s\n",
+                     REPORT_CODE_OFF+PL_regindent*2, "", PL_colors[4],PL_colors[5])
+       );
+    goto yes;
+yes_final:
+    DEBUG_r(PerlIO_printf(Perl_debug_log, "%sMatch successful!%s\n",
+                         PL_colors[4],PL_colors[5]));
 yes:
 #ifdef DEBUGGING
     PL_regindent--;
 #endif
+
+#if 0                                  /* Breaks $^R */
+    if (unwind)
+       regcpblow(firstcp);
+#endif
     return 1;
 
 no:
+    DEBUG_r(
+       PerlIO_printf(Perl_debug_log,
+                     "%*s  %sfailed...%s\n",
+                     REPORT_CODE_OFF+PL_regindent*2, "",PL_colors[4],PL_colors[5])
+       );
+    goto do_no;
+no_final:
+do_no:
+    if (unwind) {
+       re_unwind_t *uw = SSPTRt(unwind,re_unwind_t);
+
+       switch (uw->type) {
+       case RE_UNWIND_BRANCH:
+       case RE_UNWIND_BRANCHJ:
+       {
+           re_unwind_branch_t *uwb = &(uw->branch);
+           I32 lastparen = uwb->lastparen;
+       
+           REGCP_UNWIND(uwb->lastcp);
+           for (n = *PL_reglastparen; n > lastparen; n--)
+               PL_regendp[n] = -1;
+           *PL_reglastparen = n;
+           scan = next = uwb->next;
+           if ( !scan ||
+                OP(scan) != (uwb->type == RE_UNWIND_BRANCH
+                             ? BRANCH : BRANCHJ) ) {           /* Failure */
+               unwind = uwb->prev;
+#ifdef DEBUGGING
+               PL_regindent--;
+#endif
+               goto do_no;
+           }
+           /* Have more choice yet.  Reuse the same uwb.  */
+           /*SUPPRESS 560*/
+           if ((n = (uwb->type == RE_UNWIND_BRANCH
+                     ? NEXT_OFF(next) : ARG(next))))
+               next += n;
+           else
+               next = NULL;    /* XXXX Needn't unwinding in this case... */
+           uwb->next = next;
+           next = NEXTOPER(scan);
+           if (uwb->type == RE_UNWIND_BRANCHJ)
+               next = NEXTOPER(next);
+           locinput = uwb->locinput;
+           nextchr = uwb->nextchr;
+#ifdef DEBUGGING
+           PL_regindent = uwb->regindent;
+#endif
+
+           goto reenter;
+       }
+       /* NOT REACHED */
+       default:
+           Perl_croak(aTHX_ "regexp unwind memory corruption");
+       }
+       /* NOT REACHED */
+    }
 #ifdef DEBUGGING
     PL_regindent--;
 #endif
@@ -2407,188 +4025,217 @@ no:
  * rather than incrementing count on every character.  [Er, except utf8.]]
  */
 STATIC I32
-regrepeat(regnode *p, I32 max)
+S_regrepeat(pTHX_ regnode *p, I32 max)
 {
-    dTHR;
     register char *scan;
-    register char *opnd;
     register I32 c;
     register char *loceol = PL_regeol;
     register I32 hardcount = 0;
+    register bool do_utf8 = PL_reg_match_utf8;
 
     scan = PL_reginput;
-    if (max != REG_INFTY && max < loceol - scan)
+    if (max == REG_INFTY)
+       max = I32_MAX;
+    else if (max < loceol - scan)
       loceol = scan + max;
-    opnd = (char *) OPERAND(p);
     switch (OP(p)) {
     case REG_ANY:
-       while (scan < loceol && *scan != '\n')
-           scan++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (scan < loceol && hardcount < max && *scan != '\n') {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && *scan != '\n')
+               scan++;
+       }
        break;
     case SANY:
-       scan = loceol;
-       break;
-    case ANYUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && *scan != '\n') {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+        if (do_utf8) {
+           loceol = PL_regeol;
+           while (scan < loceol && hardcount < max) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
        }
+       else
+           scan = loceol;
        break;
-    case SANYUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
-       }
+    case CANY:
+       scan = loceol;
        break;
     case EXACT:                /* length of string is 1 */
-       c = UCHARAT(++opnd);
+       c = (U8)*STRING(p);
        while (scan < loceol && UCHARAT(scan) == c)
            scan++;
        break;
     case EXACTF:       /* length of string is 1 */
-       c = UCHARAT(++opnd);
+       c = (U8)*STRING(p);
        while (scan < loceol &&
               (UCHARAT(scan) == c || UCHARAT(scan) == PL_fold[c]))
            scan++;
        break;
     case EXACTFL:      /* length of string is 1 */
        PL_reg_flags |= RF_tainted;
-       c = UCHARAT(++opnd);
+       c = (U8)*STRING(p);
        while (scan < loceol &&
               (UCHARAT(scan) == c || UCHARAT(scan) == PL_fold_locale[c]))
            scan++;
        break;
-    case ANYOFUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && REGINCLASSUTF8(p, (U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
-       }
-       break;
     case ANYOF:
-       while (scan < loceol && REGINCLASS(opnd, *scan))
-           scan++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (hardcount < max && scan < loceol &&
+                  reginclass(p, (U8*)scan, 0, do_utf8)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && REGINCLASS(p, (U8*)scan))
+               scan++;
+       }
        break;
     case ALNUM:
-       while (scan < loceol && isALNUM(*scan))
-           scan++;
-       break;
-    case ALNUMUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && swash_fetch(PL_utf8_alnum, (U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(alnum,"a");
+           while (hardcount < max && scan < loceol &&
+                  swash_fetch(PL_utf8_alnum, (U8*)scan, do_utf8)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && isALNUM(*scan))
+               scan++;
        }
        break;
     case ALNUML:
        PL_reg_flags |= RF_tainted;
-       while (scan < loceol && isALNUM_LC(*scan))
-           scan++;
-       break;
-    case ALNUMLUTF8:
-       PL_reg_flags |= RF_tainted;
-       loceol = PL_regeol;
-       while (scan < loceol && isALNUM_LC_utf8((U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (hardcount < max && scan < loceol &&
+                  isALNUM_LC_utf8((U8*)scan)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && isALNUM_LC(*scan))
+               scan++;
        }
        break;
-       break;
     case NALNUM:
-       while (scan < loceol && !isALNUM(*scan))
-           scan++;
-       break;
-    case NALNUMUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && !swash_fetch(PL_utf8_alnum, (U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(alnum,"a");
+           while (hardcount < max && scan < loceol &&
+                  !swash_fetch(PL_utf8_alnum, (U8*)scan, do_utf8)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && !isALNUM(*scan))
+               scan++;
        }
        break;
     case NALNUML:
        PL_reg_flags |= RF_tainted;
-       while (scan < loceol && !isALNUM_LC(*scan))
-           scan++;
-       break;
-    case NALNUMLUTF8:
-       PL_reg_flags |= RF_tainted;
-       loceol = PL_regeol;
-       while (scan < loceol && !isALNUM_LC_utf8((U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (hardcount < max && scan < loceol &&
+                  !isALNUM_LC_utf8((U8*)scan)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && !isALNUM_LC(*scan))
+               scan++;
        }
        break;
     case SPACE:
-       while (scan < loceol && isSPACE(*scan))
-           scan++;
-       break;
-    case SPACEUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && (*scan == ' ' || swash_fetch(PL_utf8_space,(U8*)scan))) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(space," ");
+           while (hardcount < max && scan < loceol &&
+                  (*scan == ' ' ||
+                   swash_fetch(PL_utf8_space,(U8*)scan, do_utf8))) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && isSPACE(*scan))
+               scan++;
        }
        break;
     case SPACEL:
        PL_reg_flags |= RF_tainted;
-       while (scan < loceol && isSPACE_LC(*scan))
-           scan++;
-       break;
-    case SPACELUTF8:
-       PL_reg_flags |= RF_tainted;
-       loceol = PL_regeol;
-       while (scan < loceol && (*scan == ' ' || isSPACE_LC_utf8((U8*)scan))) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (hardcount < max && scan < loceol &&
+                  (*scan == ' ' || isSPACE_LC_utf8((U8*)scan))) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && isSPACE_LC(*scan))
+               scan++;
        }
        break;
     case NSPACE:
-       while (scan < loceol && !isSPACE(*scan))
-           scan++;
-       break;
-    case NSPACEUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && !(*scan == ' ' || swash_fetch(PL_utf8_space,(U8*)scan))) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(space," ");
+           while (hardcount < max && scan < loceol &&
+                  !(*scan == ' ' ||
+                    swash_fetch(PL_utf8_space,(U8*)scan, do_utf8))) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && !isSPACE(*scan))
+               scan++;
+           break;
        }
-       break;
     case NSPACEL:
        PL_reg_flags |= RF_tainted;
-       while (scan < loceol && !isSPACE_LC(*scan))
-           scan++;
-       break;
-    case NSPACELUTF8:
-       PL_reg_flags |= RF_tainted;
-       loceol = PL_regeol;
-       while (scan < loceol && !(*scan == ' ' || isSPACE_LC_utf8((U8*)scan))) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           while (hardcount < max && scan < loceol &&
+                  !(*scan == ' ' || isSPACE_LC_utf8((U8*)scan))) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && !isSPACE_LC(*scan))
+               scan++;
        }
        break;
     case DIGIT:
-       while (scan < loceol && isDIGIT(*scan))
-           scan++;
-       break;
-    case DIGITUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && swash_fetch(PL_utf8_digit,(U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(digit,"0");
+           while (hardcount < max && scan < loceol &&
+                  swash_fetch(PL_utf8_digit, (U8*)scan, do_utf8)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && isDIGIT(*scan))
+               scan++;
        }
        break;
-       break;
     case NDIGIT:
-       while (scan < loceol && !isDIGIT(*scan))
-           scan++;
-       break;
-    case NDIGITUTF8:
-       loceol = PL_regeol;
-       while (scan < loceol && !swash_fetch(PL_utf8_digit,(U8*)scan)) {
-           scan += UTF8SKIP(scan);
-           hardcount++;
+       if (do_utf8) {
+           loceol = PL_regeol;
+           LOAD_UTF8_CHARCLASS(digit,"0");
+           while (hardcount < max && scan < loceol &&
+                  !swash_fetch(PL_utf8_digit, (U8*)scan, do_utf8)) {
+               scan += UTF8SKIP(scan);
+               hardcount++;
+           }
+       } else {
+           while (scan < loceol && !isDIGIT(*scan))
+               scan++;
        }
        break;
     default:           /* Called on something of 0 width. */
@@ -2601,30 +4248,29 @@ regrepeat(regnode *p, I32 max)
        c = scan - PL_reginput;
     PL_reginput = scan;
 
-    DEBUG_r( 
+    DEBUG_r(
        {
                SV *prop = sv_newmortal();
 
                regprop(prop, p);
-               PerlIO_printf(Perl_debug_log, 
-                             "%*s  %s can match %ld times out of %ld...\n", 
-                             REPORT_CODE_OFF+1, "", SvPVX(prop),c,max);
+               PerlIO_printf(Perl_debug_log,
+                             "%*s  %s can match %"IVdf" times out of %"IVdf"...\n",
+                             REPORT_CODE_OFF+1, "", SvPVX(prop),(IV)c,(IV)max);
        });
-    
+
     return(c);
 }
 
 /*
  - regrepeat_hard - repeatedly match something, report total lenth and length
- * 
+ *
  * The repeater is supposed to have constant length.
  */
 
 STATIC I32
-regrepeat_hard(regnode *p, I32 max, I32 *lp)
+S_regrepeat_hard(pTHX_ regnode *p, I32 max, I32 *lp)
 {
-    dTHR;
-    register char *scan;
+    register char *scan = Nullch;
     register char *start;
     register char *loceol = PL_regeol;
     I32 l = 0;
@@ -2634,7 +4280,7 @@ regrepeat_hard(regnode *p, I32 max, I32 *lp)
        return 0;
 
     start = PL_reginput;
-    if (UTF) {
+    if (PL_reg_match_utf8) {
        while (PL_reginput < loceol && (scan = PL_reginput, res = regmatch(p))) {
            if (!count++) {
                l = 0;
@@ -2663,83 +4309,179 @@ regrepeat_hard(regnode *p, I32 max, I32 *lp)
     }
     if (!res)
        PL_reginput = scan;
-    
+
     return count;
 }
 
 /*
- - regclass - determine if a character falls into a character class
- */
+- regclass_swash - prepare the utf8 swash
+*/
 
-STATIC bool
-reginclass(register char *p, register I32 c)
+SV *
+Perl_regclass_swash(pTHX_ register regnode* node, bool doinit, SV** listsvp, SV **altsvp)
 {
-    dTHR;
-    char flags = *p;
-    bool match = FALSE;
+    SV *sw  = NULL;
+    SV *si  = NULL;
+    SV *alt = NULL;
 
-    c &= 0xFF;
-    if (ANYOF_TEST(p, c))
-       match = TRUE;
-    else if (flags & ANYOF_FOLD) {
-       I32 cf;
-       if (flags & ANYOF_LOCALE) {
-           PL_reg_flags |= RF_tainted;
-           cf = PL_fold_locale[c];
-       }
-       else
-           cf = PL_fold[c];
-       if (ANYOF_TEST(p, cf))
-           match = TRUE;
-    }
+    if (PL_regdata && PL_regdata->count) {
+       U32 n = ARG(node);
 
-    if (!match && (flags & ANYOF_ISA)) {
-       PL_reg_flags |= RF_tainted;
+       if (PL_regdata->what[n] == 's') {
+           SV *rv = (SV*)PL_regdata->data[n];
+           AV *av = (AV*)SvRV((SV*)rv);
+           SV **ary = AvARRAY(av);
+           SV **a, **b;
+       
+           /* See the end of regcomp.c:S_reglass() for
+            * documentation of these array elements. */
 
-       if (((flags & ANYOF_ALNUML)  && isALNUM_LC(c))  ||
-           ((flags & ANYOF_NALNUML) && !isALNUM_LC(c)) ||
-           ((flags & ANYOF_SPACEL)  && isSPACE_LC(c))  ||
-           ((flags & ANYOF_NSPACEL) && !isSPACE_LC(c)))
-       {
-           match = TRUE;
+           si = *ary;
+           a  = SvTYPE(ary[1]) == SVt_RV   ? &ary[1] : 0;
+           b  = SvTYPE(ary[2]) == SVt_PVAV ? &ary[2] : 0;
+
+           if (a)
+               sw = *a;
+           else if (si && doinit) {
+               sw = swash_init("utf8", "", si, 1, 0);
+               (void)av_store(av, 1, sw);
+           }
+           if (b)
+               alt = *b;
        }
     }
+       
+    if (listsvp)
+       *listsvp = si;
+    if (altsvp)
+       *altsvp  = alt;
 
-    return (flags & ANYOF_INVERT) ? !match : match;
+    return sw;
 }
 
+/*
+ - reginclass - determine if a character falls into a character class
+  The n is the ANYOF regnode, the p is the target string, lenp
+  is pointer to the maximum length of how far to go in the p
+  (if the lenp is zero, UTF8SKIP(p) is used),
+  do_utf8 tells whether the target string is in UTF-8.
+
+ */
+
 STATIC bool
-reginclassutf8(regnode *f, U8 *p)
-{                                           
-    dTHR;
-    char flags = ARG1(f);
+S_reginclass(pTHX_ register regnode *n, register U8* p, STRLEN* lenp, register bool do_utf8)
+{
+    char flags = ANYOF_FLAGS(n);
     bool match = FALSE;
-    SV *sv = (SV*)PL_regdata->data[ARG2(f)];
-
-    if (swash_fetch(sv, p))
-       match = TRUE;
-    else if (flags & ANYOF_FOLD) {
-       I32 cf;
-       U8 tmpbuf[10];
-       if (flags & ANYOF_LOCALE) {
-           PL_reg_flags |= RF_tainted;
-           uv_to_utf8(tmpbuf, toLOWER_LC_utf8(p));
+    UV c = *p;
+    STRLEN len = 0;
+    STRLEN plen;
+
+    if (do_utf8 && !UTF8_IS_INVARIANT(c))
+        c = utf8n_to_uvchr(p, UTF8_MAXLEN, &len,
+                           ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY);
+
+    plen = lenp ? *lenp : UNISKIP(NATIVE_TO_UNI(c));
+    if (do_utf8 || (flags & ANYOF_UNICODE)) {
+        if (lenp)
+           *lenp = 0;
+       if (do_utf8 && !ANYOF_RUNTIME(n)) {
+           if (len != (STRLEN)-1 && c < 256 && ANYOF_BITMAP_TEST(n, c))
+               match = TRUE;
        }
-       else
-           uv_to_utf8(tmpbuf, toLOWER_utf8(p));
-       if (swash_fetch(sv, tmpbuf))
+       if (!match && do_utf8 && (flags & ANYOF_UNICODE_ALL) && c >= 256)
            match = TRUE;
-    }
-
-    if (!match && (flags & ANYOF_ISA)) {
-       PL_reg_flags |= RF_tainted;
+       if (!match) {
+           AV *av;
+           SV *sw = regclass_swash(n, TRUE, 0, (SV**)&av);
+       
+           if (sw) {
+               if (swash_fetch(sw, p, do_utf8))
+                   match = TRUE;
+               else if (flags & ANYOF_FOLD) {
+                   if (!match && lenp && av) {
+                       I32 i;
+                     
+                       for (i = 0; i <= av_len(av); i++) {
+                           SV* sv = *av_fetch(av, i, FALSE);
+                           STRLEN len;
+                           char *s = SvPV(sv, len);
+                       
+                           if (len <= plen && memEQ(s, (char*)p, len)) {
+                               *lenp = len;
+                               match = TRUE;
+                               break;
+                           }
+                       }
+                   }
+                   if (!match) {
+                       U8 tmpbuf[UTF8_MAXLEN_FOLD+1];
+                       STRLEN tmplen;
 
-       if (((flags & ANYOF_ALNUML)  && isALNUM_LC_utf8(p))  ||
-           ((flags & ANYOF_NALNUML) && !isALNUM_LC_utf8(p)) ||
-           ((flags & ANYOF_SPACEL)  && isSPACE_LC_utf8(p))  ||
-           ((flags & ANYOF_NSPACEL) && !isSPACE_LC_utf8(p)))
-       {
+                       to_utf8_fold(p, tmpbuf, &tmplen);
+                       if (swash_fetch(sw, tmpbuf, do_utf8))
+                           match = TRUE;
+                   }
+               }
+           }
+       }
+       if (match && lenp && *lenp == 0)
+           *lenp = UNISKIP(NATIVE_TO_UNI(c));
+    }
+    if (!match && c < 256) {
+       if (ANYOF_BITMAP_TEST(n, c))
            match = TRUE;
+       else if (flags & ANYOF_FOLD) {
+           U8 f;
+
+           if (flags & ANYOF_LOCALE) {
+               PL_reg_flags |= RF_tainted;
+               f = PL_fold_locale[c];
+           }
+           else
+               f = PL_fold[c];
+           if (f != c && ANYOF_BITMAP_TEST(n, f))
+               match = TRUE;
+       }
+       
+       if (!match && (flags & ANYOF_CLASS)) {
+           PL_reg_flags |= RF_tainted;
+           if (
+               (ANYOF_CLASS_TEST(n, ANYOF_ALNUM)   &&  isALNUM_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NALNUM)  && !isALNUM_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_SPACE)   &&  isSPACE_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NSPACE)  && !isSPACE_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_DIGIT)   &&  isDIGIT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NDIGIT)  && !isDIGIT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_ALNUMC)  &&  isALNUMC_LC(c)) ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NALNUMC) && !isALNUMC_LC(c)) ||
+               (ANYOF_CLASS_TEST(n, ANYOF_ALPHA)   &&  isALPHA_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NALPHA)  && !isALPHA_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_ASCII)   &&  isASCII(c))     ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NASCII)  && !isASCII(c))     ||
+               (ANYOF_CLASS_TEST(n, ANYOF_CNTRL)   &&  isCNTRL_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NCNTRL)  && !isCNTRL_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_GRAPH)   &&  isGRAPH_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NGRAPH)  && !isGRAPH_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_LOWER)   &&  isLOWER_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NLOWER)  && !isLOWER_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_PRINT)   &&  isPRINT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NPRINT)  && !isPRINT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_PUNCT)   &&  isPUNCT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NPUNCT)  && !isPUNCT_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_UPPER)   &&  isUPPER_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NUPPER)  && !isUPPER_LC(c))  ||
+               (ANYOF_CLASS_TEST(n, ANYOF_XDIGIT)  &&  isXDIGIT(c))    ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NXDIGIT) && !isXDIGIT(c))    ||
+               (ANYOF_CLASS_TEST(n, ANYOF_PSXSPC)  &&  isPSXSPC(c))    ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NPSXSPC) && !isPSXSPC(c))    ||
+               (ANYOF_CLASS_TEST(n, ANYOF_BLANK)   &&  isBLANK(c))     ||
+               (ANYOF_CLASS_TEST(n, ANYOF_NBLANK)  && !isBLANK(c))
+               ) /* How's that for a conditional? */
+           {
+               match = TRUE;
+           }
        }
     }
 
@@ -2747,21 +4489,29 @@ reginclassutf8(regnode *f, U8 *p)
 }
 
 STATIC U8 *
-reghop(U8 *s, I32 off)
-{                               
-    dTHR;
+S_reghop(pTHX_ U8 *s, I32 off)
+{
+    return S_reghop3(aTHX_ s, off, (U8*)(off >= 0 ? PL_regeol : PL_bostr));
+}
+
+STATIC U8 *
+S_reghop3(pTHX_ U8 *s, I32 off, U8* lim)
+{
     if (off >= 0) {
-       while (off-- && s < (U8*)PL_regeol)
+       while (off-- && s < lim) {
+           /* XXX could check well-formedness here */
            s += UTF8SKIP(s);
+       }
     }
     else {
        while (off++) {
-           if (s > (U8*)PL_bostr) {
+           if (s > lim) {
                s--;
-               if (*s & 0x80) {
-                   while (s > (U8*)PL_bostr && (*s & 0xc0) == 0x80)
+               if (UTF8_IS_CONTINUED(*s)) {
+                   while (s > (U8*)lim && UTF8_IS_CONTINUATION(*s))
                        s--;
-               }               /* XXX could check well-formedness here */
+               }
+               /* XXX could check well-formedness here */
            }
        }
     }
@@ -2769,23 +4519,31 @@ reghop(U8 *s, I32 off)
 }
 
 STATIC U8 *
-reghopmaybe(U8* s, I32 off)
+S_reghopmaybe(pTHX_ U8 *s, I32 off)
+{
+    return S_reghopmaybe3(aTHX_ s, off, (U8*)(off >= 0 ? PL_regeol : PL_bostr));
+}
+
+STATIC U8 *
+S_reghopmaybe3(pTHX_ U8* s, I32 off, U8* lim)
 {
-    dTHR;
     if (off >= 0) {
-       while (off-- && s < (U8*)PL_regeol)
+       while (off-- && s < lim) {
+           /* XXX could check well-formedness here */
            s += UTF8SKIP(s);
+       }
        if (off >= 0)
            return 0;
     }
     else {
        while (off++) {
-           if (s > (U8*)PL_bostr) {
+           if (s > lim) {
                s--;
-               if (*s & 0x80) {
-                   while (s > (U8*)PL_bostr && (*s & 0xc0) == 0x80)
+               if (UTF8_IS_CONTINUED(*s)) {
+                   while (s > (U8*)lim && UTF8_IS_CONTINUATION(*s))
                        s--;
-               }               /* XXX could check well-formedness here */
+               }
+               /* XXX could check well-formedness here */
            }
            else
                break;
@@ -2795,3 +4553,77 @@ reghopmaybe(U8* s, I32 off)
     }
     return s;
 }
+
+static void
+restore_pos(pTHX_ void *arg)
+{
+    if (PL_reg_eval_set) {
+       if (PL_reg_oldsaved) {
+           PL_reg_re->subbeg = PL_reg_oldsaved;
+           PL_reg_re->sublen = PL_reg_oldsavedlen;
+#ifdef PERL_COPY_ON_WRITE
+           PL_reg_re->saved_copy = PL_nrs;
+#endif
+           RX_MATCH_COPIED_on(PL_reg_re);
+       }
+       PL_reg_magic->mg_len = PL_reg_oldpos;
+       PL_reg_eval_set = 0;
+       PL_curpm = PL_reg_oldcurpm;
+    }  
+}
+
+STATIC void
+S_to_utf8_substr(pTHX_ register regexp *prog)
+{
+    SV* sv;
+    if (prog->float_substr && !prog->float_utf8) {
+       prog->float_utf8 = sv = NEWSV(117, 0);
+       SvSetSV(sv, prog->float_substr);
+       sv_utf8_upgrade(sv);
+       if (SvTAIL(prog->float_substr))
+           SvTAIL_on(sv);
+       if (prog->float_substr == prog->check_substr)
+           prog->check_utf8 = sv;
+    }
+    if (prog->anchored_substr && !prog->anchored_utf8) {
+       prog->anchored_utf8 = sv = NEWSV(118, 0);
+       SvSetSV(sv, prog->anchored_substr);
+       sv_utf8_upgrade(sv);
+       if (SvTAIL(prog->anchored_substr))
+           SvTAIL_on(sv);
+       if (prog->anchored_substr == prog->check_substr)
+           prog->check_utf8 = sv;
+    }
+}
+
+STATIC void
+S_to_byte_substr(pTHX_ register regexp *prog)
+{
+    SV* sv;
+    if (prog->float_utf8 && !prog->float_substr) {
+       prog->float_substr = sv = NEWSV(117, 0);
+       SvSetSV(sv, prog->float_utf8);
+       if (sv_utf8_downgrade(sv, TRUE)) {
+           if (SvTAIL(prog->float_utf8))
+               SvTAIL_on(sv);
+       } else {
+           SvREFCNT_dec(sv);
+           prog->float_substr = sv = &PL_sv_undef;
+       }
+       if (prog->float_utf8 == prog->check_utf8)
+           prog->check_substr = sv;
+    }
+    if (prog->anchored_utf8 && !prog->anchored_substr) {
+       prog->anchored_substr = sv = NEWSV(118, 0);
+       SvSetSV(sv, prog->anchored_utf8);
+       if (sv_utf8_downgrade(sv, TRUE)) {
+           if (SvTAIL(prog->anchored_utf8))
+               SvTAIL_on(sv);
+       } else {
+           SvREFCNT_dec(sv);
+           prog->anchored_substr = sv = &PL_sv_undef;
+       }
+       if (prog->anchored_utf8 == prog->check_utf8)
+           prog->check_substr = sv;
+    }
+}