<!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>[178553] branches/safari-600.5-branch/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/178553">178553</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 17:58:00 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174162">r174162</a>. rdar://problem/19451961</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreChangeLog">branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblypl">branches/safari-600.5-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl</a></li>
<li><a href="#branchessafari6005branchSourceWTFChangeLog">branches/safari-600.5-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWTFwtfPlatformh">branches/safari-600.5-branch/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog (178552 => 178553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-01-16 01:57:56 UTC (rev 178552)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-01-16 01:58:00 UTC (rev 178553)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r174162. rdar://problem/19451961
+
+ 2014-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] 32-bit JavaScriptCore should limit itself to the C loop
+ https://bugs.webkit.org/show_bug.cgi?id=137304
+ <rdar://problem/18375370>
+
+ Reviewed by Michael Saboff.
+
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl:
+ Use the C loop for 32-bit builds.
+
</ins><span class="cx"> 2015-01-14 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged r173318. <rdar://problem/19424143>
</span></span></pre></div>
<a id="branchessafari6005branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblybuildLLIntAssemblypl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl (178552 => 178553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl 2015-01-16 01:57:56 UTC (rev 178552)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl 2015-01-16 01:58:00 UTC (rev 178553)
</span><span class="lines">@@ -62,7 +62,13 @@
</span><span class="cx"> close(OUTPUTFILENAME);
</span><span class="cx">
</span><span class="cx"> # If you want to enable the LLINT C loop, set OUTPUTFILENAME to "LLIntAssembly.h"
</span><del>-my $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
</del><ins>+# We only want the C loop for 32-bit Windows so we can continue to support old CPUs.
+my $OUTPUTFILENAME;
+if ("$ARGV[3]" eq "32") {
+ $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LLIntAssembly.h');
+} else {
+ $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
+}
</ins><span class="cx">
</span><span class="cx"> my $offlineAsm = File::Spec->catfile($XSRCROOT, 'offlineasm', 'asm.rb');
</span><span class="cx"> my $lowLevelInterpreter = File::Spec->catfile($XSRCROOT, 'llint', 'LowLevelInterpreter.asm');
</span></span></pre></div>
<a id="branchessafari6005branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WTF/ChangeLog (178552 => 178553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WTF/ChangeLog 2015-01-16 01:57:56 UTC (rev 178552)
+++ branches/safari-600.5-branch/Source/WTF/ChangeLog 2015-01-16 01:58:00 UTC (rev 178553)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r174162. rdar://problem/19451961
+
+ 2014-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] 32-bit JavaScriptCore should limit itself to the C loop
+ https://bugs.webkit.org/show_bug.cgi?id=137304
+ <rdar://problem/18375370>
+
+ Reviewed by Michael Saboff.
+
+ * wtf/Platform.h: Force the C loop when building for 32-bit Windows.
+
</ins><span class="cx"> 2015-01-14 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merged r173318. <rdar://problem/19424143>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WTF/wtf/Platform.h (178552 => 178553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WTF/wtf/Platform.h 2015-01-16 01:57:56 UTC (rev 178552)
+++ branches/safari-600.5-branch/Source/WTF/wtf/Platform.h 2015-01-16 01:58:00 UTC (rev 178553)
</span><span class="lines">@@ -718,6 +718,12 @@
</span><span class="cx"> #define ENABLE_CONCURRENT_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+/* We do not want to allow LLInt on 32-bit Windows so that we can support some ancient
+ CPUs that do not have SSE2 support */
+#if OS(WINDOWS) && !CPU(X86_64)
+#define ENABLE_LLINT_C_LOOP 1
+#endif
+
</ins><span class="cx"> /* Disable the JIT if we force the LLInt C Loop */
</span><span class="cx"> #if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP
</span><span class="cx"> #undef ENABLE_JIT
</span></span></pre>
</div>
</div>
</body>
</html>