Gardening: build fix after r219434.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jul 2017 00:22:26 +0000 (00:22 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jul 2017 00:22:26 +0000 (00:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174441

Not reviewed.

Make public some MacroAssembler functions that are needed by the probe implementationq.

* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::trustedImm32FromPtr):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::linkCall):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/assembler/MacroAssemblerARM.h
Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

index c0032bc..bda6674 100644 (file)
@@ -1,5 +1,19 @@
 2017-07-12  Mark Lam  <mark.lam@apple.com>
 
+        Gardening: build fix after r219434.
+        https://bugs.webkit.org/show_bug.cgi?id=174441
+
+        Not reviewed.
+
+        Make public some MacroAssembler functions that are needed by the probe implementationq.
+
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::trustedImm32FromPtr):
+        * assembler/MacroAssemblerARMv7.h:
+        (JSC::MacroAssemblerARMv7::linkCall):
+
+2017-07-12  Mark Lam  <mark.lam@apple.com>
+
         Move Probe code from AbstractMacroAssembler to MacroAssembler.
         https://bugs.webkit.org/show_bug.cgi?id=174441
 
index 9c89906..3b5e811 100644 (file)
@@ -1586,6 +1586,23 @@ protected:
         m_assembler.blx(ARMRegisters::S1);
     }
 
+#if ENABLE(MASM_PROBE)
+    inline TrustedImm32 trustedImm32FromPtr(void* ptr)
+    {
+        return TrustedImm32(TrustedImmPtr(ptr));
+    }
+
+    inline TrustedImm32 trustedImm32FromPtr(ProbeFunction function)
+    {
+        return TrustedImm32(TrustedImmPtr(reinterpret_cast<void*>(function)));
+    }
+
+    inline TrustedImm32 trustedImm32FromPtr(void (*function)())
+    {
+        return TrustedImm32(TrustedImmPtr(reinterpret_cast<void*>(function)));
+    }
+#endif
+
 private:
     friend class LinkBuffer;
 
@@ -1616,24 +1633,6 @@ private:
             ARMAssembler::linkCall(code, call.m_label, function.value());
     }
 
-
-#if ENABLE(MASM_PROBE)
-    inline TrustedImm32 trustedImm32FromPtr(void* ptr)
-    {
-        return TrustedImm32(TrustedImmPtr(ptr));
-    }
-
-    inline TrustedImm32 trustedImm32FromPtr(ProbeFunction function)
-    {
-        return TrustedImm32(TrustedImmPtr(reinterpret_cast<void*>(function)));
-    }
-
-    inline TrustedImm32 trustedImm32FromPtr(void (*function)())
-    {
-        return TrustedImm32(TrustedImmPtr(reinterpret_cast<void*>(function)));
-    }
-#endif
-
     static const bool s_isVFPPresent;
 };
 
index 156399e..b853544 100644 (file)
@@ -2107,17 +2107,6 @@ protected:
         return static_cast<ARMv7Assembler::Condition>(cond);
     }
     
-private:
-    friend class LinkBuffer;
-
-    static void linkCall(void* code, Call call, FunctionPtr function)
-    {
-        if (call.isFlagSet(Call::Tail))
-            ARMv7Assembler::linkJump(code, call.m_label, function.value());
-        else
-            ARMv7Assembler::linkCall(code, call.m_label, function.value());
-    }
-
 #if ENABLE(MASM_PROBE)
     inline TrustedImm32 trustedImm32FromPtr(void* ptr)
     {
@@ -2135,6 +2124,17 @@ private:
     }
 #endif
 
+private:
+    friend class LinkBuffer;
+
+    static void linkCall(void* code, Call call, FunctionPtr function)
+    {
+        if (call.isFlagSet(Call::Tail))
+            ARMv7Assembler::linkJump(code, call.m_label, function.value());
+        else
+            ARMv7Assembler::linkCall(code, call.m_label, function.value());
+    }
+
     bool m_makeJumpPatchable;
 };