<!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>[193998] 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/193998">193998</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 17:32:43 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed some dead code, and simplified some code in the baseline JIT.
https://bugs.webkit.org/show_bug.cgi?id=152199
Reviewed by Benjamin Poulain.
* jit/JIT.h:
* jit/JITArithmetic.cpp:
(JSC::JIT::emitBitBinaryOpFastPath):
(JSC::JIT::emit_op_bitand):
(JSC::JIT::emitSlow_op_lshift):
(JSC::JIT::emitRightShiftFastPath):
(JSC::JIT::emit_op_rshift):
(JSC::JIT::emitSlow_op_rshift):
(JSC::JIT::emit_op_urshift):
(JSC::JIT::emitSlow_op_urshift):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193997 => 193998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-12 01:21:52 UTC (rev 193997)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-12 01:32:43 UTC (rev 193998)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-11 Mark Lam <mark.lam@apple.com>
+
+ Removed some dead code, and simplified some code in the baseline JIT.
+ https://bugs.webkit.org/show_bug.cgi?id=152199
+
+ Reviewed by Benjamin Poulain.
+
+ * jit/JIT.h:
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emitBitBinaryOpFastPath):
+ (JSC::JIT::emit_op_bitand):
+ (JSC::JIT::emitSlow_op_lshift):
+ (JSC::JIT::emitRightShiftFastPath):
+ (JSC::JIT::emit_op_rshift):
+ (JSC::JIT::emitSlow_op_rshift):
+ (JSC::JIT::emit_op_urshift):
+ (JSC::JIT::emitSlow_op_urshift):
+
</ins><span class="cx"> 2015-12-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::reduceStrength should remove redundant Phi's
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (193997 => 193998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-12 01:21:52 UTC (rev 193997)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-12 01:32:43 UTC (rev 193998)
</span><span class="lines">@@ -833,11 +833,7 @@
</span><span class="cx"> template<typename SnippetGenerator>
</span><span class="cx"> void emitBitBinaryOpFastPath(Instruction* currentInstruction);
</span><span class="cx">
</span><del>- enum RightShiftType {
- SignedShift,
- UnsignedShift
- };
- void emitRightShiftFastPath(Instruction* currentInstruction, RightShiftType);
</del><ins>+ void emitRightShiftFastPath(Instruction* currentInstruction, OpcodeID);
</ins><span class="cx">
</span><span class="cx"> Jump checkStructure(RegisterID reg, Structure* structure);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (193997 => 193998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-12 01:21:52 UTC (rev 193997)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-12 01:32:43 UTC (rev 193998)
</span><span class="lines">@@ -536,17 +536,11 @@
</span><span class="cx">
</span><span class="cx"> gen.generateFastPath(*this);
</span><span class="cx">
</span><del>- if (gen.didEmitFastPath()) {
- gen.endJumpList().link(this);
- emitPutVirtualRegister(result, resultRegs);
</del><ins>+ ASSERT(gen.didEmitFastPath());
+ gen.endJumpList().link(this);
+ emitPutVirtualRegister(result, resultRegs);
</ins><span class="cx">
</span><del>- addSlowCase(gen.slowPathJumpList());
- } else {
- ASSERT(gen.endJumpList().empty());
- ASSERT(gen.slowPathJumpList().empty());
- JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_add);
- slowPathCall.call();
- }
</del><ins>+ addSlowCase(gen.slowPathJumpList());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_bitand(Instruction* currentInstruction)
</span><span class="lines">@@ -601,8 +595,13 @@
</span><span class="cx"> slowPathCall.call();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitRightShiftFastPath(Instruction* currentInstruction, RightShiftType rightShiftType)
</del><ins>+void JIT::emitRightShiftFastPath(Instruction* currentInstruction, OpcodeID opcodeID)
</ins><span class="cx"> {
</span><ins>+ ASSERT(opcodeID == op_rshift || opcodeID == op_urshift);
+
+ JITRightShiftGenerator::ShiftType snippetShiftType = opcodeID == op_rshift ?
+ JITRightShiftGenerator::SignedShift : JITRightShiftGenerator::UnsignedShift;
+
</ins><span class="cx"> int result = currentInstruction[1].u.operand;
</span><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="lines">@@ -636,30 +635,21 @@
</span><span class="cx"> if (!rightOperand.isConst())
</span><span class="cx"> emitGetVirtualRegister(op2, rightRegs);
</span><span class="cx">
</span><del>- JITRightShiftGenerator::ShiftType snippetShiftType =
- (rightShiftType == SignedShift) ? JITRightShiftGenerator::SignedShift : JITRightShiftGenerator::UnsignedShift;
-
</del><span class="cx"> JITRightShiftGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
</span><span class="cx"> fpRegT0, scratchGPR, scratchFPR, snippetShiftType);
</span><span class="cx">
</span><span class="cx"> gen.generateFastPath(*this);
</span><span class="cx">
</span><del>- if (gen.didEmitFastPath()) {
- gen.endJumpList().link(this);
- emitPutVirtualRegister(result, resultRegs);
</del><ins>+ ASSERT(gen.didEmitFastPath());
+ gen.endJumpList().link(this);
+ emitPutVirtualRegister(result, resultRegs);
</ins><span class="cx">
</span><del>- addSlowCase(gen.slowPathJumpList());
- } else {
- ASSERT(gen.endJumpList().empty());
- ASSERT(gen.slowPathJumpList().empty());
- JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_add);
- slowPathCall.call();
- }
</del><ins>+ addSlowCase(gen.slowPathJumpList());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_rshift(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- emitRightShiftFastPath(currentInstruction, RightShiftType::SignedShift);
</del><ins>+ emitRightShiftFastPath(currentInstruction, op_rshift);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_rshift(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -672,7 +662,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_urshift(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- emitRightShiftFastPath(currentInstruction, RightShiftType::UnsignedShift);
</del><ins>+ emitRightShiftFastPath(currentInstruction, op_urshift);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_urshift(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span></span></pre>
</div>
</div>
</body>
</html>