<!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>[192696] 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/192696">192696</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-20 14:07:05 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Add Air lowering to BitNot() for Xor(value, -1)
https://bugs.webkit.org/show_bug.cgi?id=151474
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-11-20
Reviewed by Filip Pizlo.
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::not32):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::not64):
* assembler/X86Assembler.h:
(JSC::X86Assembler::notq_r):
(JSC::X86Assembler::notq_m):
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createGenericCompare):
(JSC::B3::Air::LowerToAir::lower):
* b3/B3ReduceStrength.cpp:
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testNegValueSubOne):
(JSC::B3::testNegValueSubOne32):
(JSC::B3::testBitNotArg):
(JSC::B3::testBitNotImm):
(JSC::B3::testBitNotMem):
(JSC::B3::testBitNotArg32):
(JSC::B3::testBitNotImm32):
(JSC::B3::testBitNotMem32):
(JSC::B3::testBitNotOnBooleanAndBranch32):
(JSC::B3::int64Operands):
(JSC::B3::int32Operands):
(JSC::B3::run):
* ftl/FTLB3Output.h:
(JSC::FTL::Output::bitNot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp">trunk/Source/JavaScriptCore/b3/B3ReduceStrength.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>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-11-20 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Add Air lowering to BitNot() for Xor(value, -1)
+ https://bugs.webkit.org/show_bug.cgi?id=151474
+
+ Reviewed by Filip Pizlo.
+
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::not32):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::not64):
+ * assembler/X86Assembler.h:
+ (JSC::X86Assembler::notq_r):
+ (JSC::X86Assembler::notq_m):
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createGenericCompare):
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/B3ReduceStrength.cpp:
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testNegValueSubOne):
+ (JSC::B3::testNegValueSubOne32):
+ (JSC::B3::testBitNotArg):
+ (JSC::B3::testBitNotImm):
+ (JSC::B3::testBitNotMem):
+ (JSC::B3::testBitNotArg32):
+ (JSC::B3::testBitNotImm32):
+ (JSC::B3::testBitNotMem32):
+ (JSC::B3::testBitNotOnBooleanAndBranch32):
+ (JSC::B3::int64Operands):
+ (JSC::B3::int32Operands):
+ (JSC::B3::run):
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::bitNot):
+
</ins><span class="cx"> 2015-11-20 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Super use should be recorded in per-function scope
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -481,6 +481,16 @@
</span><span class="cx"> xor32(imm, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void not32(RegisterID srcDest)
+ {
+ m_assembler.notl_r(srcDest);
+ }
+
+ void not32(Address dest)
+ {
+ m_assembler.notl_m(dest.offset, dest.base);
+ }
+
</ins><span class="cx"> void sqrtDouble(FPRegisterID src, FPRegisterID dst)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.sqrtsd_rr(src, dst);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -502,6 +502,16 @@
</span><span class="cx"> m_assembler.xorq_ir(imm.m_value, srcDest);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void not64(RegisterID srcDest)
+ {
+ m_assembler.notq_r(srcDest);
+ }
+
+ void not64(Address dest)
+ {
+ m_assembler.notq_m(dest.offset, dest.base);
+ }
+
</ins><span class="cx"> void load64(ImplicitAddress address, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.movq_mr(address.offset, address.base, dest);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -622,6 +622,18 @@
</span><span class="cx"> m_formatter.oneByteOp(OP_GROUP3_Ev, GROUP3_OP_NOT, base, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if CPU(X86_64)
+ void notq_r(RegisterID dst)
+ {
+ m_formatter.oneByteOp64(OP_GROUP3_Ev, GROUP3_OP_NOT, dst);
+ }
+
+ void notq_m(int offset, RegisterID base)
+ {
+ m_formatter.oneByteOp64(OP_GROUP3_Ev, GROUP3_OP_NOT, base, offset);
+ }
+#endif
+
</ins><span class="cx"> void orl_rr(RegisterID src, RegisterID dst)
</span><span class="cx"> {
</span><span class="cx"> m_formatter.oneByteOp(OP_OR_EvGv, src, dst);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -804,7 +804,7 @@
</span><span class="cx"> if (!canBeInternal(value) && value != m_value)
</span><span class="cx"> break;
</span><span class="cx"> bool shouldInvert =
</span><del>- (value->opcode() == BitXor && value->child(1)->isInt(1) && value->child(0)->returnsBool())
</del><ins>+ (value->opcode() == BitXor && value->child(1)->hasInt() && (value->child(1)->asInt() & 1) && value->child(0)->returnsBool())
</ins><span class="cx"> || (value->opcode() == Equal && value->child(1)->isInt(0));
</span><span class="cx"> if (!shouldInvert)
</span><span class="cx"> break;
</span><span class="lines">@@ -1315,6 +1315,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case BitXor: {
</span><ins>+ if (m_value->child(1)->isInt(-1)) {
+ appendUnOp<Not32, Not64, Air::Oops>(m_value->child(0));
+ return;
+ }
</ins><span class="cx"> appendBinOp<Xor32, Xor64, Air::Oops, Commutative>(
</span><span class="cx"> m_value->child(0), m_value->child(1));
</span><span class="cx"> return;
</span><span class="lines">@@ -1370,6 +1374,14 @@
</span><span class="cx"> matched = tryAppendStoreBinOp<And32, And64, Commutative>(
</span><span class="cx"> valueToStore->child(0), valueToStore->child(1));
</span><span class="cx"> break;
</span><ins>+ case BitXor:
+ if (valueToStore->child(1)->isInt(-1)) {
+ matched = tryAppendStoreUnOp<Not32, Not64>(valueToStore->child(0));
+ break;
+ }
+ matched = tryAppendStoreBinOp<Xor32, Xor64, Commutative>(
+ valueToStore->child(0), valueToStore->child(1));
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceStrengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceStrength.cpp 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -180,6 +180,17 @@
</span><span class="cx"> m_changed = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ // Turn this: Integer Add(Sub(0, value), -1)
+ // Into this: BitXor(value, -1)
+ if (m_value->isInteger()
+ && m_value->child(0)->opcode() == Sub
+ && m_value->child(1)->isInt(-1)
+ && m_value->child(0)->child(0)->isInt(0)) {
+ replaceWithNewValue(m_proc.add<Value>(BitXor, m_value->origin(), m_value->child(0)->child(1), m_value->child(1)));
+ break;
+ }
+
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Sub:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -195,6 +195,14 @@
</span><span class="cx"> Tmp, Addr
</span><span class="cx"> Imm, Tmp
</span><span class="cx">
</span><ins>+Not32 UD:G
+ Tmp
+ Addr
+
+Not64 UD:G
+ Tmp
+ Addr
+
</ins><span class="cx"> ConvertInt32ToDouble U:G, D:F
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> Addr, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -600,6 +600,21 @@
</span><span class="cx"> CHECK(compileAndRun<int64_t>(proc, a) == a - b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testNegValueSubOne(int a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* argument = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* negArgument = root->appendNew<Value>(proc, Sub, Origin(),
+ root->appendNew<Const64Value>(proc, Origin(), 0),
+ argument);
+ Value* negArgumentMinusOne = root->appendNew<Value>(proc, Sub, Origin(),
+ negArgument,
+ root->appendNew<Const64Value>(proc, Origin(), 1));
+ root->appendNew<ControlValue>(proc, Return, Origin(), negArgumentMinusOne);
+ CHECK(compileAndRun<int>(proc, a) == -a - 1);
+}
+
</ins><span class="cx"> void testSubImmArg(int a, int b)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -664,6 +679,22 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc, b) == a - b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testNegValueSubOne32(int a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* argument = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* negArgument = root->appendNew<Value>(proc, Sub, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), 0),
+ argument);
+ Value* negArgumentMinusOne = root->appendNew<Value>(proc, Sub, Origin(),
+ negArgument,
+ root->appendNew<Const32Value>(proc, Origin(), 1));
+ root->appendNew<ControlValue>(proc, Return, Origin(), negArgumentMinusOne);
+ CHECK(compileAndRun<int>(proc, a) == -a - 1);
+}
+
</ins><span class="cx"> void testSubArgDouble(double a)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -1411,6 +1442,129 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc, b) == (a ^ (b ^ c)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testBitNotArg(int64_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, BitXor, Origin(),
+ root->appendNew<Const64Value>(proc, Origin(), -1),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)));
+
+ CHECK(isIdentical(compileAndRun<int64_t>(proc, a), static_cast<int64_t>((static_cast<uint64_t>(a) ^ 0xffffffffffffffff))));
+}
+
+void testBitNotImm(int64_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, BitXor, Origin(),
+ root->appendNew<Const64Value>(proc, Origin(), -1),
+ root->appendNew<Const64Value>(proc, Origin(), a)));
+
+ CHECK(isIdentical(compileAndRun<int64_t>(proc, a), static_cast<int64_t>((static_cast<uint64_t>(a) ^ 0xffffffffffffffff))));
+}
+
+void testBitNotMem(int64_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* address = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ MemoryValue* load = root->appendNew<MemoryValue>(proc, Load, Int64, Origin(), address);
+ Value* notLoad = root->appendNew<Value>(proc, BitXor, Origin(),
+ root->appendNew<Const64Value>(proc, Origin(), -1),
+ load);
+ root->appendNew<MemoryValue>(proc, Store, Origin(), notLoad, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), root->appendNew<Const32Value>(proc, Origin(), 0));
+
+ int64_t input = a;
+ compileAndRun<int32_t>(proc, &input);
+ CHECK(isIdentical(input, static_cast<int64_t>((static_cast<uint64_t>(a) ^ 0xffffffffffffffff))));
+}
+
+void testBitNotArg32(int32_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* argument = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, BitXor, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), -1),
+ argument));
+ CHECK(isIdentical(compileAndRun<int32_t>(proc, a), static_cast<int32_t>((static_cast<uint32_t>(a) ^ 0xffffffff))));
+}
+
+void testBitNotImm32(int32_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, BitXor, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), -1),
+ root->appendNew<Const32Value>(proc, Origin(), a)));
+
+ CHECK(isIdentical(compileAndRun<int32_t>(proc, a), static_cast<int32_t>((static_cast<uint32_t>(a) ^ 0xffffffff))));
+}
+
+void testBitNotMem32(int32_t a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* address = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ MemoryValue* load = root->appendNew<MemoryValue>(proc, Load, Int32, Origin(), address);
+ Value* notLoad = root->appendNew<Value>(proc, BitXor, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), -1),
+ load);
+ root->appendNew<MemoryValue>(proc, Store, Origin(), notLoad, address);
+ root->appendNew<ControlValue>(proc, Return, Origin(), root->appendNew<Const32Value>(proc, Origin(), 0));
+
+ int32_t input = a;
+ compileAndRun<int32_t>(proc, &input);
+ CHECK(isIdentical(input, static_cast<int32_t>((static_cast<uint32_t>(a) ^ 0xffffffff))));
+}
+
+void testBitNotOnBooleanAndBranch32(int64_t a, int64_t b)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ Value* arg1 = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* arg2 = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1));
+ Value* argsAreEqual = root->appendNew<Value>(proc, Equal, Origin(), arg1, arg2);
+ Value* argsAreNotEqual = root->appendNew<Value>(proc, BitXor, Origin(),
+ root->appendNew<Const32Value>(proc, Origin(), -1),
+ argsAreEqual);
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ argsAreNotEqual,
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 42));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), -42));
+
+ int32_t expectedValue = (a != b) ? 42 : -42;
+ CHECK(compileAndRun<int32_t>(proc, a, b) == expectedValue);
+}
+
</ins><span class="cx"> void testShlArgs(int64_t a, int64_t b)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -4762,6 +4916,7 @@
</span><span class="cx">
</span><span class="cx"> typedef Operand<double> DoubleOperand;
</span><span class="cx"> typedef Operand<int64_t> Int64Operand;
</span><ins>+typedef Operand<int32_t> Int32Operand;
</ins><span class="cx">
</span><span class="cx"> static const std::array<DoubleOperand, 9>& doubleOperands()
</span><span class="cx"> {
</span><span class="lines">@@ -4784,9 +4939,30 @@
</span><span class="cx"> Vector<Int64Operand> operands;
</span><span class="cx"> for (DoubleOperand doubleOperand : doubleOperands())
</span><span class="cx"> operands.append({ doubleOperand.name, bitwise_cast<int64_t>(doubleOperand.value) });
</span><ins>+ operands.append({ "1", 1 });
+ operands.append({ "-1", -1 });
+ operands.append({ "int64-max", std::numeric_limits<int64_t>::max() });
+ operands.append({ "int64-min", std::numeric_limits<int64_t>::min() });
+ operands.append({ "int32-max", std::numeric_limits<int32_t>::max() });
+ operands.append({ "int32-min", std::numeric_limits<int32_t>::min() });
+
</ins><span class="cx"> return operands;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Vector<Int32Operand> int32Operands()
+{
+ Vector<Int32Operand> operands({
+ { "0", 0 },
+ { "1", 1 },
+ { "-1", -1 },
+ { "42", 42 },
+ { "-42", -42 },
+ { "int32-max", std::numeric_limits<int32_t>::max() },
+ { "int32-min", std::numeric_limits<int32_t>::min() }
+ });
+ return operands;
+}
+
</ins><span class="cx"> #define RUN(test) do { \
</span><span class="cx"> if (!shouldRun(#test)) \
</span><span class="cx"> break; \
</span><span class="lines">@@ -4965,6 +5141,7 @@
</span><span class="cx"> RUN(testSubImmArg(1, 2));
</span><span class="cx"> RUN(testSubImmArg(13, -42));
</span><span class="cx"> RUN(testSubImmArg(-13, 42));
</span><ins>+ RUN_UNARY(testNegValueSubOne, int32Operands());
</ins><span class="cx">
</span><span class="cx"> RUN(testSubArgs32(1, 1));
</span><span class="cx"> RUN(testSubArgs32(1, 2));
</span><span class="lines">@@ -4978,6 +5155,7 @@
</span><span class="cx"> RUN(testSubImmArg32(1, 2));
</span><span class="cx"> RUN(testSubImmArg32(13, -42));
</span><span class="cx"> RUN(testSubImmArg32(-13, 42));
</span><ins>+ RUN_UNARY(testNegValueSubOne32, int64Operands());
</ins><span class="cx">
</span><span class="cx"> RUN_UNARY(testSubArgDouble, doubleOperands());
</span><span class="cx"> RUN_BINARY(testSubArgsDouble, doubleOperands(), doubleOperands());
</span><span class="lines">@@ -5091,26 +5269,11 @@
</span><span class="cx"> RUN(testBitOrImmBitOrArgImm32(6, 1, 6));
</span><span class="cx"> RUN(testBitOrImmBitOrArgImm32(24, 0xffff, 7));
</span><span class="cx">
</span><del>- RUN(testBitXorArgs(43, 43));
- RUN(testBitXorArgs(43, 0));
- RUN(testBitXorArgs(10, 3));
- RUN(testBitXorArgs(42, 0xffffffffffffffff));
- RUN(testBitXorSameArg(43));
- RUN(testBitXorSameArg(0));
- RUN(testBitXorSameArg(3));
- RUN(testBitXorSameArg(0xffffffffffffffff));
- RUN(testBitXorImms(43, 43));
- RUN(testBitXorImms(43, 0));
- RUN(testBitXorImms(10, 3));
- RUN(testBitXorImms(42, 0xffffffffffffffff));
- RUN(testBitXorArgImm(43, 43));
- RUN(testBitXorArgImm(43, 0));
- RUN(testBitXorArgImm(10, 3));
- RUN(testBitXorArgImm(42, 0xffffffffffffffff));
- RUN(testBitXorImmArg(43, 43));
- RUN(testBitXorImmArg(43, 0));
- RUN(testBitXorImmArg(10, 3));
- RUN(testBitXorImmArg(42, 0xffffffffffffffff));
</del><ins>+ RUN_BINARY(testBitXorArgs, int64Operands(), int64Operands());
+ RUN_UNARY(testBitXorSameArg, int64Operands());
+ RUN_BINARY(testBitXorImms, int64Operands(), int64Operands());
+ RUN_BINARY(testBitXorArgImm, int64Operands(), int64Operands());
+ RUN_BINARY(testBitXorImmArg, int64Operands(), int64Operands());
</ins><span class="cx"> RUN(testBitXorBitXorArgImmImm(2, 7, 3));
</span><span class="cx"> RUN(testBitXorBitXorArgImmImm(1, 6, 6));
</span><span class="cx"> RUN(testBitXorBitXorArgImmImm(0xffff, 24, 7));
</span><span class="lines">@@ -5144,6 +5307,14 @@
</span><span class="cx"> RUN(testBitXorImmBitXorArgImm32(6, 1, 6));
</span><span class="cx"> RUN(testBitXorImmBitXorArgImm32(24, 0xffff, 7));
</span><span class="cx">
</span><ins>+ RUN_UNARY(testBitNotArg, int64Operands());
+ RUN_UNARY(testBitNotImm, int64Operands());
+ RUN_UNARY(testBitNotMem, int64Operands());
+ RUN_UNARY(testBitNotArg32, int32Operands());
+ RUN_UNARY(testBitNotImm32, int32Operands());
+ RUN_UNARY(testBitNotMem32, int32Operands());
+ RUN_BINARY(testBitNotOnBooleanAndBranch32, int32Operands(), int32Operands());
+
</ins><span class="cx"> RUN(testShlArgs(1, 0));
</span><span class="cx"> RUN(testShlArgs(1, 1));
</span><span class="cx"> RUN(testShlArgs(1, 62));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (192695 => 192696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-20 21:19:57 UTC (rev 192695)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-11-20 22:07:05 UTC (rev 192696)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> LValue shl(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::Shl, origin(), left, castToInt32(right)); }
</span><span class="cx"> LValue aShr(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::SShr, origin(), left, castToInt32(right)); }
</span><span class="cx"> LValue lShr(LValue left, LValue right) { return m_block->appendNew<B3::Value>(m_proc, B3::ZShr, origin(), left, castToInt32(right)); }
</span><del>- LValue bitNot(LValue value) { CRASH(); }
</del><ins>+ LValue bitNot(LValue);
</ins><span class="cx">
</span><span class="cx"> LValue insertElement(LValue vector, LValue element, LValue index) { CRASH(); }
</span><span class="cx">
</span><span class="lines">@@ -475,6 +475,13 @@
</span><span class="cx"> addIncomingToPhi(phi, theRest...);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline LValue Output::bitNot(LValue value)
+{
+ return m_block->appendNew<B3::Value>(m_proc, B3::BitXor, origin(),
+ value,
+ m_block->appendIntConstant(m_proc, origin(), value->type(), -1));
+}
+
</ins><span class="cx"> inline LValue Output::bitCast(LValue value, LType type)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(type, type == int64 || type == doubleType);
</span></span></pre>
</div>
</div>
</body>
</html>