<!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>[191713] trunk/Source/JavaScriptCore</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/191713">191713</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 18:18:49 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JITSubGenerator::generateFastPath() does not need to be inlined.
https://bugs.webkit.org/show_bug.cgi?id=150645
Reviewed by Geoffrey Garen.
Moving it to a .cpp file to reduce code size. Benchmarks shows this to be
perf neutral.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* ftl/FTLCompile.cpp:
* jit/JITSubGenerator.cpp: Added.
(JSC::JITSubGenerator::generateFastPath):
* jit/JITSubGenerator.h:
(JSC::JITSubGenerator::JITSubGenerator):
(JSC::JITSubGenerator::endJumpList):
(JSC::JITSubGenerator::slowPathJumpList):
(JSC::JITSubGenerator::generateFastPath): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITSubGeneratorh">trunk/Source/JavaScriptCore/jit/JITSubGenerator.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorejitJITSubGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -444,6 +444,7 @@
</span><span class="cx"> jit/JITPropertyAccess.cpp
</span><span class="cx"> jit/JITPropertyAccess32_64.cpp
</span><span class="cx"> jit/JITStubRoutine.cpp
</span><ins>+ jit/JITSubGenerator.cpp
</ins><span class="cx"> jit/JITThunks.cpp
</span><span class="cx"> jit/JITToDFGDeferredCompilationCallback.cpp
</span><span class="cx"> jit/PolymorphicCallStubRoutine.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-10-28 Mark Lam <mark.lam@apple.com>
+
+ JITSubGenerator::generateFastPath() does not need to be inlined.
+ https://bugs.webkit.org/show_bug.cgi?id=150645
+
+ Reviewed by Geoffrey Garen.
+
+ Moving it to a .cpp file to reduce code size. Benchmarks shows this to be
+ perf neutral.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * ftl/FTLCompile.cpp:
+ * jit/JITSubGenerator.cpp: Added.
+ (JSC::JITSubGenerator::generateFastPath):
+ * jit/JITSubGenerator.h:
+ (JSC::JITSubGenerator::JITSubGenerator):
+ (JSC::JITSubGenerator::endJumpList):
+ (JSC::JITSubGenerator::slowPathJumpList):
+ (JSC::JITSubGenerator::generateFastPath): Deleted.
+
</ins><span class="cx"> 2015-10-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [B3] handleCommutativity should canonicalize commutative operations over non-constants
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -653,6 +653,7 @@
</span><span class="cx"> <ClCompile Include="..\jit\JITPropertyAccess.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\JITPropertyAccess32_64.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\JITStubRoutine.cpp" />
</span><ins>+ <ClCompile Include="..\jit\JITSubGenerator.cpp" />
</ins><span class="cx"> <ClCompile Include="..\jit\JITThunks.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\JITToDFGDeferredCompilationCallback.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\SetupVarargsFrame.cpp" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -456,6 +456,9 @@
</span><span class="cx"> <ClCompile Include="..\jit\JITStubRoutine.cpp">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\jit\JITSubGenerator.cpp">
+ <Filter>jit</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\jit\JITThunks.cpp">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -1933,6 +1933,7 @@
</span><span class="cx"> FE3913541B794F6E00EDAF71 /* LiveObjectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE3913521B794AC900EDAF71 /* LiveObjectList.cpp */; };
</span><span class="cx"> FE3913551B794F8A00EDAF71 /* LiveObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913511B794AC900EDAF71 /* LiveObjectData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE3913561B794F8F00EDAF71 /* LiveObjectList.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913531B794AC900EDAF71 /* LiveObjectList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ FE4238901BE18C3C00514737 /* JITSubGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE42388F1BE18C1200514737 /* JITSubGenerator.cpp */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> FE4BFF2B1AD476E700088F87 /* FunctionOverrides.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE4BFF291AD476E700088F87 /* FunctionOverrides.cpp */; };
</span><span class="cx"> FE4BFF2C1AD476E700088F87 /* FunctionOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4BFF2A1AD476E700088F87 /* FunctionOverrides.h */; };
</span><span class="cx"> FE4D55B81AE716CA0052E459 /* IterationStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4D55B71AE716CA0052E459 /* IterationStatus.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -4021,6 +4022,7 @@
</span><span class="cx"> FE3913511B794AC900EDAF71 /* LiveObjectData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveObjectData.h; sourceTree = "<group>"; };
</span><span class="cx"> FE3913521B794AC900EDAF71 /* LiveObjectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LiveObjectList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE3913531B794AC900EDAF71 /* LiveObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveObjectList.h; sourceTree = "<group>"; };
</span><ins>+ FE42388F1BE18C1200514737 /* JITSubGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITSubGenerator.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> FE4BFF291AD476E700088F87 /* FunctionOverrides.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionOverrides.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE4BFF2A1AD476E700088F87 /* FunctionOverrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionOverrides.h; sourceTree = "<group>"; };
</span><span class="cx"> FE4D55B71AE716CA0052E459 /* IterationStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IterationStatus.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4659,6 +4661,7 @@
</span><span class="cx"> A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */,
</span><span class="cx"> 0F766D2615A8CC1B008F363E /* JITStubRoutine.cpp */,
</span><span class="cx"> 0F766D1C15A5028D008F363E /* JITStubRoutine.h */,
</span><ins>+ FE42388F1BE18C1200514737 /* JITSubGenerator.cpp */,
</ins><span class="cx"> FE98B5B61BB9AE110073E7A6 /* JITSubGenerator.h */,
</span><span class="cx"> 0F5EF91B16878F78003E5C25 /* JITThunks.cpp */,
</span><span class="cx"> 0F5EF91C16878F78003E5C25 /* JITThunks.h */,
</span><span class="lines">@@ -8651,6 +8654,7 @@
</span><span class="cx"> 86F3EEBE168CDE930077B92A /* ObjCCallbackFunction.mm in Sources */,
</span><span class="cx"> 14469DE5107EC7E700650446 /* ObjectConstructor.cpp in Sources */,
</span><span class="cx"> 0FD3E4091B618B6600C80E1E /* ObjectPropertyCondition.cpp in Sources */,
</span><ins>+ FE4238901BE18C3C00514737 /* JITSubGenerator.cpp in Sources */,
</ins><span class="cx"> 0FD3E40B1B618B6600C80E1E /* ObjectPropertyConditionSet.cpp in Sources */,
</span><span class="cx"> 14469DE6107EC7E700650446 /* ObjectPrototype.cpp in Sources */,
</span><span class="cx"> E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "JITSubGenerator.h"
</span><span class="cx"> #include "LLVMAPI.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><ins>+#include "ScratchRegisterAllocator.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITSubGeneratorcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp (0 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(JIT)
+#include "JITSubGenerator.h"
+
+namespace JSC {
+
+void JITSubGenerator::generateFastPath(CCallHelpers& jit)
+{
+ ASSERT(m_scratchGPR != InvalidGPRReg);
+ ASSERT(m_scratchGPR != m_left.payloadGPR());
+ ASSERT(m_scratchGPR != m_right.payloadGPR());
+#if USE(JSVALUE32_64)
+ ASSERT(m_scratchGPR != m_left.tagGPR());
+ ASSERT(m_scratchGPR != m_right.tagGPR());
+ ASSERT(m_scratchFPR != InvalidFPRReg);
+#endif
+ CCallHelpers::Jump leftNotInt = jit.branchIfNotInt32(m_left);
+ CCallHelpers::Jump rightNotInt = jit.branchIfNotInt32(m_right);
+
+ jit.move(m_left.payloadGPR(), m_scratchGPR);
+ m_slowPathJumpList.append(jit.branchSub32(CCallHelpers::Overflow, m_right.payloadGPR(), m_scratchGPR));
+
+ jit.boxInt32(m_scratchGPR, m_result);
+
+ m_endJumpList.append(jit.jump());
+
+ if (!jit.supportsFloatingPoint()) {
+ m_slowPathJumpList.append(leftNotInt);
+ m_slowPathJumpList.append(rightNotInt);
+ return;
+ }
+
+ leftNotInt.link(&jit);
+ if (!m_leftType.definitelyIsNumber())
+ m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
+ if (!m_rightType.definitelyIsNumber())
+ m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
+
+ jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
+ CCallHelpers::Jump rightIsDouble = jit.branchIfNotInt32(m_right);
+
+ jit.convertInt32ToDouble(m_right.payloadGPR(), m_rightFPR);
+ CCallHelpers::Jump rightWasInteger = jit.jump();
+
+ rightNotInt.link(&jit);
+ if (!m_rightType.definitelyIsNumber())
+ m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
+
+ jit.convertInt32ToDouble(m_left.payloadGPR(), m_leftFPR);
+
+ rightIsDouble.link(&jit);
+ jit.unboxDoubleNonDestructive(m_right, m_rightFPR, m_scratchGPR, m_scratchFPR);
+
+ rightWasInteger.link(&jit);
+
+ jit.subDouble(m_rightFPR, m_leftFPR);
+ jit.boxDouble(m_leftFPR, m_result);
+
+ m_endJumpList.append(jit.jump());
+}
+
+} // namespace JSC
+
+#endif // ENABLE(JIT)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITSubGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITSubGenerator.h (191712 => 191713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITSubGenerator.h 2015-10-29 00:46:06 UTC (rev 191712)
+++ trunk/Source/JavaScriptCore/jit/JITSubGenerator.h 2015-10-29 01:18:49 UTC (rev 191713)
</span><span class="lines">@@ -26,15 +26,15 @@
</span><span class="cx"> #ifndef JITSubGenerator_h
</span><span class="cx"> #define JITSubGenerator_h
</span><span class="cx">
</span><ins>+#if ENABLE(JIT)
+
</ins><span class="cx"> #include "CCallHelpers.h"
</span><span class="cx"> #include "ResultType.h"
</span><del>-#include "ScratchRegisterAllocator.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class JITSubGenerator {
</span><span class="cx"> public:
</span><del>-
</del><span class="cx"> JITSubGenerator(JSValueRegs result, JSValueRegs left, JSValueRegs right,
</span><span class="cx"> ResultType leftType, ResultType rightType, FPRReg leftFPR, FPRReg rightFPR,
</span><span class="cx"> GPRReg scratchGPR, FPRReg scratchFPR)
</span><span class="lines">@@ -49,62 +49,8 @@
</span><span class="cx"> , m_scratchFPR(scratchFPR)
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- void generateFastPath(CCallHelpers& jit)
- {
- ASSERT(m_scratchGPR != InvalidGPRReg);
- ASSERT(m_scratchGPR != m_left.payloadGPR());
- ASSERT(m_scratchGPR != m_right.payloadGPR());
-#if USE(JSVALUE32_64)
- ASSERT(m_scratchGPR != m_left.tagGPR());
- ASSERT(m_scratchGPR != m_right.tagGPR());
- ASSERT(m_scratchFPR != InvalidFPRReg);
-#endif
- CCallHelpers::Jump leftNotInt = jit.branchIfNotInt32(m_left);
- CCallHelpers::Jump rightNotInt = jit.branchIfNotInt32(m_right);
</del><ins>+ void generateFastPath(CCallHelpers&);
</ins><span class="cx">
</span><del>- jit.move(m_left.payloadGPR(), m_scratchGPR);
- m_slowPathJumpList.append(
- jit.branchSub32(CCallHelpers::Overflow, m_right.payloadGPR(), m_scratchGPR));
-
- jit.boxInt32(m_scratchGPR, m_result);
-
- m_endJumpList.append(jit.jump());
-
- if (!jit.supportsFloatingPoint()) {
- m_slowPathJumpList.append(leftNotInt);
- m_slowPathJumpList.append(rightNotInt);
- return;
- }
-
- leftNotInt.link(&jit);
- if (!m_leftType.definitelyIsNumber())
- m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
- if (!m_rightType.definitelyIsNumber())
- m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
-
- jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
- CCallHelpers::Jump rightIsDouble = jit.branchIfNotInt32(m_right);
-
- jit.convertInt32ToDouble(m_right.payloadGPR(), m_rightFPR);
- CCallHelpers::Jump rightWasInteger = jit.jump();
-
- rightNotInt.link(&jit);
- if (!m_rightType.definitelyIsNumber())
- m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
-
- jit.convertInt32ToDouble(m_left.payloadGPR(), m_leftFPR);
-
- rightIsDouble.link(&jit);
- jit.unboxDoubleNonDestructive(m_right, m_rightFPR, m_scratchGPR, m_scratchFPR);
-
- rightWasInteger.link(&jit);
-
- jit.subDouble(m_rightFPR, m_leftFPR);
- jit.boxDouble(m_leftFPR, m_result);
-
- m_endJumpList.append(jit.jump());
- }
-
</del><span class="cx"> CCallHelpers::JumpList endJumpList() { return m_endJumpList; }
</span><span class="cx"> CCallHelpers::JumpList slowPathJumpList() { return m_slowPathJumpList; }
</span><span class="cx">
</span><span class="lines">@@ -125,4 +71,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><ins>+#endif // ENABLE(JIT)
+
</ins><span class="cx"> #endif // JITSubGenerator_h
</span></span></pre>
</div>
</div>
</body>
</html>