Changeset 39083 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Dec 7, 2008, 3:55:04 PM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/6309878> Need more granular control over allocation of executable memory (21783)
<​https://bugs.webkit.org/show_bug.cgi?id=21783>

Reviewed by Cameron Zwarich and Sam Weinig

Add a new allocator for use by the JIT that provides executable pages, so
we can get rid of the current hack that makes the entire heap executable.

1-2% progression on SunSpider-v8, 1% on SunSpider. Reduces memory usage as well!

Location:

trunk/JavaScriptCore/runtime

Files:

• JSGlobalData.h (modified) (2 diffs)
• RegExp.cpp (modified) (6 diffs)
• RegExp.h (modified) (4 diffs)
• RegExpConstructor.cpp (modified) (1 diff)
• RegExpPrototype.cpp (modified) (1 diff)
• StringPrototype.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -34 +34 @@
 #include <wtf/RefCounted.h>
 #include "Collector.h"
+#include "ExecutableAllocator.h"
 #include "SmallStrings.h"
 
@@ -121 +122 @@
         Heap heap;
 
+        PassRefPtr<ExecutablePool> poolForSize(size_t n) { return m_executableAllocator.poolForSize(n); }
     private:
         JSGlobalData(bool isShared = false);
+        ExecutableAllocator m_executableAllocator;
 
         static JSGlobalData*& sharedInstanceInternal();

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -38 +38 @@
 #endif
 
-inline RegExp::RegExp(const UString& pattern)
+inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern)
     : m_pattern(pattern)
     , m_flagBits(0)
@@ -46 +46 @@
 {
 #if ENABLE(WREC)
-    m_wrecFunction = Generator::compileRegExp(pattern, &m_numSubpatterns, &m_constructionError);
+    m_wrecFunction = Generator::compileRegExp(globalData, pattern, &m_numSubpatterns, &m_constructionError, m_executablePool);
     if (m_wrecFunction)
         return;
@@ -55 +55 @@
 }
 
-PassRefPtr<RegExp> RegExp::create(const UString& pattern)
+PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern)
 {
-    return adoptRef(new RegExp(pattern));
+    return adoptRef(new RegExp(globalData, pattern));
 }
 
-inline RegExp::RegExp(const UString& pattern, const UString& flags)
+inline RegExp::RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags)
     : m_pattern(pattern)
     , m_flags(flags)
@@ -87 +87 @@
 
 #if ENABLE(WREC)
-    m_wrecFunction = Generator::compileRegExp(pattern, &m_numSubpatterns, &m_constructionError, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
+    m_wrecFunction = Generator::compileRegExp(globalData, pattern, &m_numSubpatterns, &m_constructionError, m_executablePool, (m_flagBits & IgnoreCase), (m_flagBits & Multiline));
     if (m_wrecFunction)
         return;
@@ -96 +96 @@
 }
 
-PassRefPtr<RegExp> RegExp::create(const UString& pattern, const UString& flags)
+PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)
 {
-    return adoptRef(new RegExp(pattern, flags));
+    return adoptRef(new RegExp(globalData, pattern, flags));
 }
 
@@ -104 +104 @@
 {
     jsRegExpFree(m_regExp);
-#if ENABLE(WREC)
-    if (m_wrecFunction)
-        WTF::fastFreeExecutable(reinterpret_cast<void*>(m_wrecFunction));
-#endif
 }
 

trunk/JavaScriptCore/runtime/RegExp.h

@@ -24 +24 @@
 #include "UString.h"
 #include "WREC.h"
+#include "ExecutableAllocator.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
@@ -35 +36 @@
     class RegExp : public RefCounted<RegExp> {
     public:
-        static PassRefPtr<RegExp> create(const UString& pattern);
-        static PassRefPtr<RegExp> create(const UString& pattern, const UString& flags);
+        static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern);
+        static PassRefPtr<RegExp> create(JSGlobalData* globalData, const UString& pattern, const UString& flags);
         ~RegExp();
 
@@ -53 +54 @@
 
     private:
-        RegExp(const UString& pattern);
-        RegExp(const UString& pattern, const UString& flags);
+        RegExp(JSGlobalData* globalData, const UString& pattern);
+        RegExp(JSGlobalData* globalData, const UString& pattern, const UString& flags);
 
         void compile();
@@ -69 +70 @@
 #if ENABLE(WREC)
         WREC::CompiledRegExp m_wrecFunction;
+        RefPtr<ExecutablePool> m_executablePool;
 #endif
     };

trunk/JavaScriptCore/runtime/RegExpConstructor.cpp

@@ -332 +332 @@
     UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
 
-    RefPtr<RegExp> regExp = RegExp::create(pattern, flags);
+    RefPtr<RegExp> regExp = RegExp::create(&exec->globalData(), 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(pattern, flags);
+        regExp = RegExp::create(&exec->globalData(), pattern, flags);
     }
 

trunk/JavaScriptCore/runtime/StringPrototype.cpp

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