<!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>[159973] 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/159973">159973</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-02 15:17:53 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Baseline JIT calls to CommonSlowPaths shouldn't restore the last result
https://bugs.webkit.org/show_bug.cgi?id=125107
Reviewed by Mark Hahnenberg.
Just killing dead code.
* jit/JITArithmetic.cpp:
(JSC::JIT::emitSlow_op_negate):
(JSC::JIT::emitSlow_op_lshift):
(JSC::JIT::emitSlow_op_rshift):
(JSC::JIT::emitSlow_op_urshift):
(JSC::JIT::emitSlow_op_bitand):
(JSC::JIT::emitSlow_op_inc):
(JSC::JIT::emitSlow_op_dec):
(JSC::JIT::emitSlow_op_mod):
(JSC::JIT::emit_op_mod):
(JSC::JIT::compileBinaryArithOpSlowCase):
(JSC::JIT::emitSlow_op_div):
* jit/JITArithmetic32_64.cpp:
(JSC::JIT::emitSlow_op_negate):
(JSC::JIT::emitSlow_op_lshift):
(JSC::JIT::emitRightShiftSlowCase):
(JSC::JIT::emitSlow_op_bitand):
(JSC::JIT::emitSlow_op_bitor):
(JSC::JIT::emitSlow_op_bitxor):
(JSC::JIT::emitSlow_op_inc):
(JSC::JIT::emitSlow_op_dec):
(JSC::JIT::emitSlow_op_add):
(JSC::JIT::emitSlow_op_sub):
(JSC::JIT::emitSlow_op_mul):
(JSC::JIT::emitSlow_op_div):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_strcat):
(JSC::JIT::emitSlow_op_get_callee):
(JSC::JIT::emitSlow_op_create_this):
(JSC::JIT::emitSlow_op_to_this):
(JSC::JIT::emitSlow_op_to_primitive):
(JSC::JIT::emitSlow_op_not):
(JSC::JIT::emitSlow_op_bitxor):
(JSC::JIT::emitSlow_op_bitor):
(JSC::JIT::emitSlow_op_stricteq):
(JSC::JIT::emitSlow_op_nstricteq):
(JSC::JIT::emitSlow_op_to_number):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emitSlow_op_to_primitive):
(JSC::JIT::emitSlow_op_not):
(JSC::JIT::emitSlow_op_stricteq):
(JSC::JIT::emitSlow_op_nstricteq):
(JSC::JIT::emitSlow_op_to_number):
(JSC::JIT::emitSlow_op_get_callee):
(JSC::JIT::emitSlow_op_create_this):
(JSC::JIT::emitSlow_op_to_this):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmetic32_64cpp">trunk/Source/JavaScriptCore/jit/JITArithmetic32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (159972 => 159973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-02 23:03:53 UTC (rev 159972)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-02 23:17:53 UTC (rev 159973)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2013-12-02 Filip Pizlo <fpizlo@apple.com>
+
+ Baseline JIT calls to CommonSlowPaths shouldn't restore the last result
+ https://bugs.webkit.org/show_bug.cgi?id=125107
+
+ Reviewed by Mark Hahnenberg.
+
+ Just killing dead code.
+
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emitSlow_op_negate):
+ (JSC::JIT::emitSlow_op_lshift):
+ (JSC::JIT::emitSlow_op_rshift):
+ (JSC::JIT::emitSlow_op_urshift):
+ (JSC::JIT::emitSlow_op_bitand):
+ (JSC::JIT::emitSlow_op_inc):
+ (JSC::JIT::emitSlow_op_dec):
+ (JSC::JIT::emitSlow_op_mod):
+ (JSC::JIT::emit_op_mod):
+ (JSC::JIT::compileBinaryArithOpSlowCase):
+ (JSC::JIT::emitSlow_op_div):
+ * jit/JITArithmetic32_64.cpp:
+ (JSC::JIT::emitSlow_op_negate):
+ (JSC::JIT::emitSlow_op_lshift):
+ (JSC::JIT::emitRightShiftSlowCase):
+ (JSC::JIT::emitSlow_op_bitand):
+ (JSC::JIT::emitSlow_op_bitor):
+ (JSC::JIT::emitSlow_op_bitxor):
+ (JSC::JIT::emitSlow_op_inc):
+ (JSC::JIT::emitSlow_op_dec):
+ (JSC::JIT::emitSlow_op_add):
+ (JSC::JIT::emitSlow_op_sub):
+ (JSC::JIT::emitSlow_op_mul):
+ (JSC::JIT::emitSlow_op_div):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_strcat):
+ (JSC::JIT::emitSlow_op_get_callee):
+ (JSC::JIT::emitSlow_op_create_this):
+ (JSC::JIT::emitSlow_op_to_this):
+ (JSC::JIT::emitSlow_op_to_primitive):
+ (JSC::JIT::emitSlow_op_not):
+ (JSC::JIT::emitSlow_op_bitxor):
+ (JSC::JIT::emitSlow_op_bitor):
+ (JSC::JIT::emitSlow_op_stricteq):
+ (JSC::JIT::emitSlow_op_nstricteq):
+ (JSC::JIT::emitSlow_op_to_number):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emitSlow_op_to_primitive):
+ (JSC::JIT::emitSlow_op_not):
+ (JSC::JIT::emitSlow_op_stricteq):
+ (JSC::JIT::emitSlow_op_nstricteq):
+ (JSC::JIT::emitSlow_op_to_number):
+ (JSC::JIT::emitSlow_op_get_callee):
+ (JSC::JIT::emitSlow_op_create_this):
+ (JSC::JIT::emitSlow_op_to_this):
+
</ins><span class="cx"> 2013-12-01 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Stores to local captured variables should be intercepted
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (159972 => 159973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2013-12-02 23:03:53 UTC (rev 159972)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2013-12-02 23:17:53 UTC (rev 159973)
</span><span class="lines">@@ -220,14 +220,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_negate(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter); // 0x7fffffff check
</span><span class="cx"> linkSlowCase(iter); // double check
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_negate);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_lshift(Instruction* currentInstruction)
</span><span class="lines">@@ -249,13 +246,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_lshift(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_lshift);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_rshift(Instruction* currentInstruction)
</span><span class="lines">@@ -295,12 +289,8 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_rshift(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
- int op1 = currentInstruction[2].u.operand;
</del><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx">
</span><del>- UNUSED_PARAM(op1);
-
</del><span class="cx"> if (isOperandConstantImmediateInt(op2))
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="lines">@@ -317,7 +307,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_rshift);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_urshift(Instruction* currentInstruction)
</span><span class="lines">@@ -410,7 +399,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_urshift);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(dst, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_compareAndJump(OpcodeID, int op1, int op2, unsigned target, RelationalCondition condition)
</span><span class="lines">@@ -587,13 +575,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitand(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitand);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_inc(Instruction* currentInstruction)
</span><span class="lines">@@ -609,13 +594,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_inc(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int srcDst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_inc);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(srcDst, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_dec(Instruction* currentInstruction)
</span><span class="lines">@@ -631,13 +613,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_dec(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int srcDst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_dec);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(srcDst, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* ------------------------------ BEGIN: OP_MOD ------------------------------ */
</span><span class="lines">@@ -675,8 +654,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_mod(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="lines">@@ -684,7 +661,6 @@
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_mod);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else // CPU(X86) || CPU(X86_64)
</span><span class="lines">@@ -700,7 +676,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_mod);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_mod(Instruction*, Vector<SlowCaseEntry>::iterator&)
</span><span class="lines">@@ -784,7 +759,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, opcodeID == op_add ? slow_path_add : opcodeID == op_sub ? slow_path_sub : slow_path_mul);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> Jump end = jump();
</span><span class="cx">
</span><span class="cx"> if (op1HasImmediateIntFastCase) {
</span><span class="lines">@@ -1020,7 +994,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_div(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int result = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx"> OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
</span><span class="lines">@@ -1041,7 +1014,6 @@
</span><span class="cx"> // There is an extra slow case for (op1 * -N) or (-N * op2), to check for 0 since this should produce a result of -0.
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_div);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(result, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_sub(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmetic32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic32_64.cpp (159972 => 159973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic32_64.cpp 2013-12-02 23:03:53 UTC (rev 159972)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic32_64.cpp 2013-12-02 23:17:53 UTC (rev 159973)
</span><span class="lines">@@ -75,14 +75,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_negate(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter); // 0x7fffffff check
</span><span class="cx"> linkSlowCase(iter); // double check
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_negate);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_compareAndJump(OpcodeID opcode, int op1, int op2, unsigned target, RelationalCondition condition)
</span><span class="lines">@@ -189,7 +186,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_lshift(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -199,7 +195,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_lshift);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // RightShift (>>) and UnsignedRightShift (>>>) helper
</span><span class="lines">@@ -296,7 +291,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, isUnsigned ? slow_path_urshift : slow_path_rshift);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // RightShift (>>)
</span><span class="lines">@@ -350,7 +344,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitand(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -360,7 +353,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitand);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // BitOr (|)
</span><span class="lines">@@ -390,7 +382,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitor(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -400,7 +391,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitor);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // BitXor (^)
</span><span class="lines">@@ -430,7 +420,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitxor(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -440,7 +429,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitxor);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_inc(Instruction* currentInstruction)
</span><span class="lines">@@ -456,14 +444,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_inc(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int srcDst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter); // int32 check
</span><span class="cx"> linkSlowCase(iter); // overflow check
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_inc);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(srcDst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_dec(Instruction* currentInstruction)
</span><span class="lines">@@ -479,14 +464,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_dec(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int srcDst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter); // int32 check
</span><span class="cx"> linkSlowCase(iter); // overflow check
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_dec);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(srcDst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Addition (+)
</span><span class="lines">@@ -564,7 +546,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_add(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx"> OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
</span><span class="lines">@@ -605,7 +586,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_add);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Subtraction (-)
</span><span class="lines">@@ -674,7 +654,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_sub(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> int op2 = currentInstruction[3].u.operand;
</span><span class="cx"> OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
</span><span class="cx">
</span><span class="lines">@@ -702,7 +681,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_sub);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitBinaryDoubleOp(OpcodeID opcodeID, int dst, int op1, int op2, OperandTypes types, JumpList& notInt32Op1, JumpList& notInt32Op2, bool op1IsInRegisters, bool op2IsInRegisters)
</span><span class="lines">@@ -1008,7 +986,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_mul);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Division (/)
</span><span class="lines">@@ -1078,8 +1055,6 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_div(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
</span><span class="cx">
</span><span class="cx"> if (!supportsFloatingPoint())
</span><span class="lines">@@ -1096,7 +1071,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_div);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Mod (%)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (159972 => 159973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-02 23:03:53 UTC (rev 159972)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-02 23:17:53 UTC (rev 159973)
</span><span class="lines">@@ -323,7 +323,6 @@
</span><span class="cx"> {
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_strcat);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_not(Instruction* currentInstruction)
</span><span class="lines">@@ -855,7 +854,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_get_callee);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_create_this(Instruction* currentInstruction)
</span><span class="lines">@@ -883,7 +881,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_create_this);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_profile_will_call(Instruction* currentInstruction)
</span><span class="lines">@@ -909,7 +906,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_this);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_to_primitive(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -918,7 +914,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_primitive);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_not(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -927,7 +922,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_not);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_jfalse(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -949,7 +943,6 @@
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitxor);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitor(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -957,7 +950,6 @@
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_bitor);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_eq(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -984,7 +976,6 @@
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_stricteq);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_nstricteq(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -994,7 +985,6 @@
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_nstricteq);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_check_has_instance(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -1032,7 +1022,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_number);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitGetVirtualRegister(currentInstruction[1].u.operand, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_get_arguments_length(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (159972 => 159973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-02 23:03:53 UTC (rev 159972)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-02 23:17:53 UTC (rev 159973)
</span><span class="lines">@@ -411,13 +411,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_to_primitive(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_primitive);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0, callFrameRegister);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_strcat(Instruction* currentInstruction)
</span><span class="lines">@@ -442,13 +439,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_not(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_not);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0, callFrameRegister);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_jfalse(Instruction* currentInstruction)
</span><span class="lines">@@ -706,15 +700,12 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_stricteq(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_stricteq);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0, callFrameRegister);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_nstricteq(Instruction* currentInstruction)
</span><span class="lines">@@ -724,15 +715,12 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_nstricteq(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_nstricteq);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0, callFrameRegister);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_eq_null(Instruction* currentInstruction)
</span><span class="lines">@@ -934,13 +922,10 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_to_number(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
-
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_number);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0, callFrameRegister);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_push_name_scope(Instruction* currentInstruction)
</span><span class="lines">@@ -1096,7 +1081,6 @@
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_get_callee);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(currentInstruction[1].u.operand, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_create_this(Instruction* currentInstruction)
</span><span class="lines">@@ -1119,13 +1103,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_create_this(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> linkSlowCase(iter); // doesn't have an allocation profile
</span><span class="cx"> linkSlowCase(iter); // allocation failed
</span><span class="cx">
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_create_this);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_to_this(Instruction* currentInstruction)
</span><span class="lines">@@ -1144,13 +1126,11 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_to_this(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="cx"> {
</span><del>- int dst = currentInstruction[1].u.operand;
</del><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_to_this);
</span><span class="cx"> slowPathCall.call();
</span><del>- emitLoad(dst, regT1, regT0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_profile_will_call(Instruction* currentInstruction)
</span></span></pre>
</div>
</div>
</body>
</html>