<!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>[167557] 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/167557">167557</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-19 18:22:06 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the CSS JIT compile for ARM64
https://bugs.webkit.org/show_bug.cgi?id=131834
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-04-19
Reviewed by Gavin Barraclough.
Source/JavaScriptCore:
Extend the ARM64 MacroAssembler to support the code generation required by
the CSS JIT.
* assembler/MacroAssembler.h:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::addPtrNoFlags):
(JSC::MacroAssemblerARM64::or32):
(JSC::MacroAssemblerARM64::branchPtr):
(JSC::MacroAssemblerARM64::test32):
(JSC::MacroAssemblerARM64::branch):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::test32):
Source/WebCore:
Add the CPU specific code required to compile SelectorCompiler on ARM64.
The code is absolutely non-functional, it would crash immediately, but it compiles.
* cssjit/FunctionCall.h:
(WebCore::FunctionCall::FunctionCall):
(WebCore::FunctionCall::callAndBranchOnCondition):
* cssjit/RegisterAllocator.h:
What am I supposed to do with all those registers? There are so many of them :)
The array calleeSavedRegisters is defined for compatibility but it cannot be reached at the moment.
(WebCore::RegisterAllocator::isValidRegister):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
Implement modulo by doing dividend - (divisor * int(dividend/divisor)).
* cssjit/StackAllocator.h:
StackAllocator will need a small redesign to handle the 16 bytes alligned stack of
ARM64.
The code has been modified to build but it is pretty useless.
(WebCore::StackAllocator::allocateUninitialized):
(WebCore::StackAllocator::push):
(WebCore::StackAllocator::pop):
(WebCore::StackAllocator::popAndDiscard):
(WebCore::StackAllocator::popAndDiscardUpTo):
(WebCore::StackAllocator::alignStackPreFunctionCall):
(WebCore::StackAllocator::unalignStackPostFunctionCall):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitFunctionCallh">trunk/Source/WebCore/cssjit/FunctionCall.h</a></li>
<li><a href="#trunkSourceWebCorecssjitRegisterAllocatorh">trunk/Source/WebCore/cssjit/RegisterAllocator.h</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecssjitStackAllocatorh">trunk/Source/WebCore/cssjit/StackAllocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-19 Benjamin Poulain <bpoulain@apple.com>
+
+ Make the CSS JIT compile for ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=131834
+
+ Reviewed by Gavin Barraclough.
+
+ Extend the ARM64 MacroAssembler to support the code generation required by
+ the CSS JIT.
+
+ * assembler/MacroAssembler.h:
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::addPtrNoFlags):
+ (JSC::MacroAssemblerARM64::or32):
+ (JSC::MacroAssemblerARM64::branchPtr):
+ (JSC::MacroAssemblerARM64::test32):
+ (JSC::MacroAssemblerARM64::branch):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::test32):
+
</ins><span class="cx"> 2014-04-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Two little shortcuts to the JSType.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> using MacroAssemblerBase::and32;
</span><span class="cx"> using MacroAssemblerBase::branchAdd32;
</span><span class="cx"> using MacroAssemblerBase::branchMul32;
</span><del>-#if CPU(X86_64)
</del><ins>+#if CPU(ARM64) || CPU(X86_64)
</ins><span class="cx"> using MacroAssemblerBase::branchPtr;
</span><span class="cx"> #endif // CPU(X86_64)
</span><span class="cx"> using MacroAssemblerBase::branchSub32;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -289,6 +289,11 @@
</span><span class="cx"> store64(dataTempRegister, address.m_ptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void addPtrNoFlags(TrustedImm32 imm, RegisterID srcDest)
+ {
+ add64(imm, srcDest);
+ }
+
</ins><span class="cx"> void add64(Address src, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> load64(src, getCachedDataTempRegisterIDAndInvalidate());
</span><span class="lines">@@ -472,6 +477,13 @@
</span><span class="cx"> store32(dataTempRegister, address.m_ptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void or32(TrustedImm32 imm, Address address)
+ {
+ load32(address, getCachedDataTempRegisterIDAndInvalidate());
+ or32(imm, dataTempRegister, dataTempRegister);
+ store32(dataTempRegister, address);
+ }
+
</ins><span class="cx"> void or64(RegisterID src, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> or64(dest, src, dest);
</span><span class="lines">@@ -1651,6 +1663,12 @@
</span><span class="cx"> return branch64(cond, memoryTempRegister, right);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Jump branchPtr(RelationalCondition cond, BaseIndex left, RegisterID right)
+ {
+ load64(left, getCachedMemoryTempRegisterIDAndInvalidate());
+ return branch64(cond, memoryTempRegister, right);
+ }
+
</ins><span class="cx"> Jump branch8(RelationalCondition cond, Address left, TrustedImm32 right)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!(0xffffff00 & right.m_value));
</span><span class="lines">@@ -1678,6 +1696,32 @@
</span><span class="cx"> return Jump(makeBranch(cond));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void test32(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1))
+ {
+ if (mask.m_value == -1)
+ m_assembler.tst<32>(reg, reg);
+ else {
+ bool testedWithImmediate = false;
+ if ((cond == Zero) || (cond == NonZero)) {
+ LogicalImmediate logicalImm = LogicalImmediate::create32(mask.m_value);
+
+ if (logicalImm.isValid()) {
+ m_assembler.tst<32>(reg, logicalImm);
+ testedWithImmediate = true;
+ }
+ }
+ if (!testedWithImmediate) {
+ move(mask, getCachedDataTempRegisterIDAndInvalidate());
+ m_assembler.tst<32>(reg, dataTempRegister);
+ }
+ }
+ }
+
+ Jump branch(ResultCondition cond)
+ {
+ return Jump(makeBranch(cond));
+ }
+
</ins><span class="cx"> Jump branchTest32(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1))
</span><span class="cx"> {
</span><span class="cx"> if (mask.m_value == -1) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx"> return Jump(m_assembler.jCC(x86Condition(cond)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void test32(RegisterID reg, TrustedImm32 mask = TrustedImm32(-1))
</del><ins>+ void test32(ResultCondition, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1))
</ins><span class="cx"> {
</span><span class="cx"> if (mask.m_value == -1)
</span><span class="cx"> m_assembler.testl_rr(reg, reg);
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx">
</span><span class="cx"> Jump branchTest32(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1))
</span><span class="cx"> {
</span><del>- test32(reg, mask);
</del><ins>+ test32(cond, reg, mask);
</ins><span class="cx"> return branch(cond);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/WebCore/ChangeLog 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-04-19 Benjamin Poulain <bpoulain@apple.com>
+
+ Make the CSS JIT compile for ARM64
+ https://bugs.webkit.org/show_bug.cgi?id=131834
+
+ Reviewed by Gavin Barraclough.
+
+ Add the CPU specific code required to compile SelectorCompiler on ARM64.
+ The code is absolutely non-functional, it would crash immediately, but it compiles.
+
+ * cssjit/FunctionCall.h:
+ (WebCore::FunctionCall::FunctionCall):
+ (WebCore::FunctionCall::callAndBranchOnCondition):
+ * cssjit/RegisterAllocator.h:
+ What am I supposed to do with all those registers? There are so many of them :)
+ The array calleeSavedRegisters is defined for compatibility but it cannot be reached at the moment.
+
+ (WebCore::RegisterAllocator::isValidRegister):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
+ Implement modulo by doing dividend - (divisor * int(dividend/divisor)).
+
+ * cssjit/StackAllocator.h:
+ StackAllocator will need a small redesign to handle the 16 bytes alligned stack of
+ ARM64.
+ The code has been modified to build but it is pretty useless.
+
+ (WebCore::StackAllocator::allocateUninitialized):
+ (WebCore::StackAllocator::push):
+ (WebCore::StackAllocator::pop):
+ (WebCore::StackAllocator::popAndDiscard):
+ (WebCore::StackAllocator::popAndDiscardUpTo):
+ (WebCore::StackAllocator::alignStackPreFunctionCall):
+ (WebCore::StackAllocator::unalignStackPostFunctionCall):
+
</ins><span class="cx"> 2014-04-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [UI-side compositing] Implement blend modes
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitFunctionCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/FunctionCall.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/FunctionCall.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/WebCore/cssjit/FunctionCall.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class FunctionCall {
</span><span class="cx"> public:
</span><del>- FunctionCall(JSC::MacroAssembler& assembler, const RegisterAllocator& registerAllocator, StackAllocator& stackAllocator, Vector<std::pair<JSC::MacroAssembler::Call, JSC::FunctionPtr>>& callRegistry)
</del><ins>+ FunctionCall(JSC::MacroAssembler& assembler, RegisterAllocator& registerAllocator, StackAllocator& stackAllocator, Vector<std::pair<JSC::MacroAssembler::Call, JSC::FunctionPtr>>& callRegistry)
</ins><span class="cx"> : m_assembler(assembler)
</span><span class="cx"> , m_registerAllocator(registerAllocator)
</span><span class="cx"> , m_stackAllocator(stackAllocator)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> JSC::MacroAssembler::Jump callAndBranchOnCondition(JSC::MacroAssembler::ResultCondition condition)
</span><span class="cx"> {
</span><span class="cx"> prepareAndCall();
</span><del>- m_assembler.test32(JSC::GPRInfo::returnValueGPR, JSC::MacroAssembler::TrustedImm32(0xff));
</del><ins>+ m_assembler.test32(condition, JSC::GPRInfo::returnValueGPR, JSC::MacroAssembler::TrustedImm32(0xff));
</ins><span class="cx"> cleanupPostCall();
</span><span class="cx"> return m_assembler.branch(condition);
</span><span class="cx"> }
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::MacroAssembler& m_assembler;
</span><del>- const RegisterAllocator& m_registerAllocator;
</del><ins>+ RegisterAllocator& m_registerAllocator;
</ins><span class="cx"> StackAllocator& m_stackAllocator;
</span><span class="cx"> Vector<std::pair<JSC::MacroAssembler::Call, JSC::FunctionPtr>>& m_callRegistry;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitRegisterAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -35,8 +35,30 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if CPU(X86_64)
</del><ins>+#if CPU(ARM64)
</ins><span class="cx"> static const JSC::MacroAssembler::RegisterID callerSavedRegisters[] = {
</span><ins>+ JSC::ARM64Registers::x0,
+ JSC::ARM64Registers::x1,
+ JSC::ARM64Registers::x2,
+ JSC::ARM64Registers::x3,
+ JSC::ARM64Registers::x4,
+ JSC::ARM64Registers::x5,
+ JSC::ARM64Registers::x6,
+ JSC::ARM64Registers::x7,
+ JSC::ARM64Registers::x8,
+ JSC::ARM64Registers::x9,
+ JSC::ARM64Registers::x10,
+ JSC::ARM64Registers::x11,
+ JSC::ARM64Registers::x12,
+ JSC::ARM64Registers::x13,
+ JSC::ARM64Registers::x14,
+ JSC::ARM64Registers::x15,
+};
+static const JSC::MacroAssembler::RegisterID calleeSavedRegisters[] = {
+ JSC::ARM64Registers::x19
+};
+#elif CPU(X86_64)
+static const JSC::MacroAssembler::RegisterID callerSavedRegisters[] = {
</ins><span class="cx"> JSC::X86Registers::eax,
</span><span class="cx"> JSC::X86Registers::ecx,
</span><span class="cx"> JSC::X86Registers::edx,
</span><span class="lines">@@ -53,10 +75,10 @@
</span><span class="cx"> JSC::X86Registers::r14,
</span><span class="cx"> JSC::X86Registers::r15
</span><span class="cx"> };
</span><del>-static const unsigned registerCount = WTF_ARRAY_LENGTH(callerSavedRegisters) + WTF_ARRAY_LENGTH(calleeSavedRegisters);
</del><span class="cx"> #else
</span><span class="cx"> #error RegisterAllocator has no defined registers for the architecture.
</span><span class="cx"> #endif
</span><ins>+static const unsigned registerCount = WTF_ARRAY_LENGTH(callerSavedRegisters) + WTF_ARRAY_LENGTH(calleeSavedRegisters);
</ins><span class="cx">
</span><span class="cx"> class RegisterAllocator {
</span><span class="cx"> public:
</span><span class="lines">@@ -116,7 +138,9 @@
</span><span class="cx">
</span><span class="cx"> static bool isValidRegister(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><del>-#if CPU(X86_64)
</del><ins>+#if CPU(ARM64)
+ return registerID >= JSC::ARM64Registers::x0 && registerID <= JSC::ARM64Registers::x15;
+#elif CPU(X86_64)
</ins><span class="cx"> return registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::r15;
</span><span class="cx"> #else
</span><span class="cx"> #error RegisterAllocator does not define the valid register range for the current architecture.
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -144,11 +144,9 @@
</span><span class="cx"> SelectorCompilationStatus compile(JSC::VM*, JSC::MacroAssemblerCodeRef&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if CPU(X86_64)
- static const Assembler::RegisterID returnRegister = JSC::X86Registers::eax;
- static const Assembler::RegisterID elementAddressRegister = JSC::X86Registers::edi;
- static const Assembler::RegisterID checkingContextRegister = JSC::X86Registers::esi;
-#endif
</del><ins>+ static const Assembler::RegisterID returnRegister = JSC::GPRInfo::returnValueGPR;
+ static const Assembler::RegisterID elementAddressRegister = JSC::GPRInfo::argumentGPR0;
+ static const Assembler::RegisterID checkingContextRegister = JSC::GPRInfo::argumentGPR1;
</ins><span class="cx">
</span><span class="cx"> void computeBacktrackingInformation();
</span><span class="cx"> void generateSelectorChecker();
</span><span class="lines">@@ -928,7 +926,15 @@
</span><span class="cx"> Assembler::Jump SelectorCodeGenerator::modulo(Assembler::ResultCondition condition, Assembler::RegisterID inputDividend, int divisor)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(divisor);
</span><del>-#if CPU(X86_64)
</del><ins>+#if CPU(ARM64)
+ LocalRegister divisorRegister(m_registerAllocator);
+ m_assembler.move(Assembler::TrustedImm32(divisor), divisorRegister);
+
+ LocalRegister resultRegister(m_registerAllocator);
+ m_assembler.m_assembler.sdiv<32>(resultRegister, inputDividend, divisorRegister);
+ m_assembler.mul32(divisorRegister, resultRegister);
+ return m_assembler.branchSub32(condition, inputDividend, resultRegister, resultRegister);
+#elif CPU(X86_64)
</ins><span class="cx"> // idiv takes RAX + an arbitrary register, and return RAX + RDX. Most of this code is about doing
</span><span class="cx"> // an efficient allocation of those registers. If a register is already in use and is not the inputDividend,
</span><span class="cx"> // we first try to copy it to a temporary register, it that is not possible we fall back to the stack.
</span><span class="lines">@@ -990,7 +996,7 @@
</span><span class="cx"> LocalRegister divisorRegister(m_registerAllocator);
</span><span class="cx"> m_assembler.move(Assembler::TrustedImm64(divisor), divisorRegister);
</span><span class="cx"> m_assembler.m_assembler.idivl_r(divisorRegister);
</span><del>- m_assembler.test32(remainder);
</del><ins>+ m_assembler.test32(condition, remainder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 3) Return RAX and RDX.
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitStackAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/StackAllocator.h (167556 => 167557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/StackAllocator.h 2014-04-20 00:54:04 UTC (rev 167556)
+++ trunk/Source/WebCore/cssjit/StackAllocator.h 2014-04-20 01:22:06 UTC (rev 167557)
</span><span class="lines">@@ -63,16 +63,21 @@
</span><span class="cx"> StackReference allocateUninitialized()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><del>- m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(-8), JSC::MacroAssembler::stackPointerRegister);
- m_offsetFromTop += 8;
</del><ins>+ m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(-stackUnitInBytes), JSC::MacroAssembler::stackPointerRegister);
+ m_offsetFromTop += stackUnitInBytes;
</ins><span class="cx"> return StackReference(m_offsetFromTop);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: ARM64 needs an API take a list of register to push and pop to use strp and ldrp when possible.
</ins><span class="cx"> StackReference push(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><ins>+#if CPU(ARM64)
+ m_assembler.m_assembler.str<64>(registerID, JSC::ARM64Registers::sp, JSC::PreIndex(-16));
+#else
</ins><span class="cx"> m_assembler.push(registerID);
</span><del>- m_offsetFromTop += 8;
</del><ins>+#endif
+ m_offsetFromTop += stackUnitInBytes;
</ins><span class="cx"> return StackReference(m_offsetFromTop);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,20 +86,24 @@
</span><span class="cx"> RELEASE_ASSERT(stackReference == m_offsetFromTop);
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><span class="cx"> ASSERT(m_offsetFromTop > 0);
</span><del>- m_offsetFromTop -= 8;
</del><ins>+ m_offsetFromTop -= stackUnitInBytes;
+#if CPU(ARM64)
+ m_assembler.m_assembler.ldr<64>(registerID, JSC::ARM64Registers::sp, JSC::PostIndex(16));
+#else
</ins><span class="cx"> m_assembler.pop(registerID);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void popAndDiscard(StackReference stackReference)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(stackReference == m_offsetFromTop);
</span><del>- m_assembler.addPtr(JSC::MacroAssembler::TrustedImm32(8), JSC::MacroAssembler::stackPointerRegister);
- m_offsetFromTop -= 8;
</del><ins>+ m_assembler.addPtr(JSC::MacroAssembler::TrustedImm32(stackUnitInBytes), JSC::MacroAssembler::stackPointerRegister);
+ m_offsetFromTop -= stackUnitInBytes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void popAndDiscardUpTo(StackReference stackReference)
</span><span class="cx"> {
</span><del>- unsigned positionBeforeStackReference = stackReference - 8;
</del><ins>+ unsigned positionBeforeStackReference = stackReference - stackUnitInBytes;
</ins><span class="cx"> RELEASE_ASSERT(positionBeforeStackReference < m_offsetFromTop);
</span><span class="cx">
</span><span class="cx"> unsigned stackDelta = m_offsetFromTop - positionBeforeStackReference;
</span><span class="lines">@@ -104,20 +113,24 @@
</span><span class="cx">
</span><span class="cx"> void alignStackPreFunctionCall()
</span><span class="cx"> {
</span><ins>+#if CPU(X86_64)
</ins><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><del>- unsigned topAlignment = 8;
</del><ins>+ unsigned topAlignment = stackUnitInBytes;
</ins><span class="cx"> if ((topAlignment + m_offsetFromTop) % 16) {
</span><span class="cx"> m_hasFunctionCallPadding = true;
</span><del>- m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(-8), JSC::MacroAssembler::stackPointerRegister);
</del><ins>+ m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(-stackUnitInBytes), JSC::MacroAssembler::stackPointerRegister);
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void unalignStackPostFunctionCall()
</span><span class="cx"> {
</span><ins>+#if CPU(X86_64)
</ins><span class="cx"> if (m_hasFunctionCallPadding) {
</span><del>- m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(8), JSC::MacroAssembler::stackPointerRegister);
</del><ins>+ m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(stackUnitInBytes), JSC::MacroAssembler::stackPointerRegister);
</ins><span class="cx"> m_hasFunctionCallPadding = false;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void merge(StackAllocator&& stackA, StackAllocator&& stackB)
</span><span class="lines">@@ -159,6 +172,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if CPU(ARM64)
+ static const unsigned stackUnitInBytes = 16;
+#elif CPU(X86_64)
+ static const unsigned stackUnitInBytes = 8;
+#else
+#error Stack Unit Size is undefined.
+#endif
+
</ins><span class="cx"> void reset()
</span><span class="cx"> {
</span><span class="cx"> m_offsetFromTop = 0;
</span></span></pre>
</div>
</div>
</body>
</html>