<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164032] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164032">164032</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-13 10:00:47 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Code cleanup: remove gcc<4.7 guards.
https://bugs.webkit.org/show_bug.cgi?id=128729
Patch by Tamas Gergely <tgergely.u-szeged@partner.samsung.com> on 2014-02-13
Reviewed by Anders Carlsson.
Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
as WK does not compile with earlier gcc versions.
Source/JavaScriptCore:
* assembler/MIPSAssembler.h:
(JSC::MIPSAssembler::cacheFlush):
* interpreter/StackVisitor.cpp:
(JSC::printif):
Source/WTF:
* wtf/Assertions.cpp:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMIPSAssemblerh">trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-13 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
+
+ Code cleanup: remove gcc<4.7 guards.
+ https://bugs.webkit.org/show_bug.cgi?id=128729
+
+ Reviewed by Anders Carlsson.
+
+ Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
+ as WK does not compile with earlier gcc versions.
+
+ * assembler/MIPSAssembler.h:
+ (JSC::MIPSAssembler::cacheFlush):
+ * interpreter/StackVisitor.cpp:
+ (JSC::printif):
+
</ins><span class="cx"> 2014-02-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> No need to save reservedZoneSize when dropping the JSLock.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMIPSAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -870,28 +870,8 @@
</span><span class="cx">
</span><span class="cx"> static void cacheFlush(void* code, size_t size)
</span><span class="cx"> {
</span><del>-#if GCC_VERSION_AT_LEAST(4, 3, 0)
-#if WTF_MIPS_ISA_REV(2) && !GCC_VERSION_AT_LEAST(4, 4, 3)
- int lineSize;
- asm("rdhwr %0, $1" : "=r" (lineSize));
- //
- // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in
- // mips_expand_synci_loop that may execute synci one more time.
- // "start" points to the fisrt byte of the cache line.
- // "end" points to the last byte of the line before the last cache line.
- // Because size is always a multiple of 4, this is safe to set
- // "end" to the last byte.
- //
- intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize);
- intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1;
- __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end));
-#else
</del><span class="cx"> intptr_t end = reinterpret_cast<intptr_t>(code) + size;
</span><span class="cx"> __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
</span><del>-#endif
-#else
- _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t maxJumpReplacementSize()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> if (indentLevels)
</span><span class="cx"> printIndents(indentLevels);
</span><span class="cx">
</span><del>-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
</del><ins>+#if COMPILER(CLANG) || COMPILER(GCC)
</ins><span class="cx"> #pragma GCC diagnostic push
</span><span class="cx"> #pragma GCC diagnostic ignored "-Wformat-nonliteral"
</span><span class="cx"> #pragma GCC diagnostic ignored "-Wmissing-format-attribute"
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> WTF::dataLogFV(format, argList);
</span><span class="cx">
</span><del>-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
</del><ins>+#if COMPILER(CLANG) || COMPILER(GCC)
</ins><span class="cx"> #pragma GCC diagnostic pop
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/ChangeLog        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-13 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
+
+ Code cleanup: remove gcc<4.7 guards.
+ https://bugs.webkit.org/show_bug.cgi?id=128729
+
+ Reviewed by Anders Carlsson.
+
+ Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
+ as WK does not compile with earlier gcc versions.
+
+ * wtf/Assertions.cpp:
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2014-02-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> No need to save reservedZoneSize when dropping the JSLock.
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/wtf/Assertions.cpp        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> vfprintf(stderr, format, args);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
</del><ins>+#if COMPILER(CLANG) || COMPILER(GCC)
</ins><span class="cx"> #pragma GCC diagnostic push
</span><span class="cx"> #pragma GCC diagnostic ignored "-Wformat-nonliteral"
</span><span class="cx"> #endif
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> vprintf_stderr_common(formatWithNewline.get(), args);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
</del><ins>+#if COMPILER(CLANG) || COMPILER(GCC)
</ins><span class="cx"> #pragma GCC diagnostic pop
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (164031 => 164032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h        2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/wtf/Platform.h        2014-02-13 18:00:47 UTC (rev 164032)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> #define WTF_CPU_ARM_NEON 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if CPU(ARM_NEON) && (!COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 7, 0))
</del><ins>+#if CPU(ARM_NEON)
</ins><span class="cx"> // All NEON intrinsics usage can be disabled by this macro.
</span><span class="cx"> #define HAVE_ARM_NEON_INTRINSICS 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -642,15 +642,9 @@
</span><span class="cx"> #define ENABLE_FTL_JIT 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* Disable the JIT on versions of GCC prior to 4.1 */
-#if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0)
-#define ENABLE_JIT 0
-#endif
-
</del><span class="cx"> /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Windows. */
</span><span class="cx"> #if !defined(ENABLE_JIT) \
</span><span class="cx"> && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
</span><del>- && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
</del><span class="cx"> && !OS(WINCE) \
</span><span class="cx"> && !OS(WINDOWS)
</span><span class="cx"> #define ENABLE_JIT 1
</span></span></pre>
</div>
</div>
</body>
</html>