<!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>[164503] 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/164503">164503</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-02-21 14:37:29 -0800 (Fri, 21 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add extra space to op_call and related opcodes
https://bugs.webkit.org/show_bug.cgi?id=129170
Reviewed by Mark Lam.
No change in behaviour, just some refactoring to add an extra
slot to the op_call instructions, and refactoring to make similar
changes easier in future.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::printCallOp):
* bytecode/Opcode.h:
(JSC::padOpcodeName):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitCall):
(JSC::BytecodeGenerator::emitCallVarargs):
(JSC::BytecodeGenerator::emitConstruct):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleIntrinsic):
* jit/JITCall.cpp:
(JSC::JIT::compileOpCall):
* jit/JITCall32_64.cpp:
(JSC::JIT::compileOpCall):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeOpcodeh">trunk/Source/JavaScriptCore/bytecode/Opcode.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCallcpp">trunk/Source/JavaScriptCore/jit/JITCall.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCall32_64cpp">trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-21 Oliver Hunt <oliver@apple.com>
+
+ Add extra space to op_call and related opcodes
+ https://bugs.webkit.org/show_bug.cgi?id=129170
+
+ Reviewed by Mark Lam.
+
+ No change in behaviour, just some refactoring to add an extra
+ slot to the op_call instructions, and refactoring to make similar
+ changes easier in future.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::printCallOp):
+ * bytecode/Opcode.h:
+ (JSC::padOpcodeName):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitCall):
+ (JSC::BytecodeGenerator::emitCallVarargs):
+ (JSC::BytecodeGenerator::emitConstruct):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleIntrinsic):
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileOpCall):
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileOpCall):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2014-02-21 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> gatherFromOtherThread() needs to align the sp before gathering roots.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -442,6 +442,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> ++it;
</span><ins>+ ++it;
</ins><span class="cx"> dumpArrayProfiling(out, it, hasPrintedProfiling);
</span><span class="cx"> dumpValueProfiling(out, it, hasPrintedProfiling);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Opcode.h (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Opcode.h 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/bytecode/Opcode.h 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -144,15 +144,15 @@
</span><span class="cx"> macro(op_new_func, 4) \
</span><span class="cx"> macro(op_new_captured_func, 4) \
</span><span class="cx"> macro(op_new_func_exp, 3) \
</span><del>- macro(op_call, 8) /* has value profiling */ \
- macro(op_call_eval, 8) /* has value profiling */ \
- macro(op_call_varargs, 8) /* has value profiling */ \
</del><ins>+ macro(op_call, 9) /* has value profiling */ \
+ macro(op_call_eval, 9) /* has value profiling */ \
+ macro(op_call_varargs, 9) /* has value profiling */ \
</ins><span class="cx"> macro(op_tear_off_activation, 2) \
</span><span class="cx"> macro(op_tear_off_arguments, 3) \
</span><span class="cx"> macro(op_ret, 2) \
</span><span class="cx"> macro(op_ret_object_or_this, 3) \
</span><span class="cx"> \
</span><del>- macro(op_construct, 8) \
</del><ins>+ macro(op_construct, 9) \
</ins><span class="cx"> macro(op_strcat, 4) \
</span><span class="cx"> macro(op_to_primitive, 3) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -1766,6 +1766,7 @@
</span><span class="cx"> #else
</span><span class="cx"> instructions().append(0);
</span><span class="cx"> #endif
</span><ins>+ instructions().append(0);
</ins><span class="cx"> instructions().append(arrayProfile);
</span><span class="cx"> instructions().append(profile);
</span><span class="cx">
</span><span class="lines">@@ -1799,6 +1800,7 @@
</span><span class="cx"> instructions().append(thisRegister->index());
</span><span class="cx"> instructions().append(arguments->index());
</span><span class="cx"> instructions().append(firstFreeRegister->index());
</span><ins>+ instructions().append(0);
</ins><span class="cx"> instructions().append(arrayProfile);
</span><span class="cx"> instructions().append(profile);
</span><span class="cx"> if (m_shouldEmitProfileHooks) {
</span><span class="lines">@@ -1881,6 +1883,7 @@
</span><span class="cx"> instructions().append(0);
</span><span class="cx"> #endif
</span><span class="cx"> instructions().append(0);
</span><ins>+ instructions().append(0);
</ins><span class="cx"> instructions().append(profile);
</span><span class="cx">
</span><span class="cx"> if (expectedFunction != NoExpectedFunction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -1567,7 +1567,7 @@
</span><span class="cx"> if (argumentCountIncludingThis != 2)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ArrayMode arrayMode = getArrayMode(m_currentInstruction[6].u.arrayProfile);
</del><ins>+ ArrayMode arrayMode = getArrayMode(m_currentInstruction[OPCODE_LENGTH(op_call) - 2].u.arrayProfile);
</ins><span class="cx"> if (!arrayMode.isJSArray())
</span><span class="cx"> return false;
</span><span class="cx"> switch (arrayMode.type()) {
</span><span class="lines">@@ -1591,7 +1591,7 @@
</span><span class="cx"> if (argumentCountIncludingThis != 1)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ArrayMode arrayMode = getArrayMode(m_currentInstruction[6].u.arrayProfile);
</del><ins>+ ArrayMode arrayMode = getArrayMode(m_currentInstruction[OPCODE_LENGTH(op_call) - 2].u.arrayProfile);
</ins><span class="cx"> if (!arrayMode.isJSArray())
</span><span class="cx"> return false;
</span><span class="cx"> switch (arrayMode.type()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCallcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCall.cpp (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCall.cpp 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/jit/JITCall.cpp 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -174,7 +174,8 @@
</span><span class="cx"> - Caller initializes ScopeChain; ReturnPC; CodeBlock.
</span><span class="cx"> - Caller restores callFrameRegister after return.
</span><span class="cx"> */
</span><del>-
</del><ins>+ COMPILE_ASSERT(OPCODE_LENGTH(op_call) == OPCODE_LENGTH(op_construct), call_and_construct_opcodes_must_be_same_length);
+ COMPILE_ASSERT(OPCODE_LENGTH(op_call) == OPCODE_LENGTH(op_call_varargs), call_and_call_varargs_opcodes_must_be_same_length);
</ins><span class="cx"> if (opcodeID == op_call_varargs)
</span><span class="cx"> compileLoadVarargs(instruction);
</span><span class="cx"> else {
</span><span class="lines">@@ -185,7 +186,7 @@
</span><span class="cx"> emitGetVirtualRegister(registerOffset + CallFrame::argumentOffsetIncludingThis(0), regT0);
</span><span class="cx"> Jump done = emitJumpIfNotJSCell(regT0);
</span><span class="cx"> loadPtr(Address(regT0, JSCell::structureOffset()), regT0);
</span><del>- storePtr(regT0, instruction[6].u.arrayProfile->addressOfLastSeenStructure());
</del><ins>+ storePtr(regT0, instruction[OPCODE_LENGTH(op_call) - 2].u.arrayProfile->addressOfLastSeenStructure());
</ins><span class="cx"> done.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCall32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/jit/JITCall32_64.cpp 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> emitLoad(registerOffset + CallFrame::argumentOffsetIncludingThis(0), regT0, regT1);
</span><span class="cx"> Jump done = branch32(NotEqual, regT0, TrustedImm32(JSValue::CellTag));
</span><span class="cx"> loadPtr(Address(regT1, JSCell::structureOffset()), regT1);
</span><del>- storePtr(regT1, instruction[6].u.arrayProfile->addressOfLastSeenStructure());
</del><ins>+ storePtr(regT1, instruction[OPCODE_LENGTH(op_call) - 2].u.arrayProfile->addressOfLastSeenStructure());
</ins><span class="cx"> done.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> const LowestTag = DeletedValueTag
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+const CallOpCodeSize = 9
+
</ins><span class="cx"> if X86_64 or ARM64 or C_LOOP
</span><span class="cx"> const maxFrameExtentForSlowPathCall = 0
</span><span class="cx"> elsif ARM or ARMv7_TRADITIONAL or ARMv7 or SH4
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> loadi 4[PC], t2
</span><span class="cx"> storei t1, TagOffset[cfr, t2, 8]
</span><span class="cx"> storei t0, PayloadOffset[cfr, t2, 8]
</span><del>- valueProfile(t1, t0, 28, t3)
- dispatch(8)
</del><ins>+ valueProfile(t1, t0, 4 * (CallOpCodeSize - 1), t3)
+ dispatch(CallOpCodeSize)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro cCall2(function, arg1, arg2)
</span><span class="lines">@@ -1962,7 +1962,7 @@
</span><span class="cx"> bineq ThisArgumentOffset + TagOffset[cfr, t3, 8], CellTag, .done
</span><span class="cx"> loadi ThisArgumentOffset + PayloadOffset[cfr, t3, 8], t0
</span><span class="cx"> loadp JSCell::m_structure[t0], t0
</span><del>- loadp 24[PC], t1
</del><ins>+ loadpFromInstruction(CallOpCodeSize - 2, t1)
</ins><span class="cx"> storep t0, ArrayProfile::m_lastSeenStructure[t1]
</span><span class="cx"> .done:
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (164502 => 164503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-02-21 22:34:57 UTC (rev 164502)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-02-21 22:37:29 UTC (rev 164503)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> loadp CodeBlock::m_instructions[PB], PB
</span><span class="cx"> loadisFromInstruction(1, t1)
</span><span class="cx"> storeq t0, [cfr, t1, 8]
</span><del>- valueProfile(t0, 7, t2)
- dispatch(8)
</del><ins>+ valueProfile(t0, (CallOpCodeSize - 1), t2)
+ dispatch(CallOpCodeSize)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro cCall2(function, arg1, arg2)
</span><span class="lines">@@ -1773,7 +1773,7 @@
</span><span class="cx"> loadq ThisArgumentOffset[cfr, t3, 8], t0
</span><span class="cx"> btqnz t0, tagMask, .done
</span><span class="cx"> loadp JSCell::m_structure[t0], t0
</span><del>- loadpFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction((CallOpCodeSize - 2), t1)
</ins><span class="cx"> storep t0, ArrayProfile::m_lastSeenStructure[t1]
</span><span class="cx"> .done:
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>