<!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>[194530] trunk/Source</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/194530">194530</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-04 05:35:14 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Build B3 by default on iOS ARM64
https://bugs.webkit.org/show_bug.cgi?id=152525
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-01-04
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
Minor changes required to get testb3 to compile.
* Configurations/ToolExecutable.xcconfig:
We need an entitlement to allocate executable memory.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::scratchRegister):
(JSC::MacroAssemblerARM64::getCachedDataTempRegisterIDAndInvalidate):
(JSC::MacroAssemblerARM64::getCachedMemoryTempRegisterIDAndInvalidate):
Expose one of the scratch registers for ValueRep::emitRestore().
Guard the use of scratch registers when not allowed.
* b3/air/AirOpcode.opcodes:
ARM addressing is a bit different. Skip Addr to make things build.
* b3/testb3.cpp:
(JSC::B3::testPatchpointWithStackArgumentResult):
Add on memory only exists on x86.
* jit/RegisterSet.cpp:
(JSC::RegisterSet::macroScratchRegisters):
Add the two scratch registers, useful for patchpoints.
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig">trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRegisterSetcpp">trunk/Source/JavaScriptCore/jit/RegisterSet.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-01-04 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Build B3 by default on iOS ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=152525
+
+ Reviewed by Filip Pizlo.
+
+ Minor changes required to get testb3 to compile.
+
+ * Configurations/ToolExecutable.xcconfig:
+ We need an entitlement to allocate executable memory.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::scratchRegister):
+ (JSC::MacroAssemblerARM64::getCachedDataTempRegisterIDAndInvalidate):
+ (JSC::MacroAssemblerARM64::getCachedMemoryTempRegisterIDAndInvalidate):
+ Expose one of the scratch registers for ValueRep::emitRestore().
+ Guard the use of scratch registers when not allowed.
+
+ * b3/air/AirOpcode.opcodes:
+ ARM addressing is a bit different. Skip Addr to make things build.
+
+ * b3/testb3.cpp:
+ (JSC::B3::testPatchpointWithStackArgumentResult):
+ Add on memory only exists on x86.
+
+ * jit/RegisterSet.cpp:
+ (JSC::RegisterSet::macroScratchRegisters):
+ Add the two scratch registers, useful for patchpoints.
+
</ins><span class="cx"> 2016-01-03 Khem Raj <raj.khem@gmail.com>
</span><span class="cx">
</span><span class="cx"> WebKit fails to build with musl libc library
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
</span><ins>+CODE_SIGN_ENTITLEMENTS_ios_testb3 = entitlements.plist;
</ins><span class="cx"> CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
</span><span class="cx">
</span><span class="cx"> SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -39,6 +39,12 @@
</span><span class="cx"> static const RegisterID dataTempRegister = ARM64Registers::ip0;
</span><span class="cx"> static const RegisterID memoryTempRegister = ARM64Registers::ip1;
</span><span class="cx">
</span><ins>+ RegisterID scratchRegister()
+ {
+ RELEASE_ASSERT(m_allowScratchRegister);
+ return getCachedDataTempRegisterIDAndInvalidate();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> static const ARM64Registers::FPRegisterID fpTempRegister = ARM64Registers::q31;
</span><span class="cx"> static const ARM64Assembler::SetFlags S = ARM64Assembler::S;
</span><span class="lines">@@ -2788,8 +2794,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ALWAYS_INLINE RegisterID getCachedDataTempRegisterIDAndInvalidate() { return m_dataMemoryTempRegister.registerIDInvalidate(); }
- ALWAYS_INLINE RegisterID getCachedMemoryTempRegisterIDAndInvalidate() { return m_cachedMemoryTempRegister.registerIDInvalidate(); }
</del><ins>+ ALWAYS_INLINE RegisterID getCachedDataTempRegisterIDAndInvalidate()
+ {
+ RELEASE_ASSERT(m_allowScratchRegister);
+ return m_dataMemoryTempRegister.registerIDInvalidate();
+ }
+ ALWAYS_INLINE RegisterID getCachedMemoryTempRegisterIDAndInvalidate()
+ {
+ RELEASE_ASSERT(m_allowScratchRegister);
+ return m_cachedMemoryTempRegister.registerIDInvalidate();
+ }
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isInIntRange(intptr_t value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">
</span><span class="cx"> Store16 U:G:16, D:G:16
</span><span class="cx"> Tmp, Index
</span><del>- Tmp, Addr
</del><ins>+ x86: Tmp, Addr
</ins><span class="cx">
</span><span class="cx"> Compare32 U:G:32, U:G:32, U:G:32, ZD:G:32
</span><span class="cx"> RelCond, Tmp, Tmp, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -6296,8 +6296,8 @@
</span><span class="cx"> CHECK(params[0] == ValueRep::stack(-static_cast<intptr_t>(proc.frameSize())));
</span><span class="cx"> CHECK(params[1].isGPR());
</span><span class="cx"> CHECK(params[2].isGPR());
</span><del>- jit.store32(params[1].gpr(), CCallHelpers::Address(CCallHelpers::stackPointerRegister, 0));
- jit.add32(params[2].gpr(), CCallHelpers::Address(CCallHelpers::stackPointerRegister, 0));
</del><ins>+ jit.add32(params[1].gpr(), params[2].gpr(), jit.scratchRegister());
+ jit.store32(jit.scratchRegister(), CCallHelpers::Address(CCallHelpers::stackPointerRegister, 0));
</ins><span class="cx"> });
</span><span class="cx"> root->appendNew<ControlValue>(proc, Return, Origin(), patchpoint);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRegisterSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/RegisterSet.cpp (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/RegisterSet.cpp 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/JavaScriptCore/jit/RegisterSet.cpp 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if CPU(X86_64)
</span><span class="cx"> return RegisterSet(MacroAssembler::s_scratchRegister);
</span><ins>+#elif CPU(ARM64)
+ return RegisterSet(MacroAssembler::dataTempRegister, MacroAssembler::memoryTempRegister);
</ins><span class="cx"> #else
</span><span class="cx"> return RegisterSet();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/WTF/ChangeLog 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-04 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Build B3 by default on iOS ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=152525
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-01-03 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194510.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (194529 => 194530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-01-04 11:30:16 UTC (rev 194529)
+++ trunk/Source/WTF/wtf/Platform.h 2016-01-04 13:35:14 UTC (rev 194530)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx">
</span><span class="cx"> /* The B3 compiler is an experimental backend that is still in development. We will keep it building
</span><span class="cx"> on Mac/x86-64 for now, though it is unused except for tests. */
</span><del>-#if PLATFORM(MAC) && CPU(X86_64) && ENABLE(FTL_JIT)
</del><ins>+#if (PLATFORM(MAC) || PLATFORM(IOS)) && (CPU(X86_64) || CPU(ARM64)) && ENABLE(FTL_JIT)
</ins><span class="cx"> #define ENABLE_B3_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>