Changeset 73124 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Dec 2, 2010, 5:36:45 AM (14 years ago)

Author:

[email protected]

Message:

2010-12-02 Peter Varga <​[email protected]>

Reviewed by Gavin Barraclough.

Move regex parsing and fallback handling to runtime/RegExp.cpp
​https://bugs.webkit.org/show_bug.cgi?id=50015

• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create): (JSC::RegExp::compile): (JSC::RegExp::match): (JSC::RegExp::printTraceData):
• runtime/RegExp.h: (JSC::RegExp::pattern):
• yarr/RegexInterpreter.cpp:
• yarr/RegexInterpreter.h:
• yarr/RegexJIT.cpp: (JSC::Yarr::RegexGenerator::compile): (JSC::Yarr::jitCompileRegex):
• yarr/RegexJIT.h: (JSC::Yarr::RegexCodeBlock::RegexCodeBlock): (JSC::Yarr::RegexCodeBlock::setFallBack): (JSC::Yarr::RegexCodeBlock::isFallBack): (JSC::Yarr::executeRegex):

Location:

trunk/JavaScriptCore/runtime

Files:

• RegExp.cpp (modified) (9 diffs)
• RegExp.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -3 +3 @@
  *  Copyright (c) 2007, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2009 Torch Mobile, Inc.
+ *  Copyright (C) 2010 Peter Varga ([email protected]), University of Szeged
  *
  *  This library is free software; you can redistribute it and/or
@@ -30 +31 @@
 
 #include "yarr/RegexCompiler.h"
-#if ENABLE(YARR_JIT)
 #include "yarr/RegexJIT.h"
-#else
 #include "yarr/RegexInterpreter.h"
-#endif
+#include "yarr/RegexPattern.h"
 
 namespace JSC {
@@ -41 +40 @@
 #if ENABLE(YARR_JIT)
     Yarr::RegexCodeBlock m_regExpJITCode;
-#else
+#endif
     OwnPtr<Yarr::BytecodePattern> m_regExpBytecode;
-#endif
 };
 
-inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
-    : m_pattern(pattern)
+inline RegExp::RegExp(JSGlobalData* globalData, const UString& patternString, const UString& flags)
+    : m_patternString(patternString)
     , m_flagBits(0)
     , m_constructionError(0)
@@ -67 +65 @@
             m_flagBits |= Multiline;
     }
-    compile(globalData);
+
+    m_state = compile(globalData);
 }
 
@@ -74 +73 @@
 }
 
-PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)
+PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& patternString, const UString& flags)
 {
-    RefPtr<RegExp> res = adoptRef(new RegExp(globalData, pattern, flags));
+    RefPtr<RegExp> res = adoptRef(new RegExp(globalData, patternString, flags));
 #if ENABLE(REGEXP_TRACING)
     globalData->addRegExpToTrace(res);
@@ -83 +82 @@
 }
 
-void RegExp::compile(JSGlobalData* globalData)
+RegExp::RegExpState RegExp::compile(JSGlobalData* globalData)
 {
+    Yarr::RegexPattern pattern(ignoreCase(), multiline());
+
+    if ((m_constructionError = Yarr::compileRegex(m_patternString, pattern)))
+        return ParseError;
+
+    m_numSubpatterns = pattern.m_numSubpatterns;
+
 #if ENABLE(YARR_JIT)
-    Yarr::jitCompileRegex(globalData, m_representation->m_regExpJITCode, m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
-#else
-    m_representation->m_regExpBytecode = Yarr::byteCompileRegex(m_pattern, m_numSubpatterns, m_constructionError, &globalData->m_regexAllocator, ignoreCase(), multiline());
+    if (!pattern.m_containsBackreferences && globalData->canUseJIT()) {
+        Yarr::jitCompileRegex(pattern, globalData, m_representation->m_regExpJITCode);
+        if (!m_representation->m_regExpJITCode.isFallBack())
+            return JITCode;
+    }
 #endif
+
+    m_representation->m_regExpBytecode = Yarr::byteCompileRegex(pattern, &globalData->m_regexAllocator);
+    return ByteCode;
 }
 
@@ -104 +115 @@
         return -1;
 
-#if ENABLE(YARR_JIT)
-    if (!!m_representation->m_regExpJITCode) {
-#else
-    if (m_representation->m_regExpBytecode) {
-#endif
+    if (m_state != ParseError) {
         int offsetVectorSize = (m_numSubpatterns + 1) * 2;
         int* offsetVector;
@@ -127 +134 @@
             offsetVector[j] = -1;
 
+        int result;
 #if ENABLE(YARR_JIT)
-        int result = Yarr::executeRegex(m_representation->m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector);
-#else
-        int result = Yarr::interpretRegex(m_representation->m_regExpBytecode.get(), s.characters(), startOffset, s.length(), offsetVector);
+        if (m_state == JITCode)
+            result = Yarr::executeRegex(m_representation->m_regExpJITCode, s.characters(), startOffset, s.length(), offsetVector);
+        else
 #endif
+            result = Yarr::interpretRegex(m_representation->m_regExpBytecode.get(), s.characters(), startOffset, s.length(), offsetVector);
 
         ASSERT(result >= -1);;
@@ -163 +172 @@
 
         char jitAddr[20];
-        if (codeBlock.getFallback())
+        if (m_state == JITCode)
             sprintf(jitAddr, "fallback");
         else

trunk/JavaScriptCore/runtime/RegExp.h

@@ -42 +42 @@
         bool multiline() const { return m_flagBits & Multiline; }
 
-        const UString& pattern() const { return m_pattern; }
+        const UString& pattern() const { return m_patternString; }
 
         bool isValid() const { return !m_constructionError; }
@@ -57 +57 @@
         RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
 
-        void compile(JSGlobalData*);
+        enum RegExpState {
+            ParseError,
+            JITCode,
+            ByteCode
+        } m_state;
+
+        RegExpState compile(JSGlobalData*);
 
         enum FlagBits { Global = 1, IgnoreCase = 2, Multiline = 4 };
-
-        UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
+        UString m_patternString;
         int m_flagBits;
         const char* m_constructionError;