|
|
cd3a617 |
diff -up webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h.page_size_align webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h
|
|
|
cd3a617 |
--- webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h.page_size_align 2015-03-23 09:08:04.000000000 +0100
|
|
|
cd3a617 |
+++ webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h 2015-04-08 12:02:51.218138924 +0200
|
|
|
cd3a617 |
@@ -79,7 +79,7 @@ public:
|
|
|
cd3a617 |
size_t size();
|
|
|
cd3a617 |
size_t capacity();
|
|
|
cd3a617 |
|
|
|
cd3a617 |
- static const size_t blockSize = 32 * KB;
|
|
|
cd3a617 |
+ static const size_t blockSize = 64 * KB;
|
|
|
cd3a617 |
|
|
|
cd3a617 |
bool hasWorkList();
|
|
|
cd3a617 |
CopyWorkList& workList();
|
|
|
cd3a617 |
diff -up webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp.page_size_align webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp
|
|
|
cd3a617 |
--- webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp.page_size_align 2015-04-08 12:02:51.218138924 +0200
|
|
|
cd3a617 |
+++ webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp 2015-04-08 12:04:48.158143620 +0200
|
|
|
cd3a617 |
@@ -58,7 +58,8 @@ JSStack::JSStack(VM& vm)
|
|
|
cd3a617 |
size_t capacity = Options::maxPerThreadStackUsage();
|
|
|
cd3a617 |
ASSERT(capacity && isPageAligned(capacity));
|
|
|
cd3a617 |
|
|
|
cd3a617 |
- m_reservation = PageReservation::reserve(WTF::roundUpToMultipleOf(commitSize, capacity), OSAllocator::JSVMStackPages);
|
|
|
cd3a617 |
+ size_t commitsize = pageSize();
|
|
|
cd3a617 |
+ m_reservation = PageReservation::reserve(WTF::roundUpToMultipleOf(commitsize, capacity), OSAllocator::JSVMStackPages);
|
|
|
cd3a617 |
setStackLimit(highAddress());
|
|
|
cd3a617 |
m_commitTop = highAddress();
|
|
|
cd3a617 |
|
|
|
cd3a617 |
@@ -92,7 +93,8 @@ bool JSStack::growSlowCase(Register* new
|
|
|
cd3a617 |
// have it is still within our budget. If not, we'll fail to grow and
|
|
|
cd3a617 |
// return false.
|
|
|
cd3a617 |
ptrdiff_t delta = reinterpret_cast<char*>(m_commitTop) - reinterpret_cast<char*>(newTopOfStackWithReservedZone);
|
|
|
cd3a617 |
- delta = WTF::roundUpToMultipleOf(commitSize, delta);
|
|
|
cd3a617 |
+ size_t commitsize = pageSize();
|
|
|
cd3a617 |
+ delta = WTF::roundUpToMultipleOf(commitsize, delta);
|
|
|
cd3a617 |
Register* newCommitTop = m_commitTop - (delta / sizeof(Register));
|
|
|
cd3a617 |
if (newCommitTop < reservationTop())
|
|
|
cd3a617 |
return false;
|