<!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>[159855] 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/159855">159855</a></dd>
<dt>Author</dt> <dd>nrotem@apple.com</dd>
<dt>Date</dt> <dd>2013-11-28 12:33:44 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert the X86 assembler peephole changes
https://bugs.webkit.org/show_bug.cgi?id=124988
Reviewed by Csaba Osztrogonác.
* assembler/MacroAssemblerX86.h:
(JSC::MacroAssemblerX86::add32):
(JSC::MacroAssemblerX86::add64):
(JSC::MacroAssemblerX86::or32):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::add32):
(JSC::MacroAssemblerX86Common::or32):
(JSC::MacroAssemblerX86Common::branchAdd32):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::add32):
(JSC::MacroAssemblerX86_64::or32):
(JSC::MacroAssemblerX86_64::add64):
(JSC::MacroAssemblerX86_64::or64):
(JSC::MacroAssemblerX86_64::xor64):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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 (159854 => 159855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-11-28 20:33:44 UTC (rev 159855)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-11-28 Nadav Rotem <nrotem@apple.com>
+
+ Revert the X86 assembler peephole changes
+ https://bugs.webkit.org/show_bug.cgi?id=124988
+
+ Reviewed by Csaba Osztrogonác.
+
+ * assembler/MacroAssemblerX86.h:
+ (JSC::MacroAssemblerX86::add32):
+ (JSC::MacroAssemblerX86::add64):
+ (JSC::MacroAssemblerX86::or32):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::add32):
+ (JSC::MacroAssemblerX86Common::or32):
+ (JSC::MacroAssemblerX86Common::branchAdd32):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::add32):
+ (JSC::MacroAssemblerX86_64::or32):
+ (JSC::MacroAssemblerX86_64::add64):
+ (JSC::MacroAssemblerX86_64::or64):
+ (JSC::MacroAssemblerX86_64::xor64):
+
</ins><span class="cx"> 2013-11-28 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove feature: CSS variables
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (159854 => 159855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2013-11-28 20:33:44 UTC (rev 159855)
</span><span class="lines">@@ -62,14 +62,12 @@
</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)
- m_assembler.leal_mr(imm.m_value, src, dest);
</del><ins>+ m_assembler.leal_mr(imm.m_value, src, dest);
</ins><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)
- m_assembler.addl_im(imm.m_value, address.m_ptr);
</del><ins>+ m_assembler.addl_im(imm.m_value, address.m_ptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void add32(AbsoluteAddress address, RegisterID dest)
</span><span class="lines">@@ -79,8 +77,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"> m_assembler.addl_im(imm.m_value, address.m_ptr);
</span><span class="cx"> m_assembler.adcl_im(imm.m_value >> 31, reinterpret_cast<const char*>(address.m_ptr) + sizeof(int32_t));
</span><span class="cx"> }
</span><span class="lines">@@ -92,8 +88,7 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.orl_im(imm.m_value, address.m_ptr);
</del><ins>+ m_assembler.orl_im(imm.m_value, address.m_ptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(RegisterID reg, AbsoluteAddress address)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (159854 => 159855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2013-11-28 20:33:44 UTC (rev 159855)
</span><span class="lines">@@ -114,14 +114,11 @@
</span><span class="cx">
</span><span class="cx"> void add32(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.addl_im(imm.m_value, address.offset, address.base);
</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, RegisterID dest)
</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.inc_r(dest);
</span><span class="cx"> else
</span><span class="lines">@@ -140,8 +137,7 @@
</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)
- m_assembler.leal_mr(imm.m_value, src, dest);
</del><ins>+ m_assembler.leal_mr(imm.m_value, src, dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void and32(RegisterID src, RegisterID dest)
</span><span class="lines">@@ -256,8 +252,7 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.orl_ir(imm.m_value, dest);
</del><ins>+ m_assembler.orl_ir(imm.m_value, dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(RegisterID src, Address dest)
</span><span class="lines">@@ -272,8 +267,7 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, Address address)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.orl_im(imm.m_value, address.offset, address.base);
</del><ins>+ m_assembler.orl_im(imm.m_value, address.offset, address.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(RegisterID op1, RegisterID op2, RegisterID dest)
</span><span class="lines">@@ -1243,34 +1237,31 @@
</span><span class="cx">
</span><span class="cx"> Jump branchAdd32(ResultCondition cond, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.addl_rr(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="cx"> Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (imm.m_value == 1)
- m_assembler.inc_r(dest);
- else
- m_assembler.addl_ir(imm.m_value, 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>- m_assembler.addl_im(src.m_value, dest.offset, dest.base);
</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="cx"> Jump branchAdd32(ResultCondition cond, RegisterID src, Address dest)
</span><span class="cx"> {
</span><del>- m_assembler.addl_rm(src, dest.offset, dest.base);
</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="cx"> Jump branchAdd32(ResultCondition cond, Address src, RegisterID dest)
</span><span class="cx"> {
</span><del>- m_assembler.addl_mr(src.offset, src.base, 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></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (159854 => 159855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2013-11-28 19:43:50 UTC (rev 159854)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2013-11-28 20:33:44 UTC (rev 159855)
</span><span class="lines">@@ -59,8 +59,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">@@ -79,8 +77,6 @@
</span><span class="cx">
</span><span class="cx"> void or32(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"> or32(imm, Address(scratchRegister));
</span><span class="cx"> }
</span><span class="lines">@@ -200,8 +196,6 @@
</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;
</del><span class="cx"> if (imm.m_value == 1)
</span><span class="cx"> m_assembler.incq_r(srcDest);
</span><span class="cx"> else
</span><span class="lines">@@ -210,8 +204,6 @@
</span><span class="cx">
</span><span class="cx"> void add64(TrustedImm64 imm, RegisterID dest)
</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_r(dest);
</span><span class="cx"> else {
</span><span class="lines">@@ -222,20 +214,16 @@
</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)
- m_assembler.leaq_mr(imm.m_value, src, dest);
</del><ins>+ m_assembler.leaq_mr(imm.m_value, src, dest);
</ins><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)
- m_assembler.addq_im(imm.m_value, address.offset, address.base);
</del><ins>+ m_assembler.addq_im(imm.m_value, address.offset, address.base);
</ins><span class="cx"> }
</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">@@ -283,16 +271,13 @@
</span><span class="cx">
</span><span class="cx"> void or64(TrustedImm64 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
</del><span class="cx"> move(imm, scratchRegister);
</span><span class="cx"> or64(scratchRegister, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or64(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.orq_ir(imm.m_value, dest);
</del><ins>+ m_assembler.orq_ir(imm.m_value, dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or64(RegisterID op1, RegisterID op2, RegisterID dest)
</span><span class="lines">@@ -309,8 +294,6 @@
</span><span class="cx">
</span><span class="cx"> void or64(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><del>- if (!imm.m_value)
- return;
</del><span class="cx"> move(src, dest);
</span><span class="cx"> or64(imm, dest);
</span><span class="cx"> }
</span><span class="lines">@@ -355,8 +338,7 @@
</span><span class="cx">
</span><span class="cx"> void xor64(TrustedImm32 imm, RegisterID srcDest)
</span><span class="cx"> {
</span><del>- if (imm.m_value)
- m_assembler.xorq_ir(imm.m_value, srcDest);
</del><ins>+ m_assembler.xorq_ir(imm.m_value, srcDest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void load64(ImplicitAddress address, RegisterID dest)
</span></span></pre>
</div>
</div>
</body>
</html>