Changeset 49365 in webkit for trunk/JavaScriptCore/runtime/RegExpConstructor.h

Timestamp:

Oct 8, 2009, 8:22:41 PM (16 years ago)

Author:

[email protected]

Message:

At long last, I pronounce the death of AllInOneFile.cpp.

Patch by Geoffrey Garen <​[email protected]> on 2009-10-08
Reviewed by Maciej Stachowiak.

SunSpider reports a 1.01x speedup.

• AllInOneFile.cpp: Removed.
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.xcodeproj/project.pbxproj: Added missing project files

to compilation stages.

• parser/Grammar.y:
• parser/Lexer.cpp:
• parser/Lexer.h:

(JSC::jscyylex):

• runtime/ArrayConstructor.cpp:

(JSC::constructArrayWithSizeQuirk):

• runtime/Collector.h:
• runtime/JSCell.cpp:

(JSC::JSCell::operator new):

• runtime/JSCell.h:

(JSC::JSCell::operator new):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::operator new):

• runtime/JSNumberCell.h:

(JSC::JSNumberCell::operator new):

• runtime/JSString.cpp:
• runtime/JSString.h:

(JSC::jsString):
(JSC::jsSubstring):
(JSC::jsOwnedString):

• runtime/RegExpConstructor.cpp:
• runtime/RegExpConstructor.h:

(JSC::RegExpConstructorPrivate::RegExpConstructorPrivate):
(JSC::RegExpConstructorPrivate::lastOvector):
(JSC::RegExpConstructorPrivate::tempOvector):
(JSC::RegExpConstructorPrivate::changeLastOvector):
(JSC::RegExpConstructor::performMatch):

• runtime/StringPrototype.cpp:

(JSC::stringProtoFuncMatch):

• yarr/RegexJIT.cpp:
• yarr/RegexJIT.h:

(JSC::Yarr::executeRegex): Inlined a few things that Shark said
were hot, on the presumption that AllInOneFile.cpp used to inline them
automatically.

File:

• trunk/JavaScriptCore/runtime/RegExpConstructor.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/RegExpConstructor.h

@@ -23 +23 @@
 
 #include "InternalFunction.h"
+#include "RegExp.h"
 #include <wtf/OwnPtr.h>
 
@@ -30 +31 @@
     class RegExpPrototype;
     struct RegExpConstructorPrivate;
+
+    struct RegExpConstructorPrivate : FastAllocBase {
+        // Global search cache / settings
+        RegExpConstructorPrivate()
+            : lastNumSubPatterns(0)
+            , multiline(false)
+            , lastOvectorIndex(0)
+        {
+        }
+
+        const Vector<int, 32>& lastOvector() const { return ovector[lastOvectorIndex]; }
+        Vector<int, 32>& lastOvector() { return ovector[lastOvectorIndex]; }
+        Vector<int, 32>& tempOvector() { return ovector[lastOvectorIndex ? 0 : 1]; }
+        void changeLastOvector() { lastOvectorIndex = lastOvectorIndex ? 0 : 1; }
+
+        UString input;
+        UString lastInput;
+        Vector<int, 32> ovector[2];
+        unsigned lastNumSubPatterns : 30;
+        bool multiline : 1;
+        unsigned lastOvectorIndex : 1;
+    };
 
     class RegExpConstructor : public InternalFunction {
@@ -79 +102 @@
     }
 
+    /* 
+      To facilitate result caching, exec(), test(), match(), search(), and replace() dipatch regular
+      expression matching through the performMatch function. We use cached results to calculate, 
+      e.g., RegExp.lastMatch and RegExp.leftParen.
+    */
+    inline void RegExpConstructor::performMatch(RegExp* r, const UString& s, int startOffset, int& position, int& length, int** ovector)
+    {
+        position = r->match(s, startOffset, &d->tempOvector());
+
+        if (ovector)
+            *ovector = d->tempOvector().data();
+
+        if (position != -1) {
+            ASSERT(!d->tempOvector().isEmpty());
+
+            length = d->tempOvector()[1] - d->tempOvector()[0];
+
+            d->input = s;
+            d->lastInput = s;
+            d->changeLastOvector();
+            d->lastNumSubPatterns = r->numSubpatterns();
+        }
+    }
+
 } // namespace JSC