Title: [206207] trunk/Source/_javascript_Core
- Revision
- 206207
- Author
- o...@webkit.org
- Date
- 2016-09-21 05:39:10 -0700 (Wed, 21 Sep 2016)
Log Message
[ARM] Unreviewed buildfix after r206136.
* assembler/MacroAssembler.h:
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::branchPtr): Added.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (206206 => 206207)
--- trunk/Source/_javascript_Core/ChangeLog 2016-09-21 09:56:16 UTC (rev 206206)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-09-21 12:39:10 UTC (rev 206207)
@@ -1,3 +1,11 @@
+2016-09-21 Csaba Osztrogonác <o...@webkit.org>
+
+ [ARM] Unreviewed buildfix after r206136.
+
+ * assembler/MacroAssembler.h:
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::branchPtr): Added.
+
2016-09-20 Alex Christensen <achristen...@webkit.org>
Require WTFMove for String::adopt
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (206206 => 206207)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2016-09-21 09:56:16 UTC (rev 206206)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2016-09-21 12:39:10 UTC (rev 206207)
@@ -121,7 +121,7 @@
using MacroAssemblerBase::and32;
using MacroAssemblerBase::branchAdd32;
using MacroAssemblerBase::branchMul32;
-#if CPU(ARM64) || CPU(ARM_THUMB2) || CPU(X86_64)
+#if CPU(ARM64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(X86_64)
using MacroAssemblerBase::branchPtr;
#endif
using MacroAssemblerBase::branchSub32;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (206206 => 206207)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2016-09-21 09:56:16 UTC (rev 206206)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2016-09-21 12:39:10 UTC (rev 206207)
@@ -653,6 +653,12 @@
return branch32(cond, ARMRegisters::S1, right8);
}
+ Jump branchPtr(RelationalCondition cond, BaseIndex left, RegisterID right)
+ {
+ load32(left, ARMRegisters::S1);
+ return branch32(cond, ARMRegisters::S1, right);
+ }
+
Jump branch32(RelationalCondition cond, RegisterID left, RegisterID right, int useConstantPool = 0)
{
m_assembler.cmp(left, right);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
