Changeset 206207 in webkit

Timestamp:

Sep 21, 2016 5:39:10 AM (8 years ago)

Author:

Csaba Osztrogonác

Message:

[ARM] Unreviewed buildfix after r206136.

• assembler/MacroAssembler.h:
• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::branchPtr): Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssembler.h (modified) (1 diff)
• assembler/MacroAssemblerARM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [ARM] Unreviewed buildfix after r206136.
+
+        * assembler/MacroAssembler.h:
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::branchPtr): Added.
+
 2016-09-20  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/JavaScriptCore/assembler/MacroAssembler.h

@@ -122 +122 @@
     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

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -654 +654 @@
     }
 
+    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)
     {