<!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>[207051] releases/WebKitGTK/webkit-2.14/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/207051">207051</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-10 23:36:49 -0700 (Mon, 10 Oct 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205656">r205656</a> - Add support for a ternary sub32 emitter for ARM64 and 32-bit ARM.
https://bugs.webkit.org/show_bug.cgi?id=161724

Reviewed by Filip Pizlo.

ARM architectures support ternary sub instructions.  We should make use of them
in emitAllocateWithNonNullAllocator().

* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::sub32):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::sub32):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::sub32):
* assembler/MacroAssemblerSH4.h:
(JSC::MacroAssemblerSH4::sub32):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::sub32):
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testTernarySubInstructionSelection):
(JSC::B3::run):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::emitAllocateWithNonNullAllocator):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARMh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARM64h">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARMv7h">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerSH4h">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreb3airAirOpcodeopcodes">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreb3testb3cpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/testb3.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCorejitAssemblyHelpersh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-09-08  Mark Lam  &lt;mark.lam@apple.com&gt;
+
+        Add support for a ternary sub32 emitter for ARM64 and 32-bit ARM.
+        https://bugs.webkit.org/show_bug.cgi?id=161724
+
+        Reviewed by Filip Pizlo.
+
+        ARM architectures support ternary sub instructions.  We should make use of them
+        in emitAllocateWithNonNullAllocator().
+
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::sub32):
+        * assembler/MacroAssemblerARM64.h:
+        (JSC::MacroAssemblerARM64::sub32):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::sub32):
+        * assembler/MacroAssemblerSH4.h:
+        (JSC::MacroAssemblerSH4::sub32):
+        * assembler/MacroAssemblerX86Common.h:
+        (JSC::MacroAssemblerX86Common::sub32):
+        * b3/air/AirOpcode.opcodes:
+        * b3/testb3.cpp:
+        (JSC::B3::testTernarySubInstructionSelection):
+        (JSC::B3::run):
+        * jit/AssemblyHelpers.h:
+        (JSC::AssemblyHelpers::emitAllocateWithNonNullAllocator):
+
</ins><span class="cx"> 2016-09-07  Andy VanWagoner  &lt;thetalecrafter@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [INTL] some valid language tags cause errors in Intl constructors
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2013-2015 Apple Inc.
</del><ins>+ * Copyright (C) 2008, 2013-2016 Apple Inc.
</ins><span class="cx">  * Copyright (C) 2009, 2010 University of Szeged
</span><span class="cx">  * All rights reserved.
</span><span class="cx">  *
</span><span class="lines">@@ -314,6 +314,11 @@
</span><span class="cx">         m_assembler.subs(dest, dest, src);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void sub32(RegisterID left, RegisterID right, RegisterID dest)
+    {
+        m_assembler.subs(dest, left, right);
+    }
+
</ins><span class="cx">     void sub32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         m_assembler.subs(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -705,6 +705,11 @@
</span><span class="cx">         m_assembler.sub&lt;32&gt;(dest, dest, src);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void sub32(RegisterID left, RegisterID right, RegisterID dest)
+    {
+        m_assembler.sub&lt;32&gt;(dest, left, right);
+    }
+
</ins><span class="cx">     void sub32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         if (isUInt12(imm.m_value)) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009-2010, 2014-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2010, 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx">  * Copyright (C) 2010 University of Szeged
</span><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -462,6 +462,11 @@
</span><span class="cx">         m_assembler.sub(dest, dest, src);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void sub32(RegisterID left, RegisterID right, RegisterID dest)
+    {
+        m_assembler.sub(dest, left, right);
+    }
+
</ins><span class="cx">     void sub32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         ARMThumbImmediate armImm = ARMThumbImmediate::makeUInt12OrEncodedImm(imm.m_value);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerSH4h"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2013 Cisco Systems, Inc. All rights reserved.
</span><span class="cx">  * Copyright (C) 2009-2011 STMicroelectronics. All rights reserved.
</span><del>- * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008, 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -419,6 +419,17 @@
</span><span class="cx">         m_assembler.sublRegReg(src, dest);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    void sub32(RegisterID left, RegisterID right, RegisterID dest)
+    {
+        if (dest == right) {
+            neg32(dest);
+            add32(left, dest);
+            return;
+        }
+        move(left, dest);
+        sub32(right, dest);
+    }
+
</ins><span class="cx">     void sub32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx">     {
</span><span class="cx">         if (!imm.m_value)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -560,7 +560,18 @@
</span><span class="cx">     {
</span><span class="cx">         m_assembler.subl_rr(src, dest);
</span><span class="cx">     }
</span><del>-    
</del><ins>+
+    void sub32(RegisterID left, RegisterID right, RegisterID dest)
+    {
+        if (dest == right) {
+            neg32(dest);
+            add32(left, dest);
+            return;
+        }
+        move(left, dest);
+        sub32(right, dest);
+    }
+
</ins><span class="cx">     void sub32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx">     {
</span><span class="cx">         if (imm.m_value == 1)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -170,6 +170,9 @@
</span><span class="cx">     x86: Addr, Tmp
</span><span class="cx">     x86: Tmp, Addr
</span><span class="cx"> 
</span><ins>+arm64: Sub32 U:G:32, U:G:32, D:G:32
+    Tmp, Tmp, Tmp
+
</ins><span class="cx"> 64: Sub64 U:G:64, UD:G:64
</span><span class="cx">     Tmp, Tmp
</span><span class="cx">     x86: Imm, Addr
</span><span class="lines">@@ -177,6 +180,9 @@
</span><span class="cx">     x86: Addr, Tmp
</span><span class="cx">     x86: Tmp, Addr
</span><span class="cx"> 
</span><ins>+arm64: Sub64 U:G:64, U:G:64, D:G:64
+    Tmp, Tmp, Tmp
+
</ins><span class="cx"> SubDouble U:F:64, U:F:64, D:F:64
</span><span class="cx">     arm64: Tmp, Tmp, Tmp
</span><span class="cx">     x86: Tmp, Addr, Tmp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/testb3.cpp (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/testb3.cpp        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/b3/testb3.cpp        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -2170,6 +2170,39 @@
</span><span class="cx">     CHECK(isIdentical(effect, static_cast&lt;double&gt;(a) - static_cast&lt;double&gt;(b)));
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void testTernarySubInstructionSelection(B3::Opcode valueModifier, Type valueType, Air::Opcode expectedOpcode)
+{
+    Procedure proc;
+    BasicBlock* root = proc.addBlock();
+
+    Value* left = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR0);
+    Value* right = root-&gt;appendNew&lt;ArgumentRegValue&gt;(proc, Origin(), GPRInfo::argumentGPR1);
+
+    if (valueModifier == Trunc) {
+        left = root-&gt;appendNew&lt;Value&gt;(proc, valueModifier, valueType, Origin(), left);
+        right = root-&gt;appendNew&lt;Value&gt;(proc, valueModifier, valueType, Origin(), right);
+    }
+
+    root-&gt;appendNewControlValue(
+        proc, Return, Origin(),
+        root-&gt;appendNew&lt;Value&gt;(proc, Sub, Origin(), left, right));
+
+    lowerToAirForTesting(proc);
+
+    auto block = proc.code()[0];
+    unsigned numberOfSubInstructions = 0;
+    for (auto instruction : *block) {
+        if (instruction.opcode == expectedOpcode) {
+            CHECK_EQ(instruction.args.size(), 3ul);
+            CHECK_EQ(instruction.args[0].kind(), Air::Arg::Tmp);
+            CHECK_EQ(instruction.args[1].kind(), Air::Arg::Tmp);
+            CHECK_EQ(instruction.args[2].kind(), Air::Arg::Tmp);
+            numberOfSubInstructions++;
+        }
+    }
+    CHECK_EQ(numberOfSubInstructions, 1ul);
+}
+
</ins><span class="cx"> void testNegDouble(double a)
</span><span class="cx"> {
</span><span class="cx">     Procedure proc;
</span><span class="lines">@@ -14425,6 +14458,11 @@
</span><span class="cx">         RUN(testBranchBitAndImmFusion(Load, Int64, 1, Air::BranchTest32, Air::Arg::Addr));
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (isARM64()) {
+        RUN(testTernarySubInstructionSelection(Identity, Int64, Air::Sub64));
+        RUN(testTernarySubInstructionSelection(Trunc, Int32, Air::Sub32));
+    }
+
</ins><span class="cx">     if (tasks.isEmpty())
</span><span class="cx">         usage();
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/jit/AssemblyHelpers.h (207050 => 207051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/jit/AssemblyHelpers.h        2016-10-11 06:23:49 UTC (rev 207050)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/jit/AssemblyHelpers.h        2016-10-11 06:36:49 UTC (rev 207051)
</span><span class="lines">@@ -1431,10 +1431,8 @@
</span><span class="cx">                 move(resultGPR, scratchGPR);
</span><span class="cx">                 sub32(Address(allocatorGPR, MarkedAllocator::offsetOfCellSize()), scratchGPR);
</span><span class="cx">             } else {
</span><del>-                // FIXME: We need a 3-operand sub, and ARM totally has it!
</del><span class="cx">                 load32(Address(allocatorGPR, MarkedAllocator::offsetOfCellSize()), scratchGPR);
</span><del>-                neg32(scratchGPR);
-                add32(resultGPR, scratchGPR);
</del><ins>+                sub32(resultGPR, scratchGPR, scratchGPR);
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         negPtr(resultGPR);
</span></span></pre>
</div>
</div>

</body>
</html>