Changeset 96347 in webkit

Timestamp:

Sep 29, 2011 12:37:53 PM (13 years ago)

Author:

barraclough@apple.com

Message:

DFG operation calls should be stdcall in Linux JSVALUE32_64 DFG JIT
​https://bugs.webkit.org/show_bug.cgi?id=69058

Patch by Yuqiang Xian <​yuqiang.xian@intel.com> on 2011-09-29
Reviewed by Gavin Barraclough.

Also Fixed the stdcall FunctionPtr constructors to make them compiled correctly on Linux

• assembler/MacroAssemblerCodeRef.h:

(JSC::FunctionPtr::FunctionPtr):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• assembler/MacroAssemblerCodeRef.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-29  Yuqiang Xian  <yuqiang.xian@intel.com>
+
+        DFG operation calls should be stdcall in Linux JSVALUE32_64 DFG JIT
+        https://bugs.webkit.org/show_bug.cgi?id=69058
+
+        Reviewed by Gavin Barraclough.
+
+        Also Fixed the stdcall FunctionPtr constructors to make them compiled correctly on Linux
+
+        * assembler/MacroAssemblerCodeRef.h:
+        (JSC::FunctionPtr::FunctionPtr):
+
 2011-09-29  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1063 +1063 @@
                 86880F1A14328BB900B08D42 /* DFGJITCompilerInlineMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGJITCompilerInlineMethods.h; path = dfg/DFGJITCompilerInlineMethods.h; sourceTree = "<group>"; };
                 86880F1B14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGSpeculativeJIT32_64.cpp; path = dfg/DFGSpeculativeJIT32_64.cpp; sourceTree = "<group>"; };
+                86880F311434FFAF00B08D42 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
                 868BFA00117CEFD100B908B1 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AtomicString.cpp; path = text/AtomicString.cpp; sourceTree = "<group>"; };
                 868BFA01117CEFD100B908B1 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicString.h; path = text/AtomicString.h; sourceTree = "<group>"; };
@@ -1532 +1533 @@
                         isa = PBXGroup;
                         children = (
+                                86880F311434FFAF00B08D42 /* ChangeLog */,
                                 651122E5140469BA002B101D /* testRegExp.cpp */,
                                 A718F8211178EB4B002465A7 /* create_regex_tables */,

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -53 +53 @@
 #endif
 
-#if CPU(X86) && PLATFORM(MAC)
+#if CPU(X86) && !PLATFORM(WINDOWS)
 #define CALLING_CONVENTION_IS_CDECL 1
 #else
@@ -110 +110 @@
 #define STDCALL __attribute__ ((stdcall))
     template<typename returnType>
-    FunctionPtr(returnType STDCALL(*value)())
+    FunctionPtr(returnType (STDCALL *value)())
         : m_value((void*)value)
     {
@@ -117 +117 @@
 
     template<typename returnType, typename argType1>
-    FunctionPtr(returnType STDCALL(*value)(argType1))
+    FunctionPtr(returnType (STDCALL *value)(argType1))
         : m_value((void*)value)
     {
@@ -124 +124 @@
 
     template<typename returnType, typename argType1, typename argType2>
-    FunctionPtr(returnType STDCALL(*value)(argType1, argType2))
+    FunctionPtr(returnType (STDCALL *value)(argType1, argType2))
         : m_value((void*)value)
     {
@@ -131 +131 @@
 
     template<typename returnType, typename argType1, typename argType2, typename argType3>
-    FunctionPtr(returnType STDCALL(*value)(argType1, argType2, argType3))
+    FunctionPtr(returnType (STDCALL *value)(argType1, argType2, argType3))
         : m_value((void*)value)
     {
@@ -138 +138 @@
 
     template<typename returnType, typename argType1, typename argType2, typename argType3, typename argType4>
-    FunctionPtr(returnType STDCALL(*value)(argType1, argType2, argType3, argType4))
+    FunctionPtr(returnType (STDCALL *value)(argType1, argType2, argType3, argType4))
         : m_value((void*)value)
     {