Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169946 => 169947)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 20:43:32 UTC (rev 169947)
@@ -1,3 +1,20 @@
+2014-06-13 Alex Christensen <achristen...@webkit.org>
+
+ Make css jit compile for armv7.
+ https://bugs.webkit.org/show_bug.cgi?id=133596
+
+ Reviewed by Benjamin Poulain.
+
+ * assembler/MacroAssembler.h:
+ Use branchPtr on ARM_THUMB2.
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::addPtrNoFlags):
+ (JSC::MacroAssemblerARMv7::or32):
+ (JSC::MacroAssemblerARMv7::test32):
+ (JSC::MacroAssemblerARMv7::branch):
+ (JSC::MacroAssemblerARMv7::branchPtr):
+ Added macros necessary for css jit.
+
2014-06-13 Filip Pizlo <fpi...@apple.com>
Unreviewed, fix ARMv7.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (169946 => 169947)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -117,9 +117,9 @@
using MacroAssemblerBase::and32;
using MacroAssemblerBase::branchAdd32;
using MacroAssemblerBase::branchMul32;
-#if CPU(ARM64) || CPU(X86_64)
+#if CPU(ARM64) || CPU(ARM_THUMB2) || CPU(X86_64)
using MacroAssemblerBase::branchPtr;
-#endif // CPU(X86_64)
+#endif
using MacroAssemblerBase::branchSub32;
using MacroAssemblerBase::lshift32;
using MacroAssemblerBase::or32;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (169946 => 169947)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -226,6 +226,11 @@
store32(dataTempRegister, address.m_ptr);
}
+ void addPtrNoFlags(TrustedImm32 imm, RegisterID srcDest)
+ {
+ add32(imm, srcDest);
+ }
+
void add64(TrustedImm32 imm, AbsoluteAddress address)
{
move(TrustedImmPtr(address.m_ptr), addressTempRegister);
@@ -337,6 +342,13 @@
store32(dataTempRegister, addressTempRegister);
}
+ void or32(TrustedImm32 imm, Address address)
+ {
+ load32(address, dataTempRegister);
+ or32(imm, dataTempRegister, dataTempRegister);
+ store32(dataTempRegister, address);
+ }
+
void or32(TrustedImm32 imm, RegisterID dest)
{
or32(imm, dest, dest);
@@ -1336,6 +1348,16 @@
}
public:
+ void test32(ResultCondition, RegisterID reg, TrustedImm32 mask)
+ {
+ test32(reg, mask);
+ }
+
+ Jump branch(ResultCondition cond)
+ {
+ return Jump(makeBranch(cond));
+ }
+
Jump branch32(RelationalCondition cond, RegisterID left, RegisterID right)
{
m_assembler.cmp(left, right);
@@ -1394,6 +1416,12 @@
return branch32(cond, addressTempRegister, right);
}
+ Jump branchPtr(RelationalCondition cond, BaseIndex left, RegisterID right)
+ {
+ load32(left, dataTempRegister);
+ return branch32(cond, dataTempRegister, right);
+ }
+
Jump branch8(RelationalCondition cond, RegisterID left, TrustedImm32 right)
{
compare32(left, right);
Modified: trunk/Source/WebCore/ChangeLog (169946 => 169947)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 20:43:32 UTC (rev 169947)
@@ -1,3 +1,32 @@
+2014-06-13 Alex Christensen <achristen...@webkit.org>
+
+ Make css jit compile for armv7.
+ https://bugs.webkit.org/show_bug.cgi?id=133596
+
+ Reviewed by Benjamin Poulain.
+
+ * cssjit/FunctionCall.h:
+ (WebCore::FunctionCall::swapArguments):
+ Implemented for ARM_THUMB2 and removed allocator hack.
+ * cssjit/RegisterAllocator.h:
+ Added list of ARM_THUMB2 general purpose registers.
+ (WebCore::RegisterAllocator::isValidRegister):
+ Added ARM register range and corrected ARM64 register range now that r15 is tempRegister.
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::compile):
+ Return CannotCompile if compiling fails because of lack of registers.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generatePrologue):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateEpilogue):
+ Implemented for ARM_THUMB2.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
+ Return false if the selector cannot be compiled because of lack of registers.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::addFlagsToElementStyleFromContext):
+ Added code using 32-bit operations and used macro assembler for 64-bit operations.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
+ Implemented for APPLE_ARMV7S, where sdiv is not a template in the assembler.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributesMatching):
+ Use addPtr instead of add64.
+
2014-06-13 Anders Carlsson <ander...@apple.com>
Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
Modified: trunk/Source/WebCore/cssjit/FunctionCall.h (169946 => 169947)
--- trunk/Source/WebCore/cssjit/FunctionCall.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/WebCore/cssjit/FunctionCall.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -99,32 +99,12 @@
// x86 can swap without a temporary register. On other architectures, we need allocate a temporary register to switch the values.
#if CPU(X86) || CPU(X86_64)
m_assembler.swap(a, b);
-#elif CPU(ARM64)
+#elif CPU(ARM64) || CPU(ARM_THUMB2)
m_assembler.move(a, tempRegister);
m_assembler.move(b, a);
m_assembler.move(tempRegister, b);
#else
- if (m_registerAllocator.availableRegisterCount()) {
- // Usually we can just use a free register.
- // FIXME: We need to make sure that tempValue is not a or b.
- LocalRegister tempValue(m_registerAllocator);
- m_assembler.move(a, tempValue);
- m_assembler.move(b, a);
- m_assembler.move(tempValue, b);
- } else {
- // If there is no free register, everything should be on the stack at this point. We can take
- // the first of those saved registers and use it as a temporary.
- JSC::MacroAssembler::RegisterID pushedRegister;
- for (unsigned i = 0; i < m_registerAllocator.allocatedRegisters().size(); ++i) {
- pushedRegister = m_registerAllocator.allocatedRegisters()[i];
- if (pushedRegister != a && pushedRegister != b)
- break;
- }
- ASSERT(pushedRegister != a && pushedRegister != b);
- m_assembler.move(a, pushedRegister);
- m_assembler.move(b, a);
- m_assembler.move(pushedRegister, b);
- }
+#error Missing implementationg for matching swapping argument registers.
#endif
}
Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (169946 => 169947)
--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -56,6 +56,19 @@
JSC::ARM64Registers::x19
};
static const JSC::MacroAssembler::RegisterID tempRegister = JSC::ARM64Registers::x15;
+#elif CPU(ARM_THUMB2)
+static const JSC::MacroAssembler::RegisterID callerSavedRegisters[] {
+ JSC::ARMRegisters::r0,
+ JSC::ARMRegisters::r1,
+ JSC::ARMRegisters::r2,
+ JSC::ARMRegisters::r3,
+ JSC::ARMRegisters::r7, // r7 is fp, and it's pushed in the prologue and popped in the epilogue so we can use it without saving it as long as we have a prologue.
+};
+static const JSC::MacroAssembler::RegisterID calleeSavedRegisters[] = {
+ JSC::ARMRegisters::r4,
+ JSC::ARMRegisters::r5,
+};
+static const JSC::MacroAssembler::RegisterID tempRegister = JSC::ARMRegisters::r12; // ip
#elif CPU(X86_64)
static const JSC::MacroAssembler::RegisterID callerSavedRegisters[] = {
JSC::X86Registers::eax,
@@ -138,8 +151,10 @@
{
#if CPU(ARM64)
return registerID >= JSC::ARM64Registers::x0 && registerID <= JSC::ARM64Registers::x15;
+#elif CPU(ARM_THUMB2)
+ return registerID >= JSC::ARMRegisters::r0 && registerID <= JSC::ARMRegisters::r7 && registerID != JSC::ARMRegisters::r6;
#elif CPU(X86_64)
- return registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::r15;
+ return registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::r14;
#else
#error RegisterAllocator does not define the valid register range for the current architecture.
#endif
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169946 => 169947)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 20:43:32 UTC (rev 169947)
@@ -198,7 +198,7 @@
static const Assembler::RegisterID checkingContextRegister;
static const Assembler::RegisterID callFrameRegister;
- void generateSelectorChecker();
+ bool generateSelectorChecker();
// Element relations tree walker.
void generateWalkToParentNode(Assembler::RegisterID targetRegister);
@@ -692,7 +692,8 @@
switch (m_functionType) {
case FunctionType::SimpleSelectorChecker:
case FunctionType::SelectorCheckerWithCheckingContext:
- generateSelectorChecker();
+ if (!generateSelectorChecker())
+ return SelectorCompilationStatus::CannotCompile;
break;
case FunctionType::CannotMatchAnything:
m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
@@ -1088,6 +1089,12 @@
prologueRegisters.append(JSC::ARM64Registers::fp);
m_prologueStackReferences = m_stackAllocator.push(prologueRegisters);
return true;
+#elif CPU(ARM_THUMB2)
+ Vector<JSC::MacroAssembler::RegisterID, 2> prologueRegisters;
+ prologueRegisters.append(JSC::ARMRegisters::lr);
+ prologueRegisters.append(JSC::ARMRegisters::fp); // fp is used as a caller saved register because we always have a prologue for now.
+ m_prologueStackReferences = m_stackAllocator.push(prologueRegisters);
+ return true;
#elif CPU(X86_64) && CSS_SELECTOR_JIT_DEBUGGING
Vector<JSC::MacroAssembler::RegisterID, 1> prologueRegister;
prologueRegister.append(callFrameRegister);
@@ -1104,6 +1111,11 @@
prologueRegisters.append(JSC::ARM64Registers::lr);
prologueRegisters.append(JSC::ARM64Registers::fp);
m_stackAllocator.pop(m_prologueStackReferences, prologueRegisters);
+#elif CPU(ARM_THUMB2)
+ Vector<JSC::MacroAssembler::RegisterID, 2> prologueRegisters;
+ prologueRegisters.append(JSC::ARMRegisters::lr);
+ prologueRegisters.append(JSC::ARMRegisters::fp);
+ m_stackAllocator.pop(m_prologueStackReferences, prologueRegisters);
#elif CPU(X86_64) && CSS_SELECTOR_JIT_DEBUGGING
Vector<JSC::MacroAssembler::RegisterID, 1> prologueRegister;
prologueRegister.append(callFrameRegister);
@@ -1111,17 +1123,29 @@
#endif
}
-void SelectorCodeGenerator::generateSelectorChecker()
+bool SelectorCodeGenerator::generateSelectorChecker()
{
- bool needsEpilogue = generatePrologue();
-
Vector<StackAllocator::StackReference> calleeSavedRegisterStackReferences;
bool reservedCalleeSavedRegisters = false;
unsigned availableRegisterCount = m_registerAllocator.availableRegisterCount();
unsigned minimumRegisterCountForAttributes = minimumRegisterRequirements(m_selectorFragments);
+ if (minimumRegisterCountForAttributes > registerCount) {
+#if !CPU(ARM_THUMB2)
+ // ARM_THUMB2 does not have enough registers to compile complicated selectors.
+ // Compiling should always succeed on non-ARM_THUMB2 CPUs.
+ ASSERT_NOT_REACHED();
+#endif
#if CSS_SELECTOR_JIT_DEBUGGING
+ dataLogF("Failed to compile because it would have required %u registers\n", minimumRegisterCountForAttributes);
+#endif
+ return false;
+ }
+#if CSS_SELECTOR_JIT_DEBUGGING
dataLogF("Compiling with minimum required register count %u\n", minimumRegisterCountForAttributes);
#endif
+
+ bool needsEpilogue = generatePrologue();
+
ASSERT(minimumRegisterCountForAttributes <= registerCount);
if (availableRegisterCount < minimumRegisterCountForAttributes) {
reservedCalleeSavedRegisters = true;
@@ -1215,6 +1239,7 @@
generateEpilogue();
m_assembler.ret();
}
+ return true;
}
static inline Assembler::Jump testIsElementFlagOnNode(Assembler::ResultCondition condition, Assembler& assembler, Assembler::RegisterID nodeAddress)
@@ -1362,14 +1387,22 @@
LocalRegister childStyle(m_registerAllocator);
m_assembler.loadPtr(Assembler::Address(checkingContext, OBJECT_OFFSETOF(CheckingContext, elementStyle)), childStyle);
+ Assembler::Address flagAddress(childStyle, RenderStyle::noninheritedFlagsMemoryOffset() + RenderStyle::NonInheritedFlags::flagsMemoryOffset());
+#if CPU(ARM_THUMB2)
+ Assembler::Address flagLowAddress(childStyle, RenderStyle::noninheritedFlagsMemoryOffset() + RenderStyle::NonInheritedFlags::flagsMemoryOffset() + 4);
+ m_assembler.or32(Assembler::TrustedImm32(newFlag >> 32), flagAddress);
+ m_assembler.or32(Assembler::TrustedImm32(newFlag & 0xFFFFFFFF), flagLowAddress);
+#elif CPU(X86_64) || CPU(ARM)
// FIXME: We should look into doing something smart in MacroAssembler instead.
LocalRegister flags(m_registerAllocator);
- Assembler::Address flagAddress(childStyle, RenderStyle::noninheritedFlagsMemoryOffset() + RenderStyle::NonInheritedFlags::flagsMemoryOffset());
m_assembler.load64(flagAddress, flags);
LocalRegister isFirstChildStateFlagImmediate(m_registerAllocator);
m_assembler.move(Assembler::TrustedImm64(newFlag), isFirstChildStateFlagImmediate);
m_assembler.or64(isFirstChildStateFlagImmediate, flags);
m_assembler.store64(flags, flagAddress);
+#else
+#error SelectorCodeGenerator::addFlagsToElementStyleFromContext not implemented for this architecture.
+#endif
}
Assembler::JumpList SelectorCodeGenerator::jumpIfNoPreviousAdjacentElement()
@@ -1428,12 +1461,16 @@
Assembler::Jump SelectorCodeGenerator::modulo(Assembler::ResultCondition condition, Assembler::RegisterID inputDividend, int divisor)
{
RELEASE_ASSERT(divisor);
-#if CPU(ARM64)
+#if CPU(ARM64) || CPU(APPLE_ARMV7S)
LocalRegister divisorRegister(m_registerAllocator);
m_assembler.move(Assembler::TrustedImm32(divisor), divisorRegister);
LocalRegister resultRegister(m_registerAllocator);
+#if CPU(APPLE_ARMV7S)
+ m_assembler.m_assembler.sdiv(resultRegister, inputDividend, divisorRegister);
+#elif CPU(ARM64)
m_assembler.m_assembler.sdiv<32>(resultRegister, inputDividend, divisorRegister);
+#endif
m_assembler.mul32(divisorRegister, resultRegister);
return m_assembler.branchSub32(condition, inputDividend, resultRegister, resultRegister);
#elif CPU(X86_64)
@@ -1817,7 +1854,7 @@
{
isShareableElementData.link(&m_assembler);
m_assembler.urshift32(elementDataArraySizeAndFlags, Assembler::TrustedImm32(ElementData::arraySizeOffset()), attributeArrayLength);
- m_assembler.add64(Assembler::TrustedImm32(ShareableElementData::attributeArrayMemoryOffset()), elementDataAddress, attributeArrayPointer);
+ m_assembler.addPtr(Assembler::TrustedImm32(ShareableElementData::attributeArrayMemoryOffset()), elementDataAddress, attributeArrayPointer);
}
skipShareable.link(&m_assembler);
