<!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>[175998] 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/175998">175998</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 18:33:43 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use scope register when processing op_resolve_scope in LLInt and Baseline JIT
https://bugs.webkit.org/show_bug.cgi?id=138637
Reviewed by Mark Lam.
Filled out op_resolve_scope processing to use the scope operand to access the current
scope chain.
* jit/JIT.h:
* jit/JITInlines.h:
(JSC::JIT::callOperation):
* jit/JITOperations.cpp:
* jit/JITOperations.h:
Added scope virtual register parameter to emitResolveClosure(). Added new callOperation() to
support the additional argument.
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitResolveClosure):
(JSC::JIT::emit_op_resolve_scope):
(JSC::JIT::emitSlow_op_resolve_scope):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emitResolveClosure):
(JSC::JIT::emit_op_resolve_scope):
(JSC::JIT::emitSlow_op_resolve_scope):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
Added "scope" parameter to emitResolveClosure(). Passed scope register index to slow path.
Used scope virtual register instead of JSStack::ScopeChain.</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="#trunkSourceJavaScriptCorejitJITInlinesh">trunk/Source/JavaScriptCore/jit/JITInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationsh">trunk/Source/JavaScriptCore/jit/JITOperations.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-11-11 Michael Saboff <msaboff@apple.com>
+
+ Use scope register when processing op_resolve_scope in LLInt and Baseline JIT
+ https://bugs.webkit.org/show_bug.cgi?id=138637
+
+ Reviewed by Mark Lam.
+
+ Filled out op_resolve_scope processing to use the scope operand to access the current
+ scope chain.
+
+ * jit/JIT.h:
+ * jit/JITInlines.h:
+ (JSC::JIT::callOperation):
+ * jit/JITOperations.cpp:
+ * jit/JITOperations.h:
+ Added scope virtual register parameter to emitResolveClosure(). Added new callOperation() to
+ support the additional argument.
+
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitResolveClosure):
+ (JSC::JIT::emit_op_resolve_scope):
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::emitResolveClosure):
+ (JSC::JIT::emit_op_resolve_scope):
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ Added "scope" parameter to emitResolveClosure(). Passed scope register index to slow path.
+ Used scope virtual register instead of JSStack::ScopeChain.
+
</ins><span class="cx"> 2014-11-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Don't require a debugger be attached for inspector auto attach
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> void emitRightShiftSlowCase(Instruction*, Vector<SlowCaseEntry>::iterator&, bool isUnsigned);
</span><span class="cx">
</span><span class="cx"> void emitVarInjectionCheck(bool needsVarInjectionChecks);
</span><del>- void emitResolveClosure(int dst, bool needsVarInjectionChecks, unsigned depth);
</del><ins>+ void emitResolveClosure(int dst, int scope, bool needsVarInjectionChecks, unsigned depth);
</ins><span class="cx"> void emitLoadWithStructureCheck(int scope, Structure** structureSlot);
</span><span class="cx"> void emitGetGlobalProperty(uintptr_t* operandSlot);
</span><span class="cx"> void emitGetGlobalVar(uintptr_t operand);
</span><span class="lines">@@ -705,6 +705,7 @@
</span><span class="cx"> MacroAssembler::Call callOperation(J_JITOperation_EP, int, void*);
</span><span class="cx"> MacroAssembler::Call callOperation(WithProfileTag, J_JITOperation_EPc, int, Instruction*);
</span><span class="cx"> MacroAssembler::Call callOperation(J_JITOperation_EZ, int, int32_t);
</span><ins>+ MacroAssembler::Call callOperation(J_JITOperation_EZZ, int, int32_t, int32_t);
</ins><span class="cx"> MacroAssembler::Call callOperation(P_JITOperation_EJS, GPRReg, size_t);
</span><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_ECC, RegisterID, RegisterID);
</span><span class="cx"> MacroAssembler::Call callOperation(S_JITOperation_EJ, RegisterID);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlines.h (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlines.h 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JITInlines.h 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -276,6 +276,12 @@
</span><span class="cx"> return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EZZ operation, int dst, int32_t arg1, int32_t arg2)
+{
+ setupArgumentsWithExecState(TrustedImm32(arg1), TrustedImm32(arg2));
+ return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
+}
+
</ins><span class="cx"> ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(S_JITOperation_ECC operation, RegisterID regOp1, RegisterID regOp2)
</span><span class="cx"> {
</span><span class="cx"> setupArgumentsWithExecState(regOp1, regOp2);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -1718,12 +1718,13 @@
</span><span class="cx"> return reinterpret_cast<char*>(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JIT_OPERATION operationResolveScope(ExecState* exec, int32_t identifierIndex)
</del><ins>+EncodedJSValue JIT_OPERATION operationResolveScope(ExecState* exec, int32_t scopeReg, int32_t identifierIndex)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx"> const Identifier& ident = exec->codeBlock()->identifier(identifierIndex);
</span><del>- return JSValue::encode(JSScope::resolve(exec, exec->scope(), ident));
</del><ins>+ JSScope* scope = exec->uncheckedR(scopeReg).Register::scope();
+ return JSValue::encode(JSScope::resolve(exec, scope, ident));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationGetFromScope(ExecState* exec, Instruction* bytecodePC)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.h (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.h 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.h 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> char* JIT_OPERATION operationSwitchCharWithUnknownKeyType(ExecState*, EncodedJSValue key, size_t tableIndex) WTF_INTERNAL;
</span><span class="cx"> char* JIT_OPERATION operationSwitchImmWithUnknownKeyType(ExecState*, EncodedJSValue key, size_t tableIndex) WTF_INTERNAL;
</span><span class="cx"> char* JIT_OPERATION operationSwitchStringWithUnknownKeyType(ExecState*, EncodedJSValue key, size_t tableIndex) WTF_INTERNAL;
</span><del>-EncodedJSValue JIT_OPERATION operationResolveScope(ExecState*, int32_t identifierIndex) WTF_INTERNAL;
</del><ins>+EncodedJSValue JIT_OPERATION operationResolveScope(ExecState*, int32_t scope, int32_t identifierIndex) WTF_INTERNAL;
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationGetFromScope(ExecState*, Instruction* bytecodePC) WTF_INTERNAL;
</span><span class="cx"> void JIT_OPERATION operationPutToScope(ExecState*, Instruction* bytecodePC) WTF_INTERNAL;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -590,10 +590,10 @@
</span><span class="cx"> addSlowCase(branch8(Equal, AbsoluteAddress(m_codeBlock->globalObject()->varInjectionWatchpoint()->addressOfState()), TrustedImm32(IsInvalidated)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitResolveClosure(int dst, bool needsVarInjectionChecks, unsigned depth)
</del><ins>+void JIT::emitResolveClosure(int dst, int scope, bool needsVarInjectionChecks, unsigned depth)
</ins><span class="cx"> {
</span><span class="cx"> emitVarInjectionCheck(needsVarInjectionChecks);
</span><del>- emitGetVirtualRegister(JSStack::ScopeChain, regT0);
</del><ins>+ emitGetVirtualRegister(scope, regT0);
</ins><span class="cx"> for (unsigned i = 0; i < depth; ++i)
</span><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span><span class="cx"> emitPutVirtualRegister(dst);
</span><span class="lines">@@ -602,6 +602,7 @@
</span><span class="cx"> void JIT::emit_op_resolve_scope(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"> ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
</span><span class="cx"> unsigned depth = currentInstruction[5].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -616,7 +617,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case ClosureVar:
</span><span class="cx"> case ClosureVarWithVarInjectionChecks:
</span><del>- emitResolveClosure(dst, needsVarInjectionChecks(resolveType), depth);
</del><ins>+ emitResolveClosure(dst, scope, needsVarInjectionChecks(resolveType), depth);
</ins><span class="cx"> break;
</span><span class="cx"> case Dynamic:
</span><span class="cx"> addSlowCase(jump());
</span><span class="lines">@@ -635,8 +636,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><ins>+ int32_t scope = currentInstruction[2].u.operand;
</ins><span class="cx"> int32_t indentifierIndex = currentInstruction[3].u.operand;
</span><del>- callOperation(operationResolveScope, dst, indentifierIndex);
</del><ins>+ callOperation(operationResolveScope, dst, scope, indentifierIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitLoadWithStructureCheck(int scope, Structure** structureSlot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -612,11 +612,11 @@
</span><span class="cx"> addSlowCase(branch8(Equal, AbsoluteAddress(m_codeBlock->globalObject()->varInjectionWatchpoint()->addressOfState()), TrustedImm32(IsInvalidated)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitResolveClosure(int dst, bool needsVarInjectionChecks, unsigned depth)
</del><ins>+void JIT::emitResolveClosure(int dst, int scope, bool needsVarInjectionChecks, unsigned depth)
</ins><span class="cx"> {
</span><span class="cx"> emitVarInjectionCheck(needsVarInjectionChecks);
</span><span class="cx"> move(TrustedImm32(JSValue::CellTag), regT1);
</span><del>- emitLoadPayload(JSStack::ScopeChain, regT0);
</del><ins>+ emitLoadPayload(scope, regT0);
</ins><span class="cx"> for (unsigned i = 0; i < depth; ++i)
</span><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span><span class="cx"> emitStore(dst, regT1, regT0);
</span><span class="lines">@@ -625,6 +625,7 @@
</span><span class="cx"> void JIT::emit_op_resolve_scope(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"> ResolveType resolveType = static_cast<ResolveType>(currentInstruction[4].u.operand);
</span><span class="cx"> unsigned depth = currentInstruction[5].u.operand;
</span><span class="cx">
</span><span class="lines">@@ -640,7 +641,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case ClosureVar:
</span><span class="cx"> case ClosureVarWithVarInjectionChecks:
</span><del>- emitResolveClosure(dst, needsVarInjectionChecks(resolveType), depth);
</del><ins>+ emitResolveClosure(dst, scope, needsVarInjectionChecks(resolveType), depth);
</ins><span class="cx"> break;
</span><span class="cx"> case Dynamic:
</span><span class="cx"> addSlowCase(jump());
</span><span class="lines">@@ -659,8 +660,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><ins>+ int32_t scope = currentInstruction[2].u.operand;
</ins><span class="cx"> int32_t indentifierIndex = currentInstruction[3].u.operand;
</span><del>- callOperation(operationResolveScope, dst, indentifierIndex);
</del><ins>+ callOperation(operationResolveScope, dst, scope, indentifierIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitLoadWithStructureCheck(int scope, Structure** structureSlot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (175997 => 175998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-12 01:51:39 UTC (rev 175997)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-11-12 02:33:43 UTC (rev 175998)
</span><span class="lines">@@ -1358,7 +1358,8 @@
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span><span class="cx"> const Identifier& ident = exec->codeBlock()->identifier(pc[3].u.operand);
</span><del>- LLINT_RETURN(JSScope::resolve(exec, exec->scope(), ident));
</del><ins>+ JSScope* scope = LLINT_OP(2).Register::scope();
+ LLINT_RETURN(JSScope::resolve(exec, scope, ident));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_get_from_scope)
</span></span></pre>
</div>
</div>
</body>
</html>