Attachment 582135 Details for Bug 813095 – the patch from mozilla bug 691898 backported to xulrunner 12

[patch] the patch from mozilla bug 691898 backported to xulrunner 12

mozilla-691898.patch (text/plain), 9.68 KB, created by Dan Horák on 2012-05-04 14:49:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Horák

Created: 2012-05-04 14:49:25 UTC

Size: 9.68 KB

patch

obsolete

>diff -up xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898 xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h
>--- xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h.691898	2012-04-21 00:03:53.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/assembler/jit/ExecutableAllocator.h	2012-05-04 10:23:50.000000000 +0200
>@@ -445,8 +445,6 @@ public:
>     {
>         sync_instruction_memory((caddr_t)code, size);
>     }
>-#else
>-    #error "The cacheFlush support is missing on this platform."
> #endif
> 
> private:
>diff -up xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898 xulrunner-12.0/mozilla-release/js/src/Makefile.in
>--- xulrunner-12.0/mozilla-release/js/src/Makefile.in.691898	2012-04-21 00:03:53.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/Makefile.in	2012-05-04 11:09:57.000000000 +0200
>@@ -349,20 +349,23 @@ CPPSRCS += 	checks.cc \
> # END enclude sources for V8 dtoa
> #############################################
> 
>-# For architectures without YARR JIT, PCRE is faster than the YARR
>-# interpreter (bug 684559).
>-
> ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
> 
>-VPATH +=        $(srcdir)/yarr/pcre \
>+VPATH +=	$(srcdir)/assembler \
>+		$(srcdir)/assembler/wtf \
>+		$(srcdir)/assembler/jit \
>+		$(srcdir)/yarr \
> 		$(NULL)
> 
>-CPPSRCS += \
>-                pcre_compile.cpp \
>-                pcre_exec.cpp \
>-                pcre_tables.cpp \
>-                pcre_xclass.cpp \
>-                pcre_ucp_searchfuncs.cpp \
>+CPPSRCS +=	ExecutableAllocator.cpp \
>+		ExecutableAllocatorPosix.cpp \
>+		OSAllocatorOS2.cpp \
>+		OSAllocatorPosix.cpp \
>+		OSAllocatorWin.cpp \
>+		PageBlock.cpp \
>+		YarrInterpreter.cpp \
>+		YarrPattern.cpp \
>+		YarrSyntaxChecker.cpp \
> 		$(NULL)
> else
> 
>diff -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp
>--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp.691898	2012-04-21 00:03:56.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.cpp	2012-05-04 11:13:37.000000000 +0200
>@@ -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(JSCon
>     }
> }
> 
>-#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 -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h
>--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h.691898	2012-04-21 00:03:56.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject.h	2012-05-04 11:20:17.000000000 +0200
>@@ -51,10 +51,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 {
> 
>@@ -242,68 +240,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_<BytecodePattern>(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 -up xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898 xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h
>--- xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h.691898	2012-04-21 00:03:56.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/vm/RegExpObject-inl.h	2012-05-04 11:17:01.000000000 +0200
>@@ -357,6 +357,7 @@ detail::RegExpPrivate::create(JSContext
>     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)
>@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeE
>     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),
>@@ -389,7 +390,7 @@ detail::RegExpPrivateCode::compile(JSCon
>      * 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->runtime->getExecutableAllocator(cx);
>         if (!execAlloc) {
>@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSCon
>         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
>@@ -466,19 +457,12 @@ detail::RegExpPrivateCode::execute(JSCon
>     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 -up xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898 xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h
>--- xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h.691898	2012-04-21 00:03:56.000000000 +0200
>+++ xulrunner-12.0/mozilla-release/js/src/yarr/wtfbridge.h	2012-05-04 10:23:50.000000000 +0200
>@@ -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 {
>

Actions: View | Diff

Attachments on bug 813095: 577842 | 577846 | 582135 | 582136