<!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>[194042] 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/194042">194042</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 11:44:56 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc. small fixes in snippet related code.
https://bugs.webkit.org/show_bug.cgi?id=152259
Reviewed by Saam Barati.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithMul):
- When loading a constant JSValue for a node, use the one that the node already
provides instead of reconstructing it. This is not a bug, but the fix makes
the code cleaner.
* jit/JITBitAndGenerator.cpp:
(JSC::JITBitAndGenerator::generateFastPath):
- No need to do a bitand with a constant int 0xffffffff operand.
* jit/JITBitOrGenerator.cpp:
(JSC::JITBitOrGenerator::generateFastPath):
- Fix comments: bitor is '|', not '&'.
- No need to do a bitor with a constant int 0 operand.
* jit/JITBitXorGenerator.cpp:
(JSC::JITBitXorGenerator::generateFastPath):
- Fix comments: bitxor is '^', not '&'.
* jit/JITRightShiftGenerator.cpp:
(JSC::JITRightShiftGenerator::generateFastPath):
- Renamed a jump target name to be clearer about its purpose.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitAndGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitOrGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitXorGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITRightShiftGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITRightShiftGenerator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-12-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Misc. small fixes in snippet related code.
+ https://bugs.webkit.org/show_bug.cgi?id=152259
+
+ Reviewed by Saam Barati.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithMul):
+ - When loading a constant JSValue for a node, use the one that the node already
+ provides instead of reconstructing it. This is not a bug, but the fix makes
+ the code cleaner.
+
+ * jit/JITBitAndGenerator.cpp:
+ (JSC::JITBitAndGenerator::generateFastPath):
+ - No need to do a bitand with a constant int 0xffffffff operand.
+
+ * jit/JITBitOrGenerator.cpp:
+ (JSC::JITBitOrGenerator::generateFastPath):
+ - Fix comments: bitor is '|', not '&'.
+ - No need to do a bitor with a constant int 0 operand.
+
+ * jit/JITBitXorGenerator.cpp:
+ (JSC::JITBitXorGenerator::generateFastPath):
+ - Fix comments: bitxor is '^', not '&'.
+
+ * jit/JITRightShiftGenerator.cpp:
+ (JSC::JITRightShiftGenerator::generateFastPath):
+ - Renamed a jump target name to be clearer about its purpose.
+
+2015-12-14 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> We should not employ the snippet code in the DFG if no OSR exit was previously encountered.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152255
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -3578,12 +3578,10 @@
</span><span class="cx">
</span><span class="cx"> if (leftOperand.isPositiveConstInt32()) {
</span><span class="cx"> leftRegs = resultRegs;
</span><del>- int64_t leftConst = leftOperand.asConstInt32();
- m_jit.moveValue(JSValue(leftConst), leftRegs);
</del><ins>+ m_jit.moveValue(leftChild->asJSValue(), leftRegs);
</ins><span class="cx"> } else if (rightOperand.isPositiveConstInt32()) {
</span><span class="cx"> rightRegs = resultRegs;
</span><del>- int64_t rightConst = rightOperand.asConstInt32();
- m_jit.moveValue(JSValue(rightConst), rightRegs);
</del><ins>+ m_jit.moveValue(rightChild->asJSValue(), rightRegs);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callOperation(operationValueMul, resultRegs, leftRegs, rightRegs);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitAndGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.cpp (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.cpp 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.cpp 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -52,14 +52,16 @@
</span><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(var));
</span><span class="cx">
</span><span class="cx"> jit.moveValueRegs(var, m_result);
</span><ins>+ if (constOpr.asConstInt32() != static_cast<int32_t>(0xffffffff)) {
</ins><span class="cx"> #if USE(JSVALUE64)
</span><del>- jit.and64(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
- if (constOpr.asConstInt32() >= 0)
- jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
</del><ins>+ jit.and64(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+ if (constOpr.asConstInt32() >= 0)
+ jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
</ins><span class="cx"> #else
</span><del>- jit.and32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
</del><ins>+ jit.and32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
</ins><span class="cx"> #endif
</span><del>-
</del><ins>+ }
+
</ins><span class="cx"> } else {
</span><span class="cx"> ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitOrGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.cpp (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.cpp 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.cpp 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -40,21 +40,23 @@
</span><span class="cx"> JSValueRegs var = m_leftOperand.isConstInt32() ? m_right : m_left;
</span><span class="cx"> SnippetOperand& constOpr = m_leftOperand.isConstInt32() ? m_leftOperand : m_rightOperand;
</span><span class="cx">
</span><del>- // Try to do intVar & intConstant.
</del><ins>+ // Try to do intVar | intConstant.
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(var));
</span><span class="cx">
</span><span class="cx"> jit.moveValueRegs(var, m_result);
</span><ins>+ if (constOpr.asConstInt32()) {
</ins><span class="cx"> #if USE(JSVALUE64)
</span><del>- jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
- jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
</del><ins>+ jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
+ jit.or64(GPRInfo::tagTypeNumberRegister, m_result.payloadGPR());
</ins><span class="cx"> #else
</span><del>- jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
</del><ins>+ jit.or32(CCallHelpers::Imm32(constOpr.asConstInt32()), m_result.payloadGPR());
</ins><span class="cx"> #endif
</span><del>-
</del><ins>+ }
+
</ins><span class="cx"> } else {
</span><span class="cx"> ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
</span><span class="cx">
</span><del>- // Try to do intVar & intVar.
</del><ins>+ // Try to do intVar | intVar.
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(m_left));
</span><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitXorGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.cpp (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.cpp 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.cpp 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> JSValueRegs var = m_leftOperand.isConstInt32() ? m_right : m_left;
</span><span class="cx"> SnippetOperand& constOpr = m_leftOperand.isConstInt32() ? m_leftOperand : m_rightOperand;
</span><span class="cx">
</span><del>- // Try to do intVar & intConstant.
</del><ins>+ // Try to do intVar ^ intConstant.
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(var));
</span><span class="cx">
</span><span class="cx"> jit.moveValueRegs(var, m_result);
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
</span><span class="cx">
</span><del>- // Try to do intVar & intVar.
</del><ins>+ // Try to do intVar ^ intVar.
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(m_left));
</span><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITRightShiftGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITRightShiftGenerator.cpp (194041 => 194042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITRightShiftGenerator.cpp 2015-12-14 19:41:45 UTC (rev 194041)
+++ trunk/Source/JavaScriptCore/jit/JITRightShiftGenerator.cpp 2015-12-14 19:44:56 UTC (rev 194042)
</span><span class="lines">@@ -87,14 +87,14 @@
</span><span class="cx"> // Try to do (intConstant >> intVar) or (intVar >> intVar).
</span><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotInt32(m_right));
</span><span class="cx">
</span><del>- CCallHelpers::Jump notInt;
</del><ins>+ CCallHelpers::Jump leftNotInt;
</ins><span class="cx"> if (m_leftOperand.isConstInt32()) {
</span><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> jit.move(m_right.tagGPR(), m_result.tagGPR());
</span><span class="cx"> #endif
</span><span class="cx"> jit.move(CCallHelpers::Imm32(m_leftOperand.asConstInt32()), m_result.payloadGPR());
</span><span class="cx"> } else {
</span><del>- notInt = jit.branchIfNotInt32(m_left);
</del><ins>+ leftNotInt = jit.branchIfNotInt32(m_left);
</ins><span class="cx"> jit.moveValueRegs(m_left, m_result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> m_endJumpList.append(jit.jump()); // Terminate the above case before emitting more code.
</span><span class="cx">
</span><span class="cx"> // Try to do (doubleVar >> intVar).
</span><del>- notInt.link(&jit);
</del><ins>+ leftNotInt.link(&jit);
</ins><span class="cx">
</span><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
</span><span class="cx"> jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> jit.boxInt32(m_scratchGPR, m_result);
</span><span class="cx">
</span><span class="cx"> } else
</span><del>- m_slowPathJumpList.append(notInt);
</del><ins>+ m_slowPathJumpList.append(leftNotInt);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>