<!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>[194011] 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/194011">194011</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-12 15:04:54 -0800 (Sat, 12 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Add lowering for B3's Store8 opcode
https://bugs.webkit.org/show_bug.cgi?id=152208
Reviewed by Geoffrey Garen.
B3 has an opcode to store 8bit values but it had
no lowering.
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createStore):
(JSC::B3::Air::LowerToAir::lower):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testStore8Arg):
(JSC::B3::testStore8Imm):
(JSC::B3::testStorePartial8BitRegisterOnX86):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194010 => 194011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-12 22:03:09 UTC (rev 194010)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-12 23:04:54 UTC (rev 194011)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-12 Benjamin Poulain <benjamin@webkit.org>
+
+ [JSC] Add lowering for B3's Store8 opcode
+ https://bugs.webkit.org/show_bug.cgi?id=152208
+
+ Reviewed by Geoffrey Garen.
+
+ B3 has an opcode to store 8bit values but it had
+ no lowering.
+
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createStore):
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testStore8Arg):
+ (JSC::B3::testStore8Imm):
+ (JSC::B3::testStorePartial8BitRegisterOnX86):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2015-12-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ARM] Add the missing setupArgumentsWithExecState functions after r193974
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (194010 => 194011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-12 22:03:09 UTC (rev 194010)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-12 23:04:54 UTC (rev 194011)
</span><span class="lines">@@ -746,16 +746,20 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Inst createStore(Value* value, const Arg& dest)
</del><ins>+ Inst createStore(Air::Opcode move, Value* value, const Arg& dest)
</ins><span class="cx"> {
</span><del>- Air::Opcode move = moveForType(value->type());
-
</del><span class="cx"> if (imm(value) && isValidForm(move, Arg::Imm, dest.kind()))
</span><span class="cx"> return Inst(move, m_value, imm(value), dest);
</span><span class="cx">
</span><span class="cx"> return Inst(move, m_value, tmp(value), dest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Inst createStore(Value* value, const Arg& dest)
+ {
+ Air::Opcode moveOpcode = moveForType(value->type());
+ return createStore(moveOpcode, value, dest);
+ }
+
</ins><span class="cx"> void appendStore(Value* value, const Arg& dest)
</span><span class="cx"> {
</span><span class="cx"> m_insts.last().append(createStore(value, dest));
</span><span class="lines">@@ -1557,6 +1561,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case B3::Store8: {
+ Value* valueToStore = m_value->child(0);
+ m_insts.last().append(createStore(Air::Store8, valueToStore, addr(m_value)));
+ return;
+ }
+
</ins><span class="cx"> case Trunc: {
</span><span class="cx"> ASSERT(tmp(m_value->child(0)) == tmp(m_value));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194010 => 194011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-12-12 22:03:09 UTC (rev 194010)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-12-12 23:04:54 UTC (rev 194011)
</span><span class="lines">@@ -325,6 +325,12 @@
</span><span class="cx"> Addr, Tmp
</span><span class="cx"> Index, Tmp
</span><span class="cx">
</span><ins>+Store8 U:G, D:G
+ Tmp, Index
+ Tmp, Addr
+ Imm, Index
+ Imm, Addr
+
</ins><span class="cx"> Load8SignedExtendTo32 U:G, D:G
</span><span class="cx"> Addr, Tmp
</span><span class="cx"> Index, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194010 => 194011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-12 22:03:09 UTC (rev 194010)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-12 23:04:54 UTC (rev 194011)
</span><span class="lines">@@ -3704,6 +3704,135 @@
</span><span class="cx"> CHECK(slot == value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testStore8Arg()
+{
+ { // Direct addressing.
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ Value* value = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* address = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+
+ root->appendNew<MemoryValue>(proc, Store8, Origin(), value, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), value);
+
+ int8_t storage = 0;
+ CHECK(compileAndRun<int64_t>(proc, 42, &storage) == 42);
+ CHECK(storage == 42);
+ }
+
+ { // Indexed addressing.
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ Value* value = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* base = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ Value* offset = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR2);
+ Value* displacement = root->appendNew<Const64Value>(proc, Origin(), -1);
+
+ Value* baseDisplacement = root->appendNew<Value>(proc, Add, Origin(), displacement, base);
+ Value* address = root->appendNew<Value>(proc, Add, Origin(), baseDisplacement, offset);
+
+ root->appendNew<MemoryValue>(proc, Store8, Origin(), value, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), value);
+
+ int8_t storage = 0;
+ CHECK(compileAndRun<int64_t>(proc, 42, &storage, 1) == 42);
+ CHECK(storage == 42);
+ }
+}
+
+void testStore8Imm()
+{
+ { // Direct addressing.
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ Value* value = root->appendNew<Const32Value>(proc, Origin(), 42);
+ Value* address = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+
+ root->appendNew<MemoryValue>(proc, Store8, Origin(), value, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), value);
+
+ int8_t storage = 0;
+ CHECK(compileAndRun<int64_t>(proc, &storage) == 42);
+ CHECK(storage == 42);
+ }
+
+ { // Indexed addressing.
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ Value* value = root->appendNew<Const32Value>(proc, Origin(), 42);
+ Value* base = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* offset = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+ Value* displacement = root->appendNew<Const64Value>(proc, Origin(), -1);
+
+ Value* baseDisplacement = root->appendNew<Value>(proc, Add, Origin(), displacement, base);
+ Value* address = root->appendNew<Value>(proc, Add, Origin(), baseDisplacement, offset);
+
+ root->appendNew<MemoryValue>(proc, Store8, Origin(), value, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), value);
+
+ int8_t storage = 0;
+ CHECK(compileAndRun<int64_t>(proc, &storage, 1) == 42);
+ CHECK(storage == 42);
+ }
+}
+
+void testStorePartial8BitRegisterOnX86()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+
+ // We want to have this in ECX.
+ Value* returnValue = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+
+ // We want this suck in EDX.
+ Value* whereToStore = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
+
+ // The patch point is there to help us force the hand of the compiler.
+ PatchpointValue* patchpoint = root->appendNew<PatchpointValue>(proc, Int32, Origin());
+
+ // For the value above to be materialized and give the allocator
+ // a stronger insentive to name those register the way we need.
+ patchpoint->append(ConstrainedValue(returnValue, ValueRep(GPRInfo::regT3)));
+ patchpoint->append(ConstrainedValue(whereToStore, ValueRep(GPRInfo::regT2)));
+
+ // We'll produce EDI.
+ patchpoint->resultConstraint = ValueRep::reg(GPRInfo::regT6);
+
+ // Give the allocator a good reason not to use any other register.
+ RegisterSet clobberSet = RegisterSet::allGPRs();
+ clobberSet.exclude(RegisterSet::stackRegisters());
+ clobberSet.exclude(RegisterSet::reservedHardwareRegisters());
+ clobberSet.clear(GPRInfo::regT3);
+ clobberSet.clear(GPRInfo::regT2);
+ clobberSet.clear(GPRInfo::regT6);
+ patchpoint->clobberLate(clobberSet);
+
+ // Set EDI.
+ patchpoint->setGenerator(
+ [&] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+ jit.xor64(params[0].gpr(), params[0].gpr());
+ });
+
+ // If everything went well, we should have the big number in eax,
+ // patchpoint == EDI and whereToStore = EDX.
+ // Since EDI == 5, and AH = 5 on 8 bit store, this would go wrong
+ // if we use X86 partial registers.
+ root->appendNew<MemoryValue>(proc, Store8, Origin(), patchpoint, whereToStore);
+
+ root->appendNew<ControlValue>(proc, Return, Origin(), returnValue);
+
+ int8_t storage = 0xff;
+ CHECK(compileAndRun<int64_t>(proc, 0x12345678abcdef12, &storage) == 0x12345678abcdef12);
+ CHECK(!storage);
+}
+
</ins><span class="cx"> void testTrunc(int64_t value)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -8139,6 +8268,9 @@
</span><span class="cx"> RUN(testStore32(44));
</span><span class="cx"> RUN(testStoreConstant(49));
</span><span class="cx"> RUN(testStoreConstantPtr(49));
</span><ins>+ RUN(testStore8Arg());
+ RUN(testStore8Imm());
+ RUN(testStorePartial8BitRegisterOnX86());
</ins><span class="cx"> RUN(testTrunc((static_cast<int64_t>(1) << 40) + 42));
</span><span class="cx"> RUN(testAdd1(45));
</span><span class="cx"> RUN(testAdd1Ptr(51));
</span></span></pre>
</div>
</div>
</body>
</html>