Changeset 72197 in webkit for trunk/JavaScriptCore/yarr/RegexJIT.h

Timestamp:

Nov 17, 2010, 5:15:56 AM (15 years ago)

Author:

Csaba Osztrogonác

Message:

YARR JIT should fallback to YARR Interpreter instead of PCRE.
​https://bugs.webkit.org/show_bug.cgi?id=46719

Patch by Peter Varga <​[email protected]> on 2010-11-17
Reviewed by Gavin Barraclough.

Remove the ENABLE_YARR macro and the option of matching regular
expressions with PCRE from JavaScriptCore.

JavaScriptCore:

• runtime/JSGlobalData.h:
• runtime/RegExp.cpp:

(JSC::RegExp::compile):
(JSC::RegExp::match):

• tests/mozilla/expected.html:
• wtf/Platform.h:
• yarr/RegexCompiler.cpp:
• yarr/RegexCompiler.h:
• yarr/RegexInterpreter.cpp:

(JSC::Yarr::byteCompileRegex):

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

(JSC::Yarr::jitCompileRegex):

• yarr/RegexJIT.h:

(JSC::Yarr::RegexCodeBlock::RegexCodeBlock):
(JSC::Yarr::RegexCodeBlock::~RegexCodeBlock):
(JSC::Yarr::RegexCodeBlock::getFallback):
(JSC::Yarr::RegexCodeBlock::isFallback):
(JSC::Yarr::RegexCodeBlock::setFallback):
(JSC::Yarr::executeRegex):

• yarr/RegexParser.h:
• yarr/RegexPattern.h:

LayoutTests:

• fast/js/regexp-look-ahead-empty-expected.txt:
• fast/js/regexp-overflow-expected.txt:
• fast/js/script-tests/regexp-overflow.js:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.5_Term/S15.10.2.5_A1_T4-expected.txt:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.2/15.10.2.8_Atom/S15.10.2.8_A2_T1-expected.txt:
• fast/js/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/15.10.6.2_RegExp.prototype.exec/S15.10.6.2_A1_T6-expected.txt:

File:

• trunk/JavaScriptCore/yarr/RegexJIT.h (modified) (5 diffs)

trunk/JavaScriptCore/yarr/RegexJIT.h

@@ -30 +30 @@
 
 #include "MacroAssembler.h"
+#include "RegexInterpreter.h" // temporary, remove when fallback is removed.
 #include "RegexPattern.h"
 #include "UString.h"
-
-#include "pcre.h"
-struct JSRegExp; // temporary, remove when fallback is removed.
 
 #if CPU(X86) && !COMPILER(MSVC)
@@ -54 +52 @@
 public:
     RegexCodeBlock()
-        : m_fallback(0)
+        : m_needFallback(false)
     {
     }
@@ -60 +58 @@
     ~RegexCodeBlock()
     {
-        if (m_fallback)
-            jsRegExpFree(m_fallback);
     }
 
-    JSRegExp* getFallback() { return m_fallback; }
-    void setFallback(JSRegExp* fallback) { m_fallback = fallback; }
+    BytecodePattern* getFallback() { return m_fallback.get(); }
+    bool isFallback() { return m_needFallback; }
+    void setFallback(PassOwnPtr<BytecodePattern> fallback)
+    {
+        m_fallback = fallback;
+        m_needFallback = true;
+    }
 
     bool operator!() { return (!m_ref.m_code.executableAddress() && !m_fallback); }
@@ -74 +75 @@
         return reinterpret_cast<RegexJITCode>(m_ref.m_code.executableAddress())(input, start, length, output);
     }
-    
+
 #if ENABLE(REGEXP_TRACING)
     void *getAddr() { return m_ref.m_code.executableAddress(); }
@@ -81 +82 @@
 private:
     MacroAssembler::CodeRef m_ref;
-    JSRegExp* m_fallback;
+    OwnPtr<Yarr::BytecodePattern> m_fallback;
+    bool m_needFallback;
 };
 
-void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& pattern, unsigned& numSubpatterns, const char*& error, bool ignoreCase = false, bool multiline = false);
+void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& pattern, unsigned& numSubpatterns, const char*& error, BumpPointerAllocator* allocator, bool ignoreCase = false, bool multiline = false);
 
-inline int executeRegex(RegexCodeBlock& jitObject, const UChar* input, unsigned start, unsigned length, int* output, int outputArraySize)
+inline int executeRegex(RegexCodeBlock& jitObject, const UChar* input, unsigned start, unsigned length, int* output)
 {
-    if (JSRegExp* fallback = jitObject.getFallback())
-        return (jsRegExpExecute(fallback, input, length, start, output, outputArraySize) < 0) ? -1 : output[0];
+    if (jitObject.isFallback())
+        return (interpretRegex(jitObject.getFallback(), input, start, length, output));
 
     return jitObject.execute(input, start, length, output);