<!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>[195578] 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/195578">195578</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-25 20:01:33 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] We should never use x18 on iOS ARM64
https://bugs.webkit.org/show_bug.cgi?id=153461
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-01-25
Reviewed by Filip Pizlo.
The register x18 is reserved in the iOS variant of the ARM64 ABI.
The weird thing is: if you use it, its value will change completely
randomly. It looks like it is changed by the system on interrupts.
This patch adds x18 to the reserved register and add assertions
to the assembler to prevent similar problems in the future.
* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::xOrSp):
(JSC::ARM64Assembler::xOrZr):
* assembler/AbstractMacroAssembler.h:
(JSC::isIOS): Deleted.
* assembler/AssemblerCommon.h:
(JSC::isIOS):
* jit/RegisterSet.cpp:
(JSC::RegisterSet::reservedHardwareRegisters):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64Assemblerh">trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAssemblerCommonh">trunk/Source/JavaScriptCore/assembler/AssemblerCommon.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRegisterSetcpp">trunk/Source/JavaScriptCore/jit/RegisterSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (195577 => 195578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-26 03:13:03 UTC (rev 195577)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-26 04:01:33 UTC (rev 195578)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-01-25 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] We should never use x18 on iOS ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=153461
+
+ Reviewed by Filip Pizlo.
+
+ The register x18 is reserved in the iOS variant of the ARM64 ABI.
+
+ The weird thing is: if you use it, its value will change completely
+ randomly. It looks like it is changed by the system on interrupts.
+
+ This patch adds x18 to the reserved register and add assertions
+ to the assembler to prevent similar problems in the future.
+
+ * assembler/ARM64Assembler.h:
+ (JSC::ARM64Assembler::xOrSp):
+ (JSC::ARM64Assembler::xOrZr):
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::isIOS): Deleted.
+ * assembler/AssemblerCommon.h:
+ (JSC::isIOS):
+ * jit/RegisterSet.cpp:
+ (JSC::RegisterSet::reservedHardwareRegisters):
+
</ins><span class="cx"> 2016-01-25 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r195550.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h (195577 => 195578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2016-01-26 03:13:03 UTC (rev 195577)
+++ trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2016-01-26 04:01:33 UTC (rev 195578)
</span><span class="lines">@@ -3276,8 +3276,18 @@
</span><span class="cx"> return (insn & 0x7c000000) == 0x14000000;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static int xOrSp(RegisterID reg) { ASSERT(!isZr(reg)); return reg; }
- static int xOrZr(RegisterID reg) { ASSERT(!isSp(reg)); return reg & 31; }
</del><ins>+ static int xOrSp(RegisterID reg)
+ {
+ ASSERT(!isZr(reg));
+ ASSERT(!isIOS() || reg != ARM64Registers::x18);
+ return reg;
+ }
+ static int xOrZr(RegisterID reg)
+ {
+ ASSERT(!isSp(reg));
+ ASSERT(!isIOS() || reg != ARM64Registers::x18);
+ return reg & 31;
+ }
</ins><span class="cx"> static FPRegisterID xOrZrAsFPR(RegisterID reg) { return static_cast<FPRegisterID>(xOrZr(reg)); }
</span><span class="cx"> static int xOrZrOrSp(bool useZr, RegisterID reg) { return useZr ? xOrZr(reg) : xOrSp(reg); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (195577 => 195578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2016-01-26 03:13:03 UTC (rev 195577)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2016-01-26 04:01:33 UTC (rev 195578)
</span><span class="lines">@@ -76,15 +76,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isIOS()
-{
-#if PLATFORM(IOS)
- return true;
-#else
- return false;
-#endif
-}
-
</del><span class="cx"> inline bool optimizeForARMv7IDIVSupported()
</span><span class="cx"> {
</span><span class="cx"> return isARMv7IDIVSupported() && Options::useArchitectureSpecificOptimizations();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAssemblerCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AssemblerCommon.h (195577 => 195578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AssemblerCommon.h 2016-01-26 03:13:03 UTC (rev 195577)
+++ trunk/Source/JavaScriptCore/assembler/AssemblerCommon.h 2016-01-26 04:01:33 UTC (rev 195578)
</span><span class="lines">@@ -28,6 +28,15 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+ALWAYS_INLINE bool isIOS()
+{
+#if PLATFORM(IOS)
+ return true;
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> ALWAYS_INLINE bool isInt9(int32_t value)
</span><span class="cx"> {
</span><span class="cx"> return value == ((value << 23) >> 23);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRegisterSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/RegisterSet.cpp (195577 => 195578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/RegisterSet.cpp 2016-01-26 03:13:03 UTC (rev 195577)
+++ trunk/Source/JavaScriptCore/jit/RegisterSet.cpp 2016-01-26 04:01:33 UTC (rev 195578)
</span><span class="lines">@@ -45,7 +45,11 @@
</span><span class="cx"> RegisterSet RegisterSet::reservedHardwareRegisters()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span><ins>+#if PLATFORM(IOS)
+ return RegisterSet(ARM64Registers::x18, ARM64Registers::lr);
+#else
</ins><span class="cx"> return RegisterSet(ARM64Registers::lr);
</span><ins>+#endif // PLATFORM(IOS)
</ins><span class="cx"> #else
</span><span class="cx"> return RegisterSet();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>