<!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>[194707] 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/194707">194707</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 11:42:49 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ARMv7 or32(TrustedImm32, AbsoluteAddress) may have a bug with its use of dataTempRegister.
https://bugs.webkit.org/show_bug.cgi?id=152833
Reviewed by Benjamin Poulain.
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::or32):
- Added some assertions to make sure it is safe to use ARMRegisters::S0 as a temp.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::or32):
- Implement an optimization that avoids reloading the memoryTempRegister when
the immediate is encodable as an instruction immediate.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::or32):
- Added an assertion to make sure it is safe to use the dataTempRegister as a temp.
- Implement an optimization that avoids reloading the memoryTempRegister when
the immediate is encodable as an instruction immediate. In the event that we
cannot encode the immediate, we'll use the addressTempRegister as a temp, and
reload it later.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194706 => 194707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-07 19:40:46 UTC (rev 194706)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-07 19:42:49 UTC (rev 194707)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-07 Mark Lam <mark.lam@apple.com>
+
+ ARMv7 or32(TrustedImm32, AbsoluteAddress) may have a bug with its use of dataTempRegister.
+ https://bugs.webkit.org/show_bug.cgi?id=152833
+
+ Reviewed by Benjamin Poulain.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::or32):
+ - Added some assertions to make sure it is safe to use ARMRegisters::S0 as a temp.
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::or32):
+ - Implement an optimization that avoids reloading the memoryTempRegister when
+ the immediate is encodable as an instruction immediate.
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::or32):
+ - Added an assertion to make sure it is safe to use the dataTempRegister as a temp.
+ - Implement an optimization that avoids reloading the memoryTempRegister when
+ the immediate is encodable as an instruction immediate. In the event that we
+ cannot encode the immediate, we'll use the addressTempRegister as a temp, and
+ reload it later.
+
</ins><span class="cx"> 2016-01-07 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [CMake] JSC shell sources should include JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (194706 => 194707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2016-01-07 19:40:46 UTC (rev 194706)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2016-01-07 19:42:49 UTC (rev 194707)
</span><span class="lines">@@ -239,11 +239,13 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><ins>+ ASSERT(dest != ARMRegisters::S0);
</ins><span class="cx"> m_assembler.orrs(dest, dest, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><ins>+ ASSERT(src != ARMRegisters::S0);
</ins><span class="cx"> m_assembler.orrs(dest, src, m_assembler.getImm(imm.m_value, ARMRegisters::S0));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (194706 => 194707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-01-07 19:40:46 UTC (rev 194706)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-01-07 19:42:49 UTC (rev 194707)
</span><span class="lines">@@ -537,9 +537,16 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- load32(address.m_ptr, getCachedMemoryTempRegisterIDAndInvalidate());
- or32(imm, memoryTempRegister, memoryTempRegister);
- store32(memoryTempRegister, address.m_ptr);
</del><ins>+ LogicalImmediate logicalImm = LogicalImmediate::create32(imm.m_value);
+ if (logicalImm.isValid()) {
+ load32(address.m_ptr, getCachedDataTempRegisterIDAndInvalidate());
+ m_assembler.orr<32>(dataTempRegister, dataTempRegister, logicalImm);
+ store32(dataTempRegister, address.m_ptr);
+ } else {
+ load32(address.m_ptr, getCachedMemoryTempRegisterIDAndInvalidate());
+ or32(imm, memoryTempRegister, memoryTempRegister);
+ store32(memoryTempRegister, address.m_ptr);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, Address address)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (194706 => 194707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-01-07 19:40:46 UTC (rev 194706)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2016-01-07 19:42:49 UTC (rev 194707)
</span><span class="lines">@@ -354,10 +354,20 @@
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, AbsoluteAddress address)
</span><span class="cx"> {
</span><del>- move(TrustedImmPtr(address.m_ptr), addressTempRegister);
- load32(addressTempRegister, dataTempRegister);
- or32(imm, dataTempRegister, dataTempRegister);
- store32(dataTempRegister, addressTempRegister);
</del><ins>+ ARMThumbImmediate armImm = ARMThumbImmediate::makeEncodedImm(imm.m_value);
+ if (armImm.isValid()) {
+ move(TrustedImmPtr(address.m_ptr), addressTempRegister);
+ load32(addressTempRegister, dataTempRegister);
+ m_assembler.orr(dataTempRegister, dataTempRegister, armImm);
+ store32(dataTempRegister, addressTempRegister);
+ } else {
+ move(TrustedImmPtr(address.m_ptr), addressTempRegister);
+ load32(addressTempRegister, dataTempRegister);
+ move(imm, addressTempRegister);
+ m_assembler.orr(dataTempRegister, dataTempRegister, addressTempRegister);
+ move(TrustedImmPtr(address.m_ptr), addressTempRegister);
+ store32(dataTempRegister, addressTempRegister);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void or32(TrustedImm32 imm, Address address)
</span><span class="lines">@@ -383,6 +393,7 @@
</span><span class="cx"> if (armImm.isValid())
</span><span class="cx"> m_assembler.orr(dest, src, armImm);
</span><span class="cx"> else {
</span><ins>+ ASSERT(src != dataTempRegister);
</ins><span class="cx"> move(imm, dataTempRegister);
</span><span class="cx"> m_assembler.orr(dest, src, dataTempRegister);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>