From: Mike Hommey Date: Sat, 24 Dec 2011 09:56:58 +0100 Subject: Bug 691898 - Use YARR interpreter instead of PCRE on platforms where YARR JIT is not supported --- js/src/Makefile.in | 21 +++++++++++++-------- js/src/jscntxt.cpp | 8 ++++++++ js/src/jscntxt.h | 6 ++++++ js/src/vm/RegExpObject-inl.h | 28 ++++++---------------------- js/src/vm/RegExpObject.cpp | 37 ------------------------------------- js/src/vm/RegExpObject.h | 33 +++++++-------------------------- js/src/yarr/wtfbridge.h | 2 -- 7 files changed, 40 insertions(+), 95 deletions(-) diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in index 06ba7ca..46c32e6 100644 --- a/mozilla/js/src/Makefile.in +++ b/mozilla/js/src/Makefile.in @@ -361,15 +361,20 @@ CPPSRCS += checks.cc \ ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) -VPATH += $(srcdir)/yarr/pcre \ +VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ + $(srcdir)/yarr \ $(NULL) CPPSRCS += \ - pcre_compile.cpp \ - pcre_exec.cpp \ - pcre_tables.cpp \ - pcre_xclass.cpp \ - pcre_ucp_searchfuncs.cpp \ + Assertions.cpp \ + OSAllocatorOS2.cpp \ + OSAllocatorPosix.cpp \ + OSAllocatorWin.cpp \ + PageBlock.cpp \ + YarrInterpreter.cpp \ + YarrPattern.cpp \ + YarrSyntaxChecker.cpp \ $(NULL) else @@ -921,10 +926,10 @@ endif # Needed to "configure" it correctly. Unfortunately these # flags wind up being applied to all code in js/src, not just # the code in js/src/assembler. -CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 +CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_METHODJIT)) -CXXFLAGS += -DENABLE_JIT=1 +CXXFLAGS += -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1 endif INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr diff --git a/mozilla/js/src/jscntxt.cpp b/mozilla/js/src/jscntxt.cpp index cc10655..65483d6 100644 --- a/mozilla/js/src/jscntxt.cpp +++ b/mozilla/js/src/jscntxt.cpp @@ -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_(execAlloc); +#endif rt->delete_(bumpAlloc); if (dtoaState) @@ -157,9 +161,11 @@ ThreadData::sizeOfExcludingThis(JSMallocSizeOfFun mallocSizeOf, size_t *normal, *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) diff --git a/mozilla/js/src/jscntxt.h b/mozilla/js/src/jscntxt.h index a71d6b2..1702c65 100644 --- a/mozilla/js/src/jscntxt.h +++ b/mozilla/js/src/jscntxt.h @@ -153,21 +153,27 @@ struct ThreadData { * Both of these allocators are used for regular expression code which is shared at the * thread-data level. */ +#if ENABLE_ASSEMBLER JSC::ExecutableAllocator *execAlloc; +#endif WTF::BumpPointerAllocator *bumpAlloc; js::RegExpPrivateCache *repCache; +#if ENABLE_ASSEMBLER JSC::ExecutableAllocator *createExecutableAllocator(JSContext *cx); +#endif WTF::BumpPointerAllocator *createBumpPointerAllocator(JSContext *cx); js::RegExpPrivateCache *createRegExpPrivateCache(JSContext *cx); public: +#if ENABLE_ASSEMBLER JSC::ExecutableAllocator *getOrCreateExecutableAllocator(JSContext *cx) { if (execAlloc) return execAlloc; return createExecutableAllocator(cx); } +#endif WTF::BumpPointerAllocator *getOrCreateBumpPointerAllocator(JSContext *cx) { if (bumpAlloc) diff --git a/mozilla/js/src/vm/RegExpObject-inl.h b/mozilla/js/src/vm/RegExpObject-inl.h index 6e7ffef..b7a4320 100644 --- a/mozilla/js/src/vm/RegExpObject-inl.h +++ b/mozilla/js/src/vm/RegExpObject-inl.h @@ -367,6 +367,7 @@ detail::RegExpPrivate::create(JSContext *cx, JSLinearString *source, RegExpFlag return RetType(priv); } +#if ENABLE_YARR_JIT /* This function should be deleted once bad Android platforms phase out. See bug 604774. */ inline bool detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) @@ -377,12 +378,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) return true; #endif } +#endif inline bool detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount, RegExpFlag flags) { -#if ENABLE_YARR_JIT /* Parse the pattern. */ ErrorCode yarrError; YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag), @@ -399,7 +400,7 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, Token * case we have to bytecode compile it. */ -#ifdef JS_METHODJIT +#if ENABLE_YARR_JIT && defined(JS_METHODJIT) if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) { JSC::ExecutableAllocator *execAlloc = cx->threadData()->getOrCreateExecutableAllocator(cx); if (!execAlloc) { @@ -420,21 +421,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, Token return false; } +#if ENABLE_YARR_JIT codeBlock.setFallBack(true); +#endif byteCode = byteCompile(yarrPattern, bumpAlloc).get(); return true; -#else /* !defined(ENABLE_YARR_JIT) */ - int error = 0; - compiled = jsRegExpCompile(pattern.chars(), pattern.length(), - ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase, - multiline() ? JSRegExpMultiline : JSRegExpSingleLine, - parenCount, &error); - if (error) { - reportPCREError(cx, error); - return false; - } - return true; -#endif } inline bool @@ -476,19 +467,12 @@ detail::RegExpPrivateCode::execute(JSContext *cx, const jschar *chars, size_t le else result = JSC::Yarr::execute(codeBlock, chars, start, length, output); #else - result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount); + result = JSC::Yarr::interpret(byteCode, chars, start, length, output); #endif if (result == -1) return RegExpRunStatus_Success_NotFound; -#if !ENABLE_YARR_JIT - if (result < 0) { - reportPCREError(cx, result); - return RegExpRunStatus_Error; - } -#endif - JS_ASSERT(result >= 0); return RegExpRunStatus_Success; } diff --git a/mozilla/js/src/vm/RegExpObject.cpp b/mozilla/js/src/vm/RegExpObject.cpp index 2796acb..9e6ce15 100644 --- a/mozilla/js/src/vm/RegExpObject.cpp +++ b/mozilla/js/src/vm/RegExpObject.cpp @@ -392,7 +392,6 @@ Class js::RegExpClass = { regexp_trace }; -#if ENABLE_YARR_JIT void RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error) { @@ -424,42 +423,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode err } } -#else /* !ENABLE_YARR_JIT */ - -void -RegExpPrivateCode::reportPCREError(JSContext *cx, int error) -{ -#define REPORT(msg_) \ - JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \ - return - switch (error) { - case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred."); - case 1: REPORT(JSMSG_TRAILING_SLASH); - case 2: REPORT(JSMSG_TRAILING_SLASH); - case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 4: REPORT(JSMSG_BAD_QUANTIFIER); - case 5: REPORT(JSMSG_BAD_QUANTIFIER); - case 6: REPORT(JSMSG_BAD_CLASS_RANGE); - case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 8: REPORT(JSMSG_BAD_CLASS_RANGE); - case 9: REPORT(JSMSG_BAD_QUANTIFIER); - case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); - case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); - case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 14: REPORT(JSMSG_MISSING_PAREN); - case 15: REPORT(JSMSG_BAD_BACKREF); - case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX); - default: - JS_NOT_REACHED("Precondition violation: unknown PCRE error code."); - } -#undef REPORT -} - -#endif /* ENABLE_YARR_JIT */ - bool js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut) { diff --git a/mozilla/js/src/vm/RegExpObject.h b/mozilla/js/src/vm/RegExpObject.h index b4b44b0..5675dd4 100644 --- a/mozilla/js/src/vm/RegExpObject.h +++ b/mozilla/js/src/vm/RegExpObject.h @@ -49,10 +49,8 @@ #include "yarr/Yarr.h" #if ENABLE_YARR_JIT #include "yarr/YarrJIT.h" -#include "yarr/YarrSyntaxChecker.h" -#else -#include "yarr/pcre/pcre.h" #endif +#include "yarr/YarrSyntaxChecker.h" namespace js { @@ -240,68 +238,51 @@ static const jschar GreedyStarChars[] = {'.', '*'}; /* Abstracts away the gross |RegExpPrivate| backend details. */ class RegExpPrivateCode { -#if ENABLE_YARR_JIT typedef JSC::Yarr::BytecodePattern BytecodePattern; typedef JSC::Yarr::ErrorCode ErrorCode; + typedef JSC::Yarr::YarrPattern YarrPattern; +#if ENABLE_YARR_JIT typedef JSC::Yarr::JSGlobalData JSGlobalData; typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock; - typedef JSC::Yarr::YarrPattern YarrPattern; /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */ YarrCodeBlock codeBlock; - BytecodePattern *byteCode; -#else - JSRegExp *compiled; #endif + BytecodePattern *byteCode; public: RegExpPrivateCode() : #if ENABLE_YARR_JIT codeBlock(), - byteCode(NULL) -#else - compiled(NULL) #endif + byteCode(NULL) { } ~RegExpPrivateCode() { #if ENABLE_YARR_JIT codeBlock.release(); +#endif if (byteCode) Foreground::delete_(byteCode); -#else - if (compiled) - jsRegExpFree(compiled); -#endif } static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) { -#if ENABLE_YARR_JIT ErrorCode error = JSC::Yarr::checkSyntax(*source); if (error == JSC::Yarr::NoError) return true; reportYarrError(cx, tokenStream, error); return false; -#else -# error "Syntax checking not implemented for !ENABLE_YARR_JIT" -#endif } #if ENABLE_YARR_JIT static inline bool isJITRuntimeEnabled(JSContext *cx); - static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); -#else - static void reportPCREError(JSContext *cx, int error); #endif + static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); static size_t getOutputSize(size_t pairCount) { -#if ENABLE_YARR_JIT return pairCount * 2; -#else - return pairCount * 3; /* Should be x2, but PCRE has... needs. */ -#endif } inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount, diff --git a/mozilla/js/src/yarr/wtfbridge.h b/mozilla/js/src/yarr/wtfbridge.h index ac41d08..fb8eb86 100644 --- a/mozilla/js/src/yarr/wtfbridge.h +++ b/mozilla/js/src/yarr/wtfbridge.h @@ -49,9 +49,7 @@ #include "jsprvtd.h" #include "vm/String.h" #include "assembler/wtf/Platform.h" -#if ENABLE_YARR_JIT #include "assembler/jit/ExecutableAllocator.h" -#endif namespace JSC { namespace Yarr {