3d95990410
- Fixes MFSA 2012-12->19 - see http://www.mozilla.org/en-US/firefox/11.0/releasenotes/ - complete patchset for #691898, still fixes build on ppc (and hopefully commited in firefox 14...) - add patchset from #706955, workarounds #669050 (xpcshell hangs during make install and chokes on CSPUtils.csm, threads related..) - remove obsolete/commited patches
54 lines
1.6 KiB
Plaintext
54 lines
1.6 KiB
Plaintext
$OpenBSD: patch-js_src_jscntxt_cpp,v 1.1 2012/03/16 21:31:24 landry Exp $
|
|
https://bug691898.bugzilla.mozilla.org/attachment.cgi?id=588391
|
|
use yarr interpreter on ppc
|
|
--- js/src/jscntxt.cpp.orig Sun Mar 11 20:39:26 2012
|
|
+++ js/src/jscntxt.cpp Sun Mar 11 20:41:36 2012
|
|
@@ -106,7 +106,9 @@ ThreadData::ThreadData(JSRuntime *rt)
|
|
#endif
|
|
waiveGCQuota(false),
|
|
tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
|
|
+#if ENABLE_ASSEMBLER
|
|
execAlloc(NULL),
|
|
+#endif
|
|
bumpAlloc(NULL),
|
|
repCache(NULL),
|
|
dtoaState(NULL),
|
|
@@ -123,7 +125,9 @@ ThreadData::~ThreadData()
|
|
{
|
|
JS_ASSERT(!repCache);
|
|
|
|
+#if ENABLE_ASSEMBLER
|
|
rt->delete_<JSC::ExecutableAllocator>(execAlloc);
|
|
+#endif
|
|
rt->delete_<WTF::BumpPointerAllocator>(bumpAlloc);
|
|
|
|
if (dtoaState)
|
|
@@ -157,9 +161,11 @@ ThreadData::sizeOfExcludingThis(JSMallocSizeOfFun mall
|
|
*temporary = tempLifoAlloc.sizeOfExcludingThis(mallocSizeOf);
|
|
|
|
size_t method = 0, regexp = 0, unused = 0;
|
|
+#if ENABLE_ASSEMBLER
|
|
if (execAlloc)
|
|
execAlloc->sizeOfCode(&method, ®exp, &unused);
|
|
JS_ASSERT(method == 0); /* this execAlloc is only used for regexp code */
|
|
+#endif
|
|
*regexpCode = regexp + unused;
|
|
|
|
*stackCommitted = stackSpace.sizeOfCommitted();
|
|
@@ -188,6 +194,7 @@ ThreadData::triggerOperationCallback(JSRuntime *rt)
|
|
#endif
|
|
}
|
|
|
|
+#if ENABLE_ASSEMBLER
|
|
JSC::ExecutableAllocator *
|
|
ThreadData::createExecutableAllocator(JSContext *cx)
|
|
{
|
|
@@ -199,6 +206,7 @@ ThreadData::createExecutableAllocator(JSContext *cx)
|
|
js_ReportOutOfMemory(cx);
|
|
return execAlloc;
|
|
}
|
|
+#endif
|
|
|
|
WTF::BumpPointerAllocator *
|
|
ThreadData::createBumpPointerAllocator(JSContext *cx)
|