Changeset 99133 in webkit for trunk/Source/JavaScriptCore/assembler

Timestamp:

Nov 2, 2011, 8:13:27 PM (14 years ago)

Author:

[email protected]

Message:

FunctionPtr should accept FASTCALL functions on X86
​https://bugs.webkit.org/show_bug.cgi?id=71434

Patch by Yuqiang Xian <​[email protected]> on 2011-11-02
Reviewed by Filip Pizlo.

On X86 we sometimes use FASTCALL convention functions, for example the
cti functions, and we may need the pointers to such functions, e.g.,
in current DFG register file check and arity check, though long term
we may avoid such usage of cti calls in DFG.

• assembler/MacroAssemblerCodeRef.h:

(JSC::FunctionPtr::FunctionPtr):

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -66 +66 @@
 #endif
 
+#if CPU(X86)
+#define HAS_FASTCALL_CALLING_CONVENTION 1
+#ifndef FASTCALL
+#if COMPILER(MSVC)
+#define FASTCALL __fastcall
+#else
+#define FASTCALL  __attribute__ ((fastcall))
+#endif // COMPILER(MSVC)
+#endif // FASTCALL
+#else
+#define HAS_FASTCALL_CALLING_CONVENTION 0
+#endif // CPU(X86)
+
 namespace JSC {
 
@@ -146 +159 @@
     template<typename returnType, typename argType1, typename argType2, typename argType3, typename argType4>
     FunctionPtr(returnType (CDECL *value)(argType1, argType2, argType3, argType4))
+        : m_value((void*)value)
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+#endif
+
+#if HAS_FASTCALL_CALLING_CONVENTION
+
+    template<typename returnType>
+    FunctionPtr(returnType (FASTCALL *value)())
+        : m_value((void*)value)
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+
+    template<typename returnType, typename argType1>
+    FunctionPtr(returnType (FASTCALL *value)(argType1))
+        : m_value((void*)value)
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+
+    template<typename returnType, typename argType1, typename argType2>
+    FunctionPtr(returnType (FASTCALL *value)(argType1, argType2))
+        : m_value((void*)value)
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+
+    template<typename returnType, typename argType1, typename argType2, typename argType3>
+    FunctionPtr(returnType (FASTCALL *value)(argType1, argType2, argType3))
+        : m_value((void*)value)
+    {
+        ASSERT_VALID_CODE_POINTER(m_value);
+    }
+
+    template<typename returnType, typename argType1, typename argType2, typename argType3, typename argType4>
+    FunctionPtr(returnType (FASTCALL *value)(argType1, argType2, argType3, argType4))
         : m_value((void*)value)
     {