<!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>[192842] 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/192842">192842</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 16:07:39 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor the op_add, op_sub, and op_mul snippets to use the SnippetOperand class.
https://bugs.webkit.org/show_bug.cgi?id=151678
Reviewed by Geoffrey Garen.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileValueAdd):
(JSC::DFG::SpeculativeJIT::compileArithSub):
* ftl/FTLCompile.cpp:
* jit/JITAddGenerator.cpp:
(JSC::JITAddGenerator::generateFastPath):
* jit/JITAddGenerator.h:
(JSC::JITAddGenerator::JITAddGenerator):
* jit/JITArithmetic.cpp:
(JSC::JIT::emit_op_add):
(JSC::JIT::emit_op_mul):
(JSC::JIT::emit_op_sub):
* jit/JITMulGenerator.cpp:
(JSC::JITMulGenerator::generateFastPath):
* jit/JITMulGenerator.h:
(JSC::JITMulGenerator::JITMulGenerator):
* jit/JITSubGenerator.cpp:
(JSC::JITSubGenerator::generateFastPath):
* jit/JITSubGenerator.h:
(JSC::JITSubGenerator::JITSubGenerator):
* jit/SnippetOperand.h:
(JSC::SnippetOperand::isPositiveConstInt32):</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="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITAddGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITAddGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITAddGeneratorh">trunk/Source/JavaScriptCore/jit/JITAddGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITMulGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITMulGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITMulGeneratorh">trunk/Source/JavaScriptCore/jit/JITMulGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITSubGeneratorcpp">trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITSubGeneratorh">trunk/Source/JavaScriptCore/jit/JITSubGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitSnippetOperandh">trunk/Source/JavaScriptCore/jit/SnippetOperand.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-11-30 Mark Lam <mark.lam@apple.com>
+
+ Refactor the op_add, op_sub, and op_mul snippets to use the SnippetOperand class.
+ https://bugs.webkit.org/show_bug.cgi?id=151678
+
+ Reviewed by Geoffrey Garen.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileValueAdd):
+ (JSC::DFG::SpeculativeJIT::compileArithSub):
+ * ftl/FTLCompile.cpp:
+ * jit/JITAddGenerator.cpp:
+ (JSC::JITAddGenerator::generateFastPath):
+ * jit/JITAddGenerator.h:
+ (JSC::JITAddGenerator::JITAddGenerator):
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emit_op_add):
+ (JSC::JIT::emit_op_mul):
+ (JSC::JIT::emit_op_sub):
+ * jit/JITMulGenerator.cpp:
+ (JSC::JITMulGenerator::generateFastPath):
+ * jit/JITMulGenerator.h:
+ (JSC::JITMulGenerator::JITMulGenerator):
+ * jit/JITSubGenerator.cpp:
+ (JSC::JITSubGenerator::generateFastPath):
+ * jit/JITSubGenerator.h:
+ (JSC::JITSubGenerator::JITSubGenerator):
+ * jit/SnippetOperand.h:
+ (JSC::SnippetOperand::isPositiveConstInt32):
+
</ins><span class="cx"> 2015-11-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3 stackmaps should support early clobber
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -2853,30 +2853,26 @@
</span><span class="cx"> FPRReg scratchFPR = fprScratch.fpr();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ResultType leftType = m_state.forNode(node->child1()).resultType();
- ResultType rightType = m_state.forNode(node->child2()).resultType();
- int32_t leftConstInt32 = 0;
- int32_t rightConstInt32 = 0;
</del><ins>+ SnippetOperand leftOperand(m_state.forNode(node->child1()).resultType());
+ SnippetOperand rightOperand(m_state.forNode(node->child2()).resultType());
</ins><span class="cx">
</span><del>- ASSERT(!leftIsConstInt32 || !rightIsConstInt32);
</del><ins>+ if (leftIsConstInt32)
+ leftOperand.setConstInt32(node->child1()->asInt32());
+ if (rightIsConstInt32)
+ rightOperand.setConstInt32(node->child2()->asInt32());
</ins><span class="cx">
</span><del>- if (leftIsConstInt32) {
- leftConstInt32 = node->child1()->asInt32();
- right = JSValueOperand(this, node->child2());
- rightRegs = right->jsValueRegs();
- } else if (rightIsConstInt32) {
</del><ins>+ ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
+
+ if (!leftOperand.isConst()) {
</ins><span class="cx"> left = JSValueOperand(this, node->child1());
</span><span class="cx"> leftRegs = left->jsValueRegs();
</span><del>- rightConstInt32 = node->child2()->asInt32();
- } else {
- left = JSValueOperand(this, node->child1());
- leftRegs = left->jsValueRegs();
</del><ins>+ }
+ if (!rightOperand.isConst()) {
</ins><span class="cx"> right = JSValueOperand(this, node->child2());
</span><span class="cx"> rightRegs = right->jsValueRegs();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JITAddGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
- leftIsConstInt32, rightIsConstInt32, leftConstInt32, rightConstInt32,
</del><ins>+ JITAddGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</ins><span class="cx"> leftFPR, rightFPR, scratchGPR, scratchFPR);
</span><span class="cx"> gen.generateFastPath(m_jit);
</span><span class="cx">
</span><span class="lines">@@ -3216,9 +3212,6 @@
</span><span class="cx"> JSValueRegs leftRegs = left.jsValueRegs();
</span><span class="cx"> JSValueRegs rightRegs = right.jsValueRegs();
</span><span class="cx">
</span><del>- ResultType leftType = m_state.forNode(node->child1()).resultType();
- ResultType rightType = m_state.forNode(node->child2()).resultType();
-
</del><span class="cx"> FPRTemporary leftNumber(this);
</span><span class="cx"> FPRTemporary rightNumber(this);
</span><span class="cx"> FPRReg leftFPR = leftNumber.fpr();
</span><span class="lines">@@ -3239,7 +3232,10 @@
</span><span class="cx"> FPRReg scratchFPR = fprScratch.fpr();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- JITSubGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
</del><ins>+ SnippetOperand leftOperand(m_state.forNode(node->child1()).resultType());
+ SnippetOperand rightOperand(m_state.forNode(node->child2()).resultType());
+
+ JITSubGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</ins><span class="cx"> leftFPR, rightFPR, scratchGPR, scratchFPR);
</span><span class="cx"> gen.generateFastPath(m_jit);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -440,6 +440,9 @@
</span><span class="cx">
</span><span class="cx"> CCallHelpers fastPathJIT(&vm, codeBlock);
</span><span class="cx">
</span><ins>+ SnippetOperand leftOperand(ic.leftType());
+ SnippetOperand rightOperand(ic.rightType());
+
</ins><span class="cx"> GPRReg result = record.locations[0].directGPR();
</span><span class="cx"> GPRReg left = record.locations[1].directGPR();
</span><span class="cx"> GPRReg right = record.locations[2].directGPR();
</span><span class="lines">@@ -454,7 +457,7 @@
</span><span class="cx"> FPRReg rightFPR = allocator.allocateScratchFPR();
</span><span class="cx"> FPRReg scratchFPR = InvalidFPRReg;
</span><span class="cx">
</span><del>- JITSubGenerator gen(JSValueRegs(result), JSValueRegs(left), JSValueRegs(right), ic.leftType(), ic.rightType(), leftFPR, rightFPR, scratchGPR, scratchFPR);
</del><ins>+ JITSubGenerator gen(leftOperand, rightOperand, JSValueRegs(result), JSValueRegs(left), JSValueRegs(right), leftFPR, rightFPR, scratchGPR, scratchFPR);
</ins><span class="cx">
</span><span class="cx"> auto numberOfBytesUsedToPreserveReusedRegisters =
</span><span class="cx"> allocator.preserveReusedRegistersByPushing(fastPathJIT, ScratchRegisterAllocator::ExtraStackSpace::NoExtraSpace);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITAddGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITAddGenerator.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITAddGenerator.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITAddGenerator.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "JITAddGenerator.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-#include "JITAddGenerator.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -41,34 +41,24 @@
</span><span class="cx"> ASSERT(m_scratchFPR != InvalidFPRReg);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT(!m_leftIsConstInt32 || !m_rightIsConstInt32);
</del><ins>+ ASSERT(!m_leftOperand.isConstInt32() || !m_rightOperand.isConstInt32());
</ins><span class="cx">
</span><del>- if (!m_leftType.mightBeNumber() || !m_rightType.mightBeNumber()) {
</del><ins>+ if (!m_leftOperand.mightBeNumber() || !m_rightOperand.mightBeNumber()) {
</ins><span class="cx"> ASSERT(!m_didEmitFastPath);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_didEmitFastPath = true;
</span><span class="cx">
</span><del>- if (m_leftIsConstInt32 || m_rightIsConstInt32) {
- JSValueRegs var;
- ResultType varType = ResultType::unknownType();
- int32_t constInt32;
</del><ins>+ if (m_leftOperand.isConstInt32() || m_rightOperand.isConstInt32()) {
+ JSValueRegs var = m_leftOperand.isConstInt32() ? m_right : m_left;
+ SnippetOperand& varOpr = m_leftOperand.isConstInt32() ? m_rightOperand : m_leftOperand;
+ SnippetOperand& constOpr = m_leftOperand.isConstInt32() ? m_leftOperand : m_rightOperand;
</ins><span class="cx">
</span><del>- if (m_leftIsConstInt32) {
- var = m_right;
- varType = m_rightType;
- constInt32 = m_leftConstInt32;
- } else {
- var = m_left;
- varType = m_leftType;
- constInt32 = m_rightConstInt32;
- }
-
</del><span class="cx"> // Try to do intVar + intConstant.
</span><span class="cx"> CCallHelpers::Jump notInt32 = jit.branchIfNotInt32(var);
</span><span class="cx">
</span><del>- m_slowPathJumpList.append(jit.branchAdd32(CCallHelpers::Overflow, var.payloadGPR(), CCallHelpers::Imm32(constInt32), m_scratchGPR));
</del><ins>+ m_slowPathJumpList.append(jit.branchAdd32(CCallHelpers::Overflow, var.payloadGPR(), CCallHelpers::Imm32(constOpr.asConstInt32()), m_scratchGPR));
</ins><span class="cx">
</span><span class="cx"> jit.boxInt32(m_scratchGPR, m_result);
</span><span class="cx"> m_endJumpList.append(jit.jump());
</span><span class="lines">@@ -80,18 +70,18 @@
</span><span class="cx">
</span><span class="cx"> // Try to do doubleVar + double(intConstant).
</span><span class="cx"> notInt32.link(&jit);
</span><del>- if (!varType.definitelyIsNumber())
</del><ins>+ if (!varOpr.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(var, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.unboxDoubleNonDestructive(var, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="cx">
</span><del>- jit.move(CCallHelpers::Imm32(constInt32), m_scratchGPR);
</del><ins>+ jit.move(CCallHelpers::Imm32(constOpr.asConstInt32()), m_scratchGPR);
</ins><span class="cx"> jit.convertInt32ToDouble(m_scratchGPR, m_rightFPR);
</span><span class="cx">
</span><span class="cx"> // Fall thru to doubleVar + doubleVar.
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- ASSERT(!m_leftIsConstInt32 && !m_rightIsConstInt32);
</del><ins>+ ASSERT(!m_leftOperand.isConstInt32() && !m_rightOperand.isConstInt32());
</ins><span class="cx"> CCallHelpers::Jump leftNotInt;
</span><span class="cx"> CCallHelpers::Jump rightNotInt;
</span><span class="cx">
</span><span class="lines">@@ -111,9 +101,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> leftNotInt.link(&jit);
</span><del>- if (!m_leftType.definitelyIsNumber())
</del><ins>+ if (!m_leftOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="lines">@@ -123,7 +113,7 @@
</span><span class="cx"> CCallHelpers::Jump rightWasInteger = jit.jump();
</span><span class="cx">
</span><span class="cx"> rightNotInt.link(&jit);
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.convertInt32ToDouble(m_left.payloadGPR(), m_leftFPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITAddGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITAddGenerator.h (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITAddGenerator.h 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITAddGenerator.h 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -29,31 +29,26 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> #include "CCallHelpers.h"
</span><del>-#include "ResultType.h"
</del><ins>+#include "SnippetOperand.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class JITAddGenerator {
</span><span class="cx"> public:
</span><del>- JITAddGenerator(JSValueRegs result, JSValueRegs left, JSValueRegs right,
- ResultType leftType, ResultType rightType, bool leftIsConstInt32, bool rightIsConstInt32,
- int32_t leftConstInt32, int32_t rightConstInt32, FPRReg leftFPR, FPRReg rightFPR,
- GPRReg scratchGPR, FPRReg scratchFPR)
- : m_result(result)
</del><ins>+ JITAddGenerator(SnippetOperand leftOperand, SnippetOperand rightOperand,
+ JSValueRegs result, JSValueRegs left, JSValueRegs right,
+ FPRReg leftFPR, FPRReg rightFPR, GPRReg scratchGPR, FPRReg scratchFPR)
+ : m_leftOperand(leftOperand)
+ , m_rightOperand(rightOperand)
+ , m_result(result)
</ins><span class="cx"> , m_left(left)
</span><span class="cx"> , m_right(right)
</span><del>- , m_leftType(leftType)
- , m_rightType(rightType)
- , m_leftIsConstInt32(leftIsConstInt32)
- , m_rightIsConstInt32(rightIsConstInt32)
- , m_leftConstInt32(leftConstInt32)
- , m_rightConstInt32(rightConstInt32)
</del><span class="cx"> , m_leftFPR(leftFPR)
</span><span class="cx"> , m_rightFPR(rightFPR)
</span><span class="cx"> , m_scratchGPR(scratchGPR)
</span><span class="cx"> , m_scratchFPR(scratchFPR)
</span><span class="cx"> {
</span><del>- ASSERT(!leftIsConstInt32 || !rightIsConstInt32);
</del><ins>+ ASSERT(!m_leftOperand.isConstInt32() || !m_rightOperand.isConstInt32());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void generateFastPath(CCallHelpers&);
</span><span class="lines">@@ -63,15 +58,11 @@
</span><span class="cx"> CCallHelpers::JumpList& slowPathJumpList() { return m_slowPathJumpList; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ SnippetOperand m_leftOperand;
+ SnippetOperand m_rightOperand;
</ins><span class="cx"> JSValueRegs m_result;
</span><span class="cx"> JSValueRegs m_left;
</span><span class="cx"> JSValueRegs m_right;
</span><del>- ResultType m_leftType;
- ResultType m_rightType;
- bool m_leftIsConstInt32;
- bool m_rightIsConstInt32;
- int32_t m_leftConstInt32;
- int32_t m_rightConstInt32;
</del><span class="cx"> FPRReg m_leftFPR;
</span><span class="cx"> FPRReg m_rightFPR;
</span><span class="cx"> GPRReg m_scratchGPR;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -685,28 +685,22 @@
</span><span class="cx"> FPRReg scratchFPR = fpRegT2;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool leftIsConstInt32 = isOperandConstantInt(op1);
- bool rightIsConstInt32 = isOperandConstantInt(op2);
- ResultType leftType = types.first();
- ResultType rightType = types.second();
- int32_t leftConstInt32 = 0;
- int32_t rightConstInt32 = 0;
</del><ins>+ SnippetOperand leftOperand(types.first());
+ SnippetOperand rightOperand(types.second());
</ins><span class="cx">
</span><del>- ASSERT(!leftIsConstInt32 || !rightIsConstInt32);
</del><ins>+ if (isOperandConstantInt(op1))
+ leftOperand.setConstInt32(getOperandConstantInt(op1));
+ if (isOperandConstantInt(op2))
+ rightOperand.setConstInt32(getOperandConstantInt(op2));
</ins><span class="cx">
</span><del>- if (leftIsConstInt32) {
- leftConstInt32 = getOperandConstantInt(op1);
- emitGetVirtualRegister(op2, rightRegs);
- } else if (rightIsConstInt32) {
</del><ins>+ ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
+
+ if (!leftOperand.isConst())
</ins><span class="cx"> emitGetVirtualRegister(op1, leftRegs);
</span><del>- rightConstInt32 = getOperandConstantInt(op2);
- } else {
- emitGetVirtualRegister(op1, leftRegs);
</del><ins>+ if (!rightOperand.isConst())
</ins><span class="cx"> emitGetVirtualRegister(op2, rightRegs);
</span><del>- }
</del><span class="cx">
</span><del>- JITAddGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
- leftIsConstInt32, rightIsConstInt32, leftConstInt32, rightConstInt32,
</del><ins>+ JITAddGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</ins><span class="cx"> fpRegT0, fpRegT1, scratchGPR, scratchFPR);
</span><span class="cx">
</span><span class="cx"> gen.generateFastPath(*this);
</span><span class="lines">@@ -826,38 +820,26 @@
</span><span class="cx"> FPRReg scratchFPR = fpRegT2;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool leftIsConstInt32 = isOperandConstantInt(op1);
- bool rightIsConstInt32 = isOperandConstantInt(op2);
- ResultType leftType = types.first();
- ResultType rightType = types.second();
- int32_t leftConstInt32 = 0;
- int32_t rightConstInt32 = 0;
-
</del><span class="cx"> uint32_t* profilingCounter = nullptr;
</span><span class="cx"> if (shouldEmitProfiling())
</span><span class="cx"> profilingCounter = &m_codeBlock->addSpecialFastCaseProfile(m_bytecodeOffset)->m_counter;
</span><span class="cx">
</span><del>- ASSERT(!leftIsConstInt32 || !rightIsConstInt32);
</del><ins>+ SnippetOperand leftOperand(types.first());
+ SnippetOperand rightOperand(types.second());
</ins><span class="cx">
</span><del>- if (leftIsConstInt32)
- leftConstInt32 = getOperandConstantInt(op1);
- if (rightIsConstInt32)
- rightConstInt32 = getOperandConstantInt(op2);
</del><ins>+ if (isOperandConstantInt(op1))
+ leftOperand.setConstInt32(getOperandConstantInt(op1));
+ if (isOperandConstantInt(op2))
+ rightOperand.setConstInt32(getOperandConstantInt(op2));
</ins><span class="cx">
</span><del>- bool leftIsPositiveConstInt32 = leftIsConstInt32 && (leftConstInt32 > 0);
- bool rightIsPositiveConstInt32 = rightIsConstInt32 && (rightConstInt32 > 0);
</del><ins>+ ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
</ins><span class="cx">
</span><del>- if (leftIsPositiveConstInt32)
- emitGetVirtualRegister(op2, rightRegs);
- else if (rightIsPositiveConstInt32)
</del><ins>+ if (!leftOperand.isPositiveConstInt32())
</ins><span class="cx"> emitGetVirtualRegister(op1, leftRegs);
</span><del>- else {
- emitGetVirtualRegister(op1, leftRegs);
</del><ins>+ if (!rightOperand.isPositiveConstInt32())
</ins><span class="cx"> emitGetVirtualRegister(op2, rightRegs);
</span><del>- }
</del><span class="cx">
</span><del>- JITMulGenerator gen(resultRegs, leftRegs, rightRegs, leftType, rightType,
- leftIsPositiveConstInt32, rightIsPositiveConstInt32, leftConstInt32, rightConstInt32,
</del><ins>+ JITMulGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</ins><span class="cx"> fpRegT0, fpRegT1, scratchGPR, scratchFPR, profilingCounter);
</span><span class="cx">
</span><span class="cx"> gen.generateFastPath(*this);
</span><span class="lines">@@ -904,10 +886,13 @@
</span><span class="cx"> FPRReg scratchFPR = fpRegT2;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ SnippetOperand leftOperand(types.first());
+ SnippetOperand rightOperand(types.second());
+
</ins><span class="cx"> emitGetVirtualRegister(op1, leftRegs);
</span><span class="cx"> emitGetVirtualRegister(op2, rightRegs);
</span><span class="cx">
</span><del>- JITSubGenerator gen(resultRegs, leftRegs, rightRegs, types.first(), types.second(),
</del><ins>+ JITSubGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</ins><span class="cx"> fpRegT0, fpRegT1, scratchGPR, scratchFPR);
</span><span class="cx">
</span><span class="cx"> gen.generateFastPath(*this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITMulGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITMulGenerator.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITMulGenerator.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITMulGenerator.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "JITMulGenerator.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-#include "JITMulGenerator.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -41,34 +41,24 @@
</span><span class="cx"> ASSERT(m_scratchFPR != InvalidFPRReg);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT(!m_leftIsPositiveConstInt32 || !m_rightIsPositiveConstInt32);
-
- if (!m_leftType.mightBeNumber() || !m_rightType.mightBeNumber()) {
</del><ins>+ ASSERT(!m_leftOperand.isPositiveConstInt32() || !m_rightOperand.isPositiveConstInt32());
+
+ if (!m_leftOperand.mightBeNumber() || !m_rightOperand.mightBeNumber()) {
</ins><span class="cx"> ASSERT(!m_didEmitFastPath);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_didEmitFastPath = true;
</span><span class="cx">
</span><del>- if (m_leftIsPositiveConstInt32 || m_rightIsPositiveConstInt32) {
- JSValueRegs var;
- ResultType varType = ResultType::unknownType();
- int32_t constInt32;
</del><ins>+ if (m_leftOperand.isPositiveConstInt32() || m_rightOperand.isPositiveConstInt32()) {
+ JSValueRegs var = m_leftOperand.isPositiveConstInt32() ? m_right : m_left;
+ SnippetOperand& varOpr = m_leftOperand.isPositiveConstInt32() ? m_rightOperand : m_leftOperand;
+ SnippetOperand& constOpr = m_leftOperand.isPositiveConstInt32() ? m_leftOperand : m_rightOperand;
</ins><span class="cx">
</span><del>- if (m_leftIsPositiveConstInt32) {
- var = m_right;
- varType = m_rightType;
- constInt32 = m_leftConstInt32;
- } else {
- var = m_left;
- varType = m_leftType;
- constInt32 = m_rightConstInt32;
- }
-
</del><span class="cx"> // Try to do intVar * intConstant.
</span><span class="cx"> CCallHelpers::Jump notInt32 = jit.branchIfNotInt32(var);
</span><span class="cx">
</span><del>- m_slowPathJumpList.append(jit.branchMul32(CCallHelpers::Overflow, var.payloadGPR(), CCallHelpers::Imm32(constInt32), m_scratchGPR));
</del><ins>+ m_slowPathJumpList.append(jit.branchMul32(CCallHelpers::Overflow, var.payloadGPR(), CCallHelpers::Imm32(constOpr.asConstInt32()), m_scratchGPR));
</ins><span class="cx">
</span><span class="cx"> jit.boxInt32(m_scratchGPR, m_result);
</span><span class="cx"> m_endJumpList.append(jit.jump());
</span><span class="lines">@@ -80,18 +70,18 @@
</span><span class="cx">
</span><span class="cx"> // Try to do doubleVar * double(intConstant).
</span><span class="cx"> notInt32.link(&jit);
</span><del>- if (!varType.definitelyIsNumber())
</del><ins>+ if (!varOpr.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(var, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.unboxDoubleNonDestructive(var, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="cx">
</span><del>- jit.move(CCallHelpers::Imm32(constInt32), m_scratchGPR);
</del><ins>+ jit.move(CCallHelpers::Imm32(constOpr.asConstInt32()), m_scratchGPR);
</ins><span class="cx"> jit.convertInt32ToDouble(m_scratchGPR, m_rightFPR);
</span><span class="cx">
</span><span class="cx"> // Fall thru to doubleVar * doubleVar.
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- ASSERT(!m_leftIsPositiveConstInt32 && !m_rightIsPositiveConstInt32);
</del><ins>+ ASSERT(!m_leftOperand.isPositiveConstInt32() && !m_rightOperand.isPositiveConstInt32());
</ins><span class="cx">
</span><span class="cx"> CCallHelpers::Jump leftNotInt;
</span><span class="cx"> CCallHelpers::Jump rightNotInt;
</span><span class="lines">@@ -130,9 +120,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> leftNotInt.link(&jit);
</span><del>- if (!m_leftType.definitelyIsNumber())
</del><ins>+ if (!m_leftOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="lines">@@ -142,7 +132,7 @@
</span><span class="cx"> CCallHelpers::Jump rightWasInteger = jit.jump();
</span><span class="cx">
</span><span class="cx"> rightNotInt.link(&jit);
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.convertInt32ToDouble(m_left.payloadGPR(), m_leftFPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITMulGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITMulGenerator.h (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITMulGenerator.h 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITMulGenerator.h 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -29,32 +29,27 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> #include "CCallHelpers.h"
</span><del>-#include "ResultType.h"
</del><ins>+#include "SnippetOperand.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class JITMulGenerator {
</span><span class="cx"> public:
</span><del>- JITMulGenerator(JSValueRegs result, JSValueRegs left, JSValueRegs right,
- ResultType leftType, ResultType rightType, bool leftIsPositiveConstInt32, bool rightIsPositiveConstInt32,
- int32_t leftConstInt32, int32_t rightConstInt32, FPRReg leftFPR, FPRReg rightFPR,
- GPRReg scratchGPR, FPRReg scratchFPR, uint32_t* profilingCounter)
- : m_result(result)
</del><ins>+ JITMulGenerator(SnippetOperand leftOperand, SnippetOperand rightOperand,
+ JSValueRegs result, JSValueRegs left, JSValueRegs right,
+ FPRReg leftFPR, FPRReg rightFPR, GPRReg scratchGPR, FPRReg scratchFPR, uint32_t* profilingCounter)
+ : m_leftOperand(leftOperand)
+ , m_rightOperand(rightOperand)
+ , m_result(result)
</ins><span class="cx"> , m_left(left)
</span><span class="cx"> , m_right(right)
</span><del>- , m_leftType(leftType)
- , m_rightType(rightType)
- , m_leftIsPositiveConstInt32(leftIsPositiveConstInt32)
- , m_rightIsPositiveConstInt32(rightIsPositiveConstInt32)
- , m_leftConstInt32(leftConstInt32)
- , m_rightConstInt32(rightConstInt32)
</del><span class="cx"> , m_leftFPR(leftFPR)
</span><span class="cx"> , m_rightFPR(rightFPR)
</span><span class="cx"> , m_scratchGPR(scratchGPR)
</span><span class="cx"> , m_scratchFPR(scratchFPR)
</span><span class="cx"> , m_profilingCounter(profilingCounter)
</span><span class="cx"> {
</span><del>- ASSERT(!leftIsPositiveConstInt32 || !rightIsPositiveConstInt32);
</del><ins>+ ASSERT(!m_leftOperand.isPositiveConstInt32() || !m_rightOperand.isPositiveConstInt32());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void generateFastPath(CCallHelpers&);
</span><span class="lines">@@ -64,15 +59,11 @@
</span><span class="cx"> CCallHelpers::JumpList& slowPathJumpList() { return m_slowPathJumpList; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ SnippetOperand m_leftOperand;
+ SnippetOperand m_rightOperand;
</ins><span class="cx"> JSValueRegs m_result;
</span><span class="cx"> JSValueRegs m_left;
</span><span class="cx"> JSValueRegs m_right;
</span><del>- ResultType m_leftType;
- ResultType m_rightType;
- bool m_leftIsPositiveConstInt32;
- bool m_rightIsPositiveConstInt32;
- int32_t m_leftConstInt32;
- int32_t m_rightConstInt32;
</del><span class="cx"> FPRReg m_leftFPR;
</span><span class="cx"> FPRReg m_rightFPR;
</span><span class="cx"> GPRReg m_scratchGPR;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITSubGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITSubGenerator.cpp 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "JITSubGenerator.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-#include "JITSubGenerator.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -60,9 +60,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> leftNotInt.link(&jit);
</span><del>- if (!m_leftType.definitelyIsNumber())
</del><ins>+ if (!m_leftOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_left, m_scratchGPR));
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.unboxDoubleNonDestructive(m_left, m_leftFPR, m_scratchGPR, m_scratchFPR);
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> CCallHelpers::Jump rightWasInteger = jit.jump();
</span><span class="cx">
</span><span class="cx"> rightNotInt.link(&jit);
</span><del>- if (!m_rightType.definitelyIsNumber())
</del><ins>+ if (!m_rightOperand.definitelyIsNumber())
</ins><span class="cx"> m_slowPathJumpList.append(jit.branchIfNotNumber(m_right, m_scratchGPR));
</span><span class="cx">
</span><span class="cx"> jit.convertInt32ToDouble(m_left.payloadGPR(), m_leftFPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITSubGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITSubGenerator.h (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITSubGenerator.h 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/JITSubGenerator.h 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -29,20 +29,20 @@
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><span class="cx"> #include "CCallHelpers.h"
</span><del>-#include "ResultType.h"
</del><ins>+#include "SnippetOperand.h"
</ins><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>- JITSubGenerator(JSValueRegs result, JSValueRegs left, JSValueRegs right,
- ResultType leftType, ResultType rightType, FPRReg leftFPR, FPRReg rightFPR,
- GPRReg scratchGPR, FPRReg scratchFPR)
- : m_result(result)
</del><ins>+ JITSubGenerator(SnippetOperand leftOperand, SnippetOperand rightOperand,
+ JSValueRegs result, JSValueRegs left, JSValueRegs right,
+ FPRReg leftFPR, FPRReg rightFPR, GPRReg scratchGPR, FPRReg scratchFPR)
+ : m_leftOperand(leftOperand)
+ , m_rightOperand(rightOperand)
+ , m_result(result)
</ins><span class="cx"> , m_left(left)
</span><span class="cx"> , m_right(right)
</span><del>- , m_leftType(leftType)
- , m_rightType(rightType)
</del><span class="cx"> , m_leftFPR(leftFPR)
</span><span class="cx"> , m_rightFPR(rightFPR)
</span><span class="cx"> , m_scratchGPR(scratchGPR)
</span><span class="lines">@@ -56,11 +56,11 @@
</span><span class="cx"> CCallHelpers::JumpList& slowPathJumpList() { return m_slowPathJumpList; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ SnippetOperand m_leftOperand;
+ SnippetOperand m_rightOperand;
</ins><span class="cx"> JSValueRegs m_result;
</span><span class="cx"> JSValueRegs m_left;
</span><span class="cx"> JSValueRegs m_right;
</span><del>- ResultType m_leftType;
- ResultType m_rightType;
</del><span class="cx"> FPRReg m_leftFPR;
</span><span class="cx"> FPRReg m_rightFPR;
</span><span class="cx"> GPRReg m_scratchGPR;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitSnippetOperandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/SnippetOperand.h (192841 => 192842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/SnippetOperand.h 2015-12-01 00:04:57 UTC (rev 192841)
+++ trunk/Source/JavaScriptCore/jit/SnippetOperand.h 2015-12-01 00:07:39 UTC (rev 192842)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> bool isConst() const { return m_type != Variable; }
</span><span class="cx"> bool isConstInt32() const { return m_type == ConstInt32; }
</span><span class="cx"> bool isConstDouble() const { return m_type == ConstDouble; }
</span><ins>+ bool isPositiveConstInt32() const { return isConstInt32() && asConstInt32() > 0; }
</ins><span class="cx">
</span><span class="cx"> int64_t asRawBits() const { return m_val.rawBits; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>