<!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>[190675] 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/190675">190675</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-07 11:26:19 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JIT::emitGetGlobalProperty/emitPutGlobalProperty are only called from one place
https://bugs.webkit.org/show_bug.cgi?id=149879
Reviewed by Saam Barati.
To simplify my work to insert barriers on loads of the butterfly, I want to reduce the amount
of abstraction we have around code that loads the butterfly.
* jit/JIT.h:
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitLoadWithStructureCheck):
(JSC::JIT::emitGetVarFromPointer):
(JSC::JIT::emit_op_get_from_scope):
(JSC::JIT::emitSlow_op_get_from_scope):
(JSC::JIT::emitPutGlobalVariable):
(JSC::JIT::emit_op_put_to_scope):
(JSC::JIT::emitGetGlobalProperty): Deleted.
(JSC::JIT::emitPutGlobalProperty): Deleted.
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emitLoadWithStructureCheck):
(JSC::JIT::emitGetVarFromPointer):
(JSC::JIT::emit_op_get_from_scope):
(JSC::JIT::emitSlow_op_get_from_scope):
(JSC::JIT::emitPutGlobalVariable):
(JSC::JIT::emit_op_put_to_scope):
(JSC::JIT::emitGetGlobalProperty): Deleted.
(JSC::JIT::emitPutGlobalProperty): Deleted.</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="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_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 (190674 => 190675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 18:17:56 UTC (rev 190674)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 18:26:19 UTC (rev 190675)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-10-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ JIT::emitGetGlobalProperty/emitPutGlobalProperty are only called from one place
+ https://bugs.webkit.org/show_bug.cgi?id=149879
+
+ Reviewed by Saam Barati.
+
+ To simplify my work to insert barriers on loads of the butterfly, I want to reduce the amount
+ of abstraction we have around code that loads the butterfly.
+
+ * jit/JIT.h:
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitLoadWithStructureCheck):
+ (JSC::JIT::emitGetVarFromPointer):
+ (JSC::JIT::emit_op_get_from_scope):
+ (JSC::JIT::emitSlow_op_get_from_scope):
+ (JSC::JIT::emitPutGlobalVariable):
+ (JSC::JIT::emit_op_put_to_scope):
+ (JSC::JIT::emitGetGlobalProperty): Deleted.
+ (JSC::JIT::emitPutGlobalProperty): Deleted.
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::emitLoadWithStructureCheck):
+ (JSC::JIT::emitGetVarFromPointer):
+ (JSC::JIT::emit_op_get_from_scope):
+ (JSC::JIT::emitSlow_op_get_from_scope):
+ (JSC::JIT::emitPutGlobalVariable):
+ (JSC::JIT::emit_op_put_to_scope):
+ (JSC::JIT::emitGetGlobalProperty): Deleted.
+ (JSC::JIT::emitPutGlobalProperty): Deleted.
+
+2015-10-07 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> JIT::compileGetDirectOffset is useless
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149878
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (190674 => 190675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2015-10-07 18:17:56 UTC (rev 190674)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2015-10-07 18:26:19 UTC (rev 190675)
</span><span class="lines">@@ -668,7 +668,6 @@
</span><span class="cx"> void emitVarInjectionCheck(bool needsVarInjectionChecks);
</span><span class="cx"> void emitResolveClosure(int dst, int scope, bool needsVarInjectionChecks, unsigned depth);
</span><span class="cx"> void emitLoadWithStructureCheck(int scope, Structure** structureSlot);
</span><del>- void emitGetGlobalProperty(uintptr_t* operandSlot);
</del><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> void emitGetVarFromPointer(JSValue* operand, GPRReg);
</span><span class="cx"> void emitGetVarFromIndirectPointer(JSValue** operand, GPRReg);
</span><span class="lines">@@ -677,7 +676,6 @@
</span><span class="cx"> void emitGetVarFromPointer(JSValue* operand, GPRReg tag, GPRReg payload);
</span><span class="cx"> #endif
</span><span class="cx"> void emitGetClosureVar(int scope, uintptr_t operand);
</span><del>- void emitPutGlobalProperty(uintptr_t* operandSlot, int value);
</del><span class="cx"> void emitNotifyWrite(WatchpointSet*);
</span><span class="cx"> void emitNotifyWrite(GPRReg pointerToSet);
</span><span class="cx"> void emitPutGlobalVariable(JSValue* operand, int value, WatchpointSet*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (190674 => 190675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-10-07 18:17:56 UTC (rev 190674)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-10-07 18:26:19 UTC (rev 190675)
</span><span class="lines">@@ -754,25 +754,6 @@
</span><span class="cx"> addSlowCase(branch32(NotEqual, Address(regT0, JSCell::structureIDOffset()), regT1));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitGetGlobalProperty(uintptr_t* operandSlot)
-{
- GPRReg base = regT0;
- GPRReg result = regT0;
- GPRReg offset = regT1;
- GPRReg scratch = regT2;
-
- load32(operandSlot, offset);
- if (!ASSERT_DISABLED) {
- Jump isOutOfLine = branch32(GreaterThanOrEqual, offset, TrustedImm32(firstOutOfLineOffset));
- abortWithReason(JITOffsetIsNotOutOfLine);
- isOutOfLine.link(this);
- }
- loadPtr(Address(base, JSObject::butterflyOffset()), scratch);
- neg32(offset);
- signExtend32ToPtr(offset, offset);
- load64(BaseIndex(scratch, offset, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), result);
-}
-
</del><span class="cx"> void JIT::emitGetVarFromPointer(JSValue* operand, GPRReg reg)
</span><span class="cx"> {
</span><span class="cx"> loadPtr(operand, reg);
</span><span class="lines">@@ -801,10 +782,25 @@
</span><span class="cx"> auto emitCode = [&] (ResolveType resolveType, bool indirectLoadForOperand) {
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><del>- case GlobalPropertyWithVarInjectionChecks:
</del><ins>+ case GlobalPropertyWithVarInjectionChecks: {
</ins><span class="cx"> emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection.
</span><del>- emitGetGlobalProperty(operandSlot);
</del><ins>+ GPRReg base = regT0;
+ GPRReg result = regT0;
+ GPRReg offset = regT1;
+ GPRReg scratch = regT2;
+
+ load32(operandSlot, offset);
+ if (!ASSERT_DISABLED) {
+ Jump isOutOfLine = branch32(GreaterThanOrEqual, offset, TrustedImm32(firstOutOfLineOffset));
+ abortWithReason(JITOffsetIsNotOutOfLine);
+ isOutOfLine.link(this);
+ }
+ loadPtr(Address(base, JSObject::butterflyOffset()), scratch);
+ neg32(offset);
+ signExtend32ToPtr(offset, offset);
+ load64(BaseIndex(scratch, offset, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), result);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case GlobalVar:
</span><span class="cx"> case GlobalVarWithVarInjectionChecks:
</span><span class="cx"> case GlobalLexicalVar:
</span><span class="lines">@@ -901,16 +897,6 @@
</span><span class="cx"> callOperation(WithProfile, operationGetFromScope, dst, currentInstruction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitPutGlobalProperty(uintptr_t* operandSlot, int value)
-{
- emitGetVirtualRegister(value, regT2);
-
- loadPtr(Address(regT0, JSObject::butterflyOffset()), regT0);
- loadPtr(operandSlot, regT1);
- negPtr(regT1);
- storePtr(regT2, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)));
-}
-
</del><span class="cx"> void JIT::emitPutGlobalVariable(JSValue* operand, int value, WatchpointSet* set)
</span><span class="cx"> {
</span><span class="cx"> emitGetVirtualRegister(value, regT0);
</span><span class="lines">@@ -946,11 +932,17 @@
</span><span class="cx"> auto emitCode = [&] (ResolveType resolveType, bool indirectLoadForOperand) {
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><del>- case GlobalPropertyWithVarInjectionChecks:
</del><ins>+ case GlobalPropertyWithVarInjectionChecks: {
</ins><span class="cx"> emitWriteBarrier(m_codeBlock->globalObject(), value, ShouldFilterValue);
</span><span class="cx"> emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection.
</span><del>- emitPutGlobalProperty(operandSlot, value);
</del><ins>+ emitGetVirtualRegister(value, regT2);
+
+ loadPtr(Address(regT0, JSObject::butterflyOffset()), regT0);
+ loadPtr(operandSlot, regT1);
+ negPtr(regT1);
+ storePtr(regT2, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)));
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case GlobalVar:
</span><span class="cx"> case GlobalVarWithVarInjectionChecks:
</span><span class="cx"> case GlobalLexicalVar:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (190674 => 190675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-10-07 18:17:56 UTC (rev 190674)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-10-07 18:26:19 UTC (rev 190675)
</span><span class="lines">@@ -780,26 +780,6 @@
</span><span class="cx"> addSlowCase(branchPtr(NotEqual, Address(regT0, JSCell::structureIDOffset()), regT2));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitGetGlobalProperty(uintptr_t* operandSlot)
-{
- GPRReg base = regT2;
- GPRReg resultTag = regT1;
- GPRReg resultPayload = regT0;
- GPRReg offset = regT3;
-
- move(regT0, base);
- load32(operandSlot, offset);
- if (!ASSERT_DISABLED) {
- Jump isOutOfLine = branch32(GreaterThanOrEqual, offset, TrustedImm32(firstOutOfLineOffset));
- abortWithReason(JITOffsetIsNotOutOfLine);
- isOutOfLine.link(this);
- }
- loadPtr(Address(base, JSObject::butterflyOffset()), base);
- neg32(offset);
- load32(BaseIndex(base, offset, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.payload) + (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), resultPayload);
- load32(BaseIndex(base, offset, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.tag) + (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), resultTag);
-}
-
</del><span class="cx"> void JIT::emitGetVarFromPointer(JSValue* operand, GPRReg tag, GPRReg payload)
</span><span class="cx"> {
</span><span class="cx"> uintptr_t rawAddress = bitwise_cast<uintptr_t>(operand);
</span><span class="lines">@@ -831,10 +811,26 @@
</span><span class="cx"> auto emitCode = [&] (ResolveType resolveType, bool indirectLoadForOperand) {
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><del>- case GlobalPropertyWithVarInjectionChecks:
</del><ins>+ case GlobalPropertyWithVarInjectionChecks: {
</ins><span class="cx"> emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection.
</span><del>- emitGetGlobalProperty(operandSlot);
</del><ins>+ GPRReg base = regT2;
+ GPRReg resultTag = regT1;
+ GPRReg resultPayload = regT0;
+ GPRReg offset = regT3;
+
+ move(regT0, base);
+ load32(operandSlot, offset);
+ if (!ASSERT_DISABLED) {
+ Jump isOutOfLine = branch32(GreaterThanOrEqual, offset, TrustedImm32(firstOutOfLineOffset));
+ abortWithReason(JITOffsetIsNotOutOfLine);
+ isOutOfLine.link(this);
+ }
+ loadPtr(Address(base, JSObject::butterflyOffset()), base);
+ neg32(offset);
+ load32(BaseIndex(base, offset, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.payload) + (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), resultPayload);
+ load32(BaseIndex(base, offset, TimesEight, OBJECT_OFFSETOF(JSValue, u.asBits.tag) + (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue)), resultTag);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case GlobalVar:
</span><span class="cx"> case GlobalVarWithVarInjectionChecks:
</span><span class="cx"> case GlobalLexicalVar:
</span><span class="lines">@@ -926,17 +922,6 @@
</span><span class="cx"> callOperation(WithProfile, operationGetFromScope, dst, currentInstruction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emitPutGlobalProperty(uintptr_t* operandSlot, int value)
-{
- emitLoad(value, regT3, regT2);
-
- loadPtr(Address(regT0, JSObject::butterflyOffset()), regT0);
- loadPtr(operandSlot, regT1);
- negPtr(regT1);
- store32(regT3, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)));
- store32(regT2, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)));
-}
-
</del><span class="cx"> void JIT::emitPutGlobalVariable(JSValue* operand, int value, WatchpointSet* set)
</span><span class="cx"> {
</span><span class="cx"> emitLoad(value, regT1, regT0);
</span><span class="lines">@@ -977,11 +962,18 @@
</span><span class="cx"> auto emitCode = [&] (ResolveType resolveType, bool indirectLoadForOperand) {
</span><span class="cx"> switch (resolveType) {
</span><span class="cx"> case GlobalProperty:
</span><del>- case GlobalPropertyWithVarInjectionChecks:
</del><ins>+ case GlobalPropertyWithVarInjectionChecks: {
</ins><span class="cx"> emitWriteBarrier(m_codeBlock->globalObject(), value, ShouldFilterValue);
</span><span class="cx"> emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection.
</span><del>- emitPutGlobalProperty(operandSlot, value);
</del><ins>+ emitLoad(value, regT3, regT2);
+
+ loadPtr(Address(regT0, JSObject::butterflyOffset()), regT0);
+ loadPtr(operandSlot, regT1);
+ negPtr(regT1);
+ store32(regT3, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)));
+ store32(regT2, BaseIndex(regT0, regT1, TimesEight, (firstOutOfLineOffset - 2) * sizeof(EncodedJSValue) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)));
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case GlobalVar:
</span><span class="cx"> case GlobalVarWithVarInjectionChecks:
</span><span class="cx"> case GlobalLexicalVar:
</span></span></pre>
</div>
</div>
</body>
</html>