Changeset 38975 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Dec 3, 2008, 4:10:53 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-03 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Remove shared AssemblerBuffer 1MB buffer and instead give AssemblerBuffer
an 256 byte inline capacity.

1% progression on Sunspider.

• assembler/AssemblerBuffer.h: (JSC::AssemblerBuffer::AssemblerBuffer): (JSC::AssemblerBuffer::~AssemblerBuffer): (JSC::AssemblerBuffer::grow):
• assembler/MacroAssembler.h: (JSC::MacroAssembler::MacroAssembler):
• assembler/X86Assembler.h: (JSC::X86Assembler::X86Assembler):
• interpreter/Interpreter.cpp: (JSC::Interpreter::Interpreter):
• interpreter/Interpreter.h:
• jit/JIT.cpp: (JSC::JIT::JIT):
• parser/Nodes.cpp: (JSC::RegExpNode::emitBytecode):
• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create):
• runtime/RegExp.h:
• runtime/RegExpConstructor.cpp: (JSC::constructRegExp):
• runtime/RegExpPrototype.cpp: (JSC::regExpProtoFuncCompile):
• runtime/StringPrototype.cpp: (JSC::stringProtoFuncMatch): (JSC::stringProtoFuncSearch):
• wrec/WREC.cpp: (JSC::WREC::Generator::compileRegExp):
• wrec/WRECGenerator.h: (JSC::WREC::Generator::Generator):
• wrec/WRECParser.h: (JSC::WREC::Parser::Parser):

Location:

trunk/JavaScriptCore/runtime

Files:

• RegExp.cpp (modified) (5 diffs)
• RegExp.h (modified) (2 diffs)
• RegExpConstructor.cpp (modified) (1 diff)
• RegExpPrototype.cpp (modified) (1 diff)
• StringPrototype.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -38 +38 @@
 #endif
 
-inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
+inline RegExp::RegExp(const UString& pattern)
     : m_pattern(pattern)
     , m_flagBits(0)
@@ -46 +46 @@
 {
 #if ENABLE(WREC)
-    m_wrecFunction = Generator::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError);
+    m_wrecFunction = Generator::compileRegExp(pattern, &m_numSubpatterns, &m_constructionError);
     if (m_wrecFunction)
         return;
     // Fall through to non-WREC case.
-#else
-    UNUSED_PARAM(globalData);
 #endif
     m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(pattern.data()), pattern.size(),
@@ -57 +55 @@
 }
 
-PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern)
+PassRefPtr<RegExp> RegExp::create(const UString& pattern)
 {
-    return adoptRef(new RegExp(globalData, pattern));
+    return adoptRef(new RegExp(pattern));
 }
 
-inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
+inline RegExp::RegExp(const UString& pattern, const UString& flags)
     : m_pattern(pattern)
     , m_flags(flags)
@@ -89 +87 @@
 
 #if ENABLE(WREC)
-    m_wrecFunction = Generator::compileRegExp(globalData->interpreter, pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
+    m_wrecFunction = Generator::compileRegExp(pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
     if (m_wrecFunction)
         return;
     // Fall through to non-WREC case.
-#else
-    UNUSED_PARAM(globalData);
 #endif
     m_regExp = jsRegExpCompile(reinterpret_cast<const UChar*>(pattern.data()), pattern.size(),
@@ -100 +96 @@
 }
 
-PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)
+PassRefPtr<RegExp> RegExp::create(const UString& pattern, const UString& flags)
 {
-    return adoptRef(new RegExp(globalData, pattern, flags));
+    return adoptRef(new RegExp(pattern, flags));
 }
 

trunk/JavaScriptCore/runtime/RegExp.h

@@ -35 +35 @@
     class RegExp : public RefCounted<RegExp> {
     public:
-        static PassRefPtr<RegExp> create(JSGlobalData*, const UString& pattern);
-        static PassRefPtr<RegExp> create(JSGlobalData*, const UString& pattern, const UString& flags);
+        static PassRefPtr<RegExp> create(const UString& pattern);
+        static PassRefPtr<RegExp> create(const UString& pattern, const UString& flags);
         ~RegExp();
 
@@ -53 +53 @@
 
     private:
-        RegExp(JSGlobalData*, const UString& pattern);
-        RegExp(JSGlobalData*, const UString& pattern, const UString& flags);
+        RegExp(const UString& pattern);
+        RegExp(const UString& pattern, const UString& flags);
 
         void compile();

trunk/JavaScriptCore/runtime/RegExpConstructor.cpp

@@ -332 +332 @@
     UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
 
-    RefPtr<RegExp> regExp = RegExp::create(&exec->globalData(), pattern, flags);
+    RefPtr<RegExp> regExp = RegExp::create(pattern, flags);
     if (!regExp->isValid())
         return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));

trunk/JavaScriptCore/runtime/RegExpPrototype.cpp

@@ -86 +86 @@
         UString pattern = args.isEmpty() ? UString("") : arg0->toString(exec);
         UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
-        regExp = RegExp::create(&exec->globalData(), pattern, flags);
+        regExp = RegExp::create(pattern, flags);
     }
 

trunk/JavaScriptCore/runtime/StringPrototype.cpp

@@ -413 +413 @@
          *  replaced with the result of the expression new RegExp(regexp).
          */
-        reg = RegExp::create(&exec->globalData(), a0->toString(exec));
+        reg = RegExp::create(a0->toString(exec));
     }
     RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();
@@ -463 +463 @@
          *  replaced with the result of the expression new RegExp(regexp).
          */
-        reg = RegExp::create(&exec->globalData(), a0->toString(exec));
+        reg = RegExp::create(a0->toString(exec));
     }
     RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();