<!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>[196152] 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/196152">196152</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-04 15:23:31 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(192409): Cannot rely on add32() to zero-extend
https://bugs.webkit.org/show_bug.cgi?id=153897
Unreviewed rollout of <a href="http://trac.webkit.org/projects/webkit/changeset/192409">r192409</a>.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::add32):
(JSC::MacroAssemblerARM64::add64):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::add32):
* assembler/MacroAssemblerX86.h:
(JSC::MacroAssemblerX86::add32):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::add32):
(JSC::MacroAssemblerX86Common::add8):
(JSC::MacroAssemblerX86Common::branchAdd32):
(JSC::MacroAssemblerX86Common::generateTest32):
(JSC::MacroAssemblerX86Common::clz32AfterBsr):
(JSC::MacroAssemblerX86Common::add32AndSetFlags): Deleted.
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::add32):
(JSC::MacroAssemblerX86_64::add64):
(JSC::MacroAssemblerX86_64::branchAdd64):
(JSC::MacroAssemblerX86_64::repatchCall):
(JSC::MacroAssemblerX86_64::clz64AfterBsr):
(JSC::MacroAssemblerX86_64::add64AndSetFlags): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-02-04 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(192409): Cannot rely on add32() to zero-extend
+ https://bugs.webkit.org/show_bug.cgi?id=153897
+
+ Unreviewed rollout of r192409.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::add32):
+ (JSC::MacroAssemblerARM64::add64):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::add32):
+ * assembler/MacroAssemblerX86.h:
+ (JSC::MacroAssemblerX86::add32):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::add32):
+ (JSC::MacroAssemblerX86Common::add8):
+ (JSC::MacroAssemblerX86Common::branchAdd32):
+ (JSC::MacroAssemblerX86Common::generateTest32):
+ (JSC::MacroAssemblerX86Common::clz32AfterBsr):
+ (JSC::MacroAssemblerX86Common::add32AndSetFlags): Deleted.
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::add32):
+ (JSC::MacroAssemblerX86_64::add64):
+ (JSC::MacroAssemblerX86_64::branchAdd64):
+ (JSC::MacroAssemblerX86_64::repatchCall):
+ (JSC::MacroAssemblerX86_64::clz64AfterBsr):
+ (JSC::MacroAssemblerX86_64::add64AndSetFlags): Deleted.
+
</ins><span class="cx"> 2016-02-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove dead ENABLE(BYTECODE_COMMENTS) cruft.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -153,19 +153,11 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> add32(imm, dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value) {
- move(src, dest);
- return;
- }
-
</del><span class="cx"> if (isUInt12(imm.m_value))
</span><span class="cx"> m_assembler.add<32>(dest, src, UInt12(imm.m_value));
</span><span class="cx"> else if (isUInt12(-imm.m_value))
</span><span class="lines">@@ -178,9 +170,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load32(address, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">
</span><span class="cx"> if (isUInt12(imm.m_value))
</span><span class="lines">@@ -197,9 +186,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load32(address.m_ptr, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">
</span><span class="cx"> if (isUInt12(imm.m_value)) {
</span><span class="lines">@@ -243,9 +229,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> if (isUInt12(imm.m_value)) {
</span><span class="cx"> m_assembler.add<64>(dest, dest, UInt12(imm.m_value));
</span><span class="cx"> return;
</span><span class="lines">@@ -262,8 +245,6 @@
</span><span class="cx"> void add64(TrustedImm64 imm, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> intptr_t immediate = imm.m_value;
</span><del>- if (!immediate)
- return;
</del><span class="cx">
</span><span class="cx"> if (isUInt12(immediate)) {
</span><span class="cx"> m_assembler.add<64>(dest, dest, UInt12(static_cast<int32_t>(immediate)));
</span><span class="lines">@@ -280,11 +261,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value) {
- move(src, dest);
- return;
- }
-
</del><span class="cx"> if (isUInt12(imm.m_value)) {
</span><span class="cx"> m_assembler.add<64>(dest, src, UInt12(imm.m_value));
</span><span class="cx"> return;
</span><span class="lines">@@ -300,9 +276,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load64(address, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">
</span><span class="cx"> if (isUInt12(imm.m_value))
</span><span class="lines">@@ -319,9 +292,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load64(address.m_ptr, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="cx">
</span><span class="cx"> if (isUInt12(imm.m_value)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -168,11 +168,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value) {
- move(src, dest);
- return;
- }
-
</del><span class="cx"> ARMThumbImmediate armImm = ARMThumbImmediate::makeUInt12OrEncodedImm(imm.m_value);
</span><span class="cx">
</span><span class="cx"> // For adds with stack pointer destination, moving the src first to sp is
</span><span class="lines">@@ -192,9 +187,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load32(address, dataTempRegister);
</span><span class="cx">
</span><span class="cx"> ARMThumbImmediate armImm = ARMThumbImmediate::makeUInt12OrEncodedImm(imm.m_value);
</span><span class="lines">@@ -218,9 +210,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> load32(address.m_ptr, dataTempRegister);
</span><span class="cx">
</span><span class="cx"> ARMThumbImmediate armImm = ARMThumbImmediate::makeUInt12OrEncodedImm(imm.m_value);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -58,19 +58,11 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value) {
- move(src, dest);
- return;
- }
-
</del><span class="cx"> m_assembler.leal_mr(imm.m_value, src, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> m_assembler.addl_im(imm.m_value, address.m_ptr);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -124,16 +124,12 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
- add32AndSetFlags(imm, address);
</del><ins>+ m_assembler.addl_im(imm.m_value, address.offset, address.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, BaseIndex address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
- add32AndSetFlags(imm, address);
</del><ins>+ m_assembler.addl_im(imm.m_value, address.offset, address.base, address.index, address.scale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add8(TrustedImm32 imm, Address address)
</span><span class="lines">@@ -158,9 +154,10 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
- add32AndSetFlags(imm, dest);
</del><ins>+ if (imm.m_value == 1)
+ m_assembler.inc_r(dest);
+ else
+ m_assembler.addl_ir(imm.m_value, dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add32(Address src, RegisterID dest)
</span><span class="lines">@@ -1684,13 +1681,13 @@
</span><span class="cx">
</span><span class="cx"> Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- add32AndSetFlags(imm, dest);
</del><ins>+ add32(imm, dest);
</ins><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Jump branchAdd32(ResultCondition cond, TrustedImm32 src, Address dest)
</span><span class="cx"> {
</span><del>- add32AndSetFlags(src, dest);
</del><ins>+ add32(src, dest);
</ins><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2054,24 +2051,6 @@
</span><span class="cx"> m_assembler.testl_i32m(mask.m_value, address.offset, address.base);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void add32AndSetFlags(TrustedImm32 imm, RegisterID dest)
- {
- if (imm.m_value == 1)
- m_assembler.inc_r(dest);
- else
- m_assembler.addl_ir(imm.m_value, dest);
- }
-
- void add32AndSetFlags(TrustedImm32 imm, Address address)
- {
- m_assembler.addl_im(imm.m_value, address.offset, address.base);
- }
-
- void add32AndSetFlags(TrustedImm32 imm, BaseIndex address)
- {
- m_assembler.addl_im(imm.m_value, address.offset, address.base, address.index, address.scale);
- }
-
</del><span class="cx"> // If lzcnt is not available, use this after BSR
</span><span class="cx"> // to count the leading zeros.
</span><span class="cx"> void clz32AfterBsr(RegisterID dst)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (196151 => 196152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-02-04 23:13:46 UTC (rev 196151)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-02-04 23:23:31 UTC (rev 196152)
</span><span class="lines">@@ -57,9 +57,6 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> move(TrustedImmPtr(address.m_ptr), scratchRegister());
</span><span class="cx"> add32(imm, Address(scratchRegister()));
</span><span class="cx"> }
</span><span class="lines">@@ -276,33 +273,29 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, RegisterID srcDest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
- add64AndSetFlags(imm, srcDest);
</del><ins>+ if (imm.m_value == 1)
+ m_assembler.incq_r(srcDest);
+ else
+ m_assembler.addq_ir(imm.m_value, srcDest);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void add64(TrustedImm64 imm, RegisterID srcDest)
</del><ins>+ void add64(TrustedImm64 imm, RegisterID dest)
</ins><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
- add64AndSetFlags(imm, srcDest);
</del><ins>+ if (imm.m_value == 1)
+ m_assembler.incq_r(dest);
+ else {
+ move(imm, scratchRegister());
+ add64(scratchRegister(), dest);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value) {
- move(src, dest);
- return;
- }
-
</del><span class="cx"> m_assembler.leaq_mr(imm.m_value, src, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> if (imm.m_value == 1)
</span><span class="cx"> m_assembler.incq_m(address.offset, address.base);
</span><span class="cx"> else
</span><span class="lines">@@ -311,9 +304,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
-
</del><span class="cx"> move(TrustedImmPtr(address.m_ptr), scratchRegister());
</span><span class="cx"> add64(imm, Address(scratchRegister()));
</span><span class="cx"> }
</span><span class="lines">@@ -873,7 +863,7 @@
</span><span class="cx">
</span><span class="cx"> Jump branchAdd64(ResultCondition cond, TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- add64AndSetFlags(imm, dest);
</del><ins>+ add64(imm, dest);
</ins><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1115,24 +1105,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void add64AndSetFlags(TrustedImm32 imm, RegisterID srcDest)
- {
- if (imm.m_value == 1)
- m_assembler.incq_r(srcDest);
- else
- m_assembler.addq_ir(imm.m_value, srcDest);
- }
-
- void add64AndSetFlags(TrustedImm64 imm, RegisterID dest)
- {
- if (imm.m_value == 1)
- m_assembler.incq_r(dest);
- else {
- move(imm, scratchRegister());
- add64(scratchRegister(), dest);
- }
- }
-
</del><span class="cx"> // If lzcnt is not available, use this after BSR
</span><span class="cx"> // to count the leading zeros.
</span><span class="cx"> void clz64AfterBsr(RegisterID dst)
</span></span></pre>
</div>
</div>
</body>
</html>