<!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>[175845] 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/175845">175845</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 19:05:25 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add scope operand to op_create_lexical_environment
https://bugs.webkit.org/show_bug.cgi?id=138588
Reviewed by Geoffrey Garen.
Added a second operand to op_create_lexical_environment that contains the scope register
to update. Note that the DFG relies on operationCreateActivation() to update the
scope register since we can't issue a set() with a non-local, non-argument register.
This is temporary until the scope register is allocated as a local.
* bytecode/BytecodeList.json:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
Added the scope register operand.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
Filled in the scope register operand.
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_create_lexical_environment):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_create_lexical_environment):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
Set the scope register with the result of the appropriate create activation slow call.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.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>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</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 (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-11-10 Michael Saboff <msaboff@apple.com>
+
+ Add scope operand to op_create_lexical_environment
+ https://bugs.webkit.org/show_bug.cgi?id=138588
+
+ Reviewed by Geoffrey Garen.
+
+ Added a second operand to op_create_lexical_environment that contains the scope register
+ to update. Note that the DFG relies on operationCreateActivation() to update the
+ scope register since we can't issue a set() with a non-local, non-argument register.
+ This is temporary until the scope register is allocated as a local.
+
+ * bytecode/BytecodeList.json:
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ Added the scope register operand.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ Filled in the scope register operand.
+
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_create_lexical_environment):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_create_lexical_environment):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ Set the scope register with the result of the appropriate create activation slow call.
+
</ins><span class="cx"> 2014-11-09 Akos Kiss <akiss@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Fix 'noreturn' function does return warning in LLVMOverrides.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> "macroNameComponent" : "BYTECODE", "asmPrefix" : "llint_",
</span><span class="cx"> "bytecodes" : [
</span><span class="cx"> { "name" : "op_enter", "length" : 1 },
</span><del>- { "name" : "op_create_lexical_environment", "length" : 2 },
</del><ins>+ { "name" : "op_create_lexical_environment", "length" : 3 },
</ins><span class="cx"> { "name" : "op_get_scope", "length" : 2 },
</span><span class="cx"> { "name" : "op_touch_entry", "length" : 1 },
</span><span class="cx"> { "name" : "op_init_lazy_reg", "length" : 2 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -745,7 +745,9 @@
</span><span class="cx"> }
</span><span class="cx"> case op_create_lexical_environment: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><del>- printLocationOpAndRegisterOperand(out, exec, location, it, "create_lexical_environment", r0);
</del><ins>+ int r1 = (++it)->u.operand;
+ printLocationAndOp(out, exec, location, it, "create_lexical_environment");
+ out.printf("%s %s", registerName(r0).data(), registerName(r1).data());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_get_scope: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -258,6 +258,7 @@
</span><span class="cx"> m_codeBlock->setActivationRegister(m_lexicalEnvironmentRegister->virtualRegister());
</span><span class="cx"> emitOpcode(op_create_lexical_environment);
</span><span class="cx"> instructions().append(m_lexicalEnvironmentRegister->index());
</span><ins>+ instructions().append(scopeRegister()->index());
</ins><span class="cx"> }
</span><span class="cx"> RegisterID* localArgumentsRegister = nullptr;
</span><span class="cx"> RegisterID* scratch = addVar();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -669,9 +669,11 @@
</span><span class="cx"> void JIT::emit_op_create_lexical_environment(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><ins>+ int scope = currentInstruction[2].u.operand;
</ins><span class="cx">
</span><span class="cx"> callOperation(operationCreateActivation, 0);
</span><span class="cx"> emitStoreCell(dst, returnValueGPR);
</span><ins>+ emitStoreCell(scope, returnValueGPR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_get_scope(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -899,9 +899,11 @@
</span><span class="cx"> void JIT::emit_op_create_lexical_environment(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int lexicalEnvironment = currentInstruction[1].u.operand;
</span><ins>+ int scope = currentInstruction[2].u.operand;
</ins><span class="cx">
</span><span class="cx"> callOperation(operationCreateActivation, 0);
</span><span class="cx"> emitStoreCell(lexicalEnvironment, returnValueGPR);
</span><ins>+ emitStoreCell(scope, returnValueGPR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_get_scope(Instruction* currentInstruction)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -504,7 +504,7 @@
</span><span class="cx"> dataLogF("Creating an lexicalEnvironment, exec = %p!\n", exec);
</span><span class="cx"> #endif
</span><span class="cx"> JSLexicalEnvironment* lexicalEnvironment = JSLexicalEnvironment::create(vm, exec, exec->codeBlock());
</span><del>- exec->setScope(lexicalEnvironment);
</del><ins>+ exec->uncheckedR(pc[2].u.operand) = lexicalEnvironment;
</ins><span class="cx"> LLINT_RETURN(JSValue(lexicalEnvironment));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 4[PC], t0
</span><span class="cx"> callSlowPath(_llint_slow_path_create_lexical_environment)
</span><del>- dispatch(2)
</del><ins>+ dispatch(3)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_op_get_scope:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (175844 => 175845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-11-11 01:47:36 UTC (rev 175844)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-11-11 03:05:25 UTC (rev 175845)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(1, t0)
</span><span class="cx"> callSlowPath(_llint_slow_path_create_lexical_environment)
</span><del>- dispatch(2)
</del><ins>+ dispatch(3)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_op_get_scope:
</span></span></pre>
</div>
</div>
</body>
</html>