<!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>[170909] 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/170909">170909</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-08 22:13:01 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore the assertion changed with 170839
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::pop):
(JSC::ARMv7Assembler::push):
Revert the Assembler part of 170839. The assertions do not match both encoding.
I'll add specific version of push and pop instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.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 (170908 => 170909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 04:53:03 UTC (rev 170908)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-09 05:13:01 UTC (rev 170909)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-08 Benjamin Poulain <benjamin@webkit.org>
+
+ Restore the assertion changed with 170839
+
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::pop):
+ (JSC::ARMv7Assembler::push):
+ Revert the Assembler part of 170839. The assertions do not match both encoding.
+
+ I'll add specific version of push and pop instead.
+
</ins><span class="cx"> 2014-07-08 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> RemoteInspector::shared() should not call WTF::initializeMainThread()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (170908 => 170909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-07-09 04:53:03 UTC (rev 170908)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-07-09 05:13:01 UTC (rev 170909)
</span><span class="lines">@@ -1502,16 +1502,9 @@
</span><span class="cx"> ALWAYS_INLINE void pop(uint32_t registerList)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WTF::bitCount(registerList) > 1);
</span><del>- ASSERT(!((1 << ARMRegisters::lr) & registerList));
</del><ins>+ ASSERT(!((1 << ARMRegisters::pc) & registerList) || !((1 << ARMRegisters::lr) & registerList));
</ins><span class="cx"> ASSERT(!((1 << ARMRegisters::sp) & registerList));
</span><del>-
- // It is possible to restore the PC with thumb, but that is not used by the MacroAssembler.
- ASSERT(!((1 << ARMRegisters::pc) & registerList));
-
- if (registerList & ~(0xff))
- m_formatter.twoWordOp16Imm16(OP_POP_T2, registerList);
- else
- m_formatter.oneWordOp7Imm9(OP_POP_T1, registerList & 0xff);
</del><ins>+ m_formatter.twoWordOp16Imm16(OP_POP_T2, registerList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE void push(uint32_t registerList)
</span><span class="lines">@@ -1519,18 +1512,7 @@
</span><span class="cx"> ASSERT(WTF::bitCount(registerList) > 1);
</span><span class="cx"> ASSERT(!((1 << ARMRegisters::pc) & registerList));
</span><span class="cx"> ASSERT(!((1 << ARMRegisters::sp) & registerList));
</span><del>- uint32_t lrMask = 1 << ARMRegisters::lr;
- if (registerList & ~(0xff | lrMask))
- m_formatter.twoWordOp16Imm16(OP_PUSH_T2, registerList);
- else {
- uint16_t t1RegisterList = registerList & 0xff;
-
- // For T1 PUSH, the M field encodes LR.
- if (registerList & lrMask)
- t1RegisterList |= 0x100;
- ASSERT(WTF::bitCount(static_cast<unsigned>(t1RegisterList)) > 1);
- m_formatter.oneWordOp7Imm9(OP_PUSH_T1, t1RegisterList);
- }
</del><ins>+ m_formatter.twoWordOp16Imm16(OP_PUSH_T2, registerList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if CPU(APPLE_ARMV7S)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (170908 => 170909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-07-09 04:53:03 UTC (rev 170908)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-07-09 05:13:01 UTC (rev 170909)
</span><span class="lines">@@ -1182,15 +1182,13 @@
</span><span class="cx"> void pop(RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> // Load postindexed with writeback.
</span><del>- if (dest == ARMRegisters::lr)
- m_assembler.ldr(dest, ARMRegisters::sp, sizeof(void*), false, true);
- else
- m_assembler.pop(1 << dest);
</del><ins>+ m_assembler.ldr(dest, ARMRegisters::sp, sizeof(void*), false, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void push(RegisterID src)
</span><span class="cx"> {
</span><del>- m_assembler.push(1 << src);
</del><ins>+ // Store preindexed with writeback.
+ m_assembler.str(src, ARMRegisters::sp, -sizeof(void*), true, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void push(Address address)
</span></span></pre>
</div>
</div>
</body>
</html>