|
 |
207f88 |
diff -up webkitgtk-2.0.4/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.0.4/Source/JavaScriptCore/heap/CopiedBlock.h
|
|
|
207f88 |
--- webkitgtk-2.0.4/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align 2014-05-07 11:13:48.249690429 +0200
|
|
|
207f88 |
+++ webkitgtk-2.0.4/Source/JavaScriptCore/heap/CopiedBlock.h 2014-05-07 11:14:02.442872375 +0200
|
|
|
207f88 |
@@ -77,7 +77,7 @@ public:
|
|
|
207f88 |
size_t size();
|
|
|
207f88 |
size_t capacity();
|
|
|
207f88 |
|
|
|
207f88 |
- static const size_t blockSize = 32 * KB;
|
|
|
207f88 |
+ static const size_t blockSize = 64 * KB;
|
|
|
207f88 |
|
|
|
207f88 |
bool hasWorkList();
|
|
|
207f88 |
CopyWorkList& workList();
|
|
|
207f88 |
diff -up webkitgtk-2.0.4/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.0.4/Source/JavaScriptCore/interpreter/JSStack.cpp
|
|
|
207f88 |
--- webkitgtk-2.0.4/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align 2014-05-07 11:14:17.785069040 +0200
|
|
|
207f88 |
+++ webkitgtk-2.0.4/Source/JavaScriptCore/interpreter/JSStack.cpp 2014-05-07 11:15:15.610810268 +0200
|
|
|
207f88 |
@@ -49,7 +49,8 @@ JSStack::JSStack(JSGlobalData& globalDat
|
|
|
207f88 |
{
|
|
|
207f88 |
ASSERT(capacity && isPageAligned(capacity));
|
|
|
207f88 |
|
|
|
207f88 |
- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
|
|
|
207f88 |
+ size_t commitsize = pageSize();
|
|
|
207f88 |
+ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages);
|
|
|
207f88 |
m_end = static_cast<Register*>(m_reservation.base());
|
|
|
207f88 |
m_commitEnd = static_cast<Register*>(m_reservation.base());
|
|
|
207f88 |
|
|
|
207f88 |
@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new
|
|
|
207f88 |
// Compute the chunk size of additional memory to commit, and see if we
|
|
|
207f88 |
// have it is still within our budget. If not, we'll fail to grow and
|
|
|
207f88 |
// return false.
|
|
|
207f88 |
- long delta = roundUpAllocationSize(reinterpret_cast<char*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), commitSize);
|
|
|
207f88 |
+ size_t commitsize = pageSize();
|
|
|
207f88 |
+ long delta = roundUpAllocationSize(reinterpret_cast<char*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), commitsize);
|
|
|
207f88 |
if (reinterpret_cast<char*>(m_commitEnd) + delta > reinterpret_cast<char*>(m_useableEnd))
|
|
|
207f88 |
return false;
|
|
|
207f88 |
|
|
|
207f88 |
@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve()
|
|
|
207f88 |
|
|
|
207f88 |
void JSStack::disableErrorStackReserve()
|
|
|
207f88 |
{
|
|
|
207f88 |
- char* useableEnd = reinterpret_cast<char*>(reservationEnd()) - commitSize;
|
|
|
207f88 |
+ size_t commitsize = pageSize();
|
|
|
207f88 |
+ char* useableEnd = reinterpret_cast<char*>(reservationEnd()) - commitsize;
|
|
|
207f88 |
m_useableEnd = reinterpret_cast<Register*>(useableEnd);
|
|
|
207f88 |
|
|
|
207f88 |
// By the time we get here, we are guaranteed to be destructing the last
|