Changeset 129774 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

Timestamp:

Sep 27, 2012, 10:09:02 AM (13 years ago)

Author:

Patrick Gansterer

Message:

Fix usage of COMPILER() macros
​https://bugs.webkit.org/show_bug.cgi?id=97642

Reviewed by Geoffrey Garen.

Add COMPILER(GCC) around compiler specific code and remove it from generic code.
This allows us to implement the DFG code for other compilers to in a next step.

• dfg/DFGOperations.cpp:
• jit/HostCallReturnValue.h:

File:

• trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -50 +50 @@
 #if ENABLE(DFG_JIT)
 
-#if CPU(X86_64)
+#if COMPILER(GCC) && CPU(X86_64)
 
 #define FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, register) \
@@ -65 +65 @@
 #define FUNCTION_WRAPPER_WITH_RETURN_ADDRESS_EJCI(function) FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, r8)
 
-#elif CPU(X86)
+#elif COMPILER(GCC) && CPU(X86)
 
 #define FUNCTION_WRAPPER_WITH_RETURN_ADDRESS(function, offset) \
@@ -1426 +1426 @@
 #endif // ENABLE(DFG_JIT)
 
-#if COMPILER(GCC)
-
 namespace JSC {
 
-#if CPU(X86_64)
+#if COMPILER(GCC) && CPU(X86_64)
 asm (
 ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
@@ -1439 +1437 @@
     "jmp " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
 );
-#elif CPU(X86)
+#elif COMPILER(GCC) && CPU(X86)
 asm (
 ".text" "\n" \
@@ -1449 +1447 @@
     "jmp " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
 );
-#elif CPU(ARM_THUMB2)
+#elif COMPILER(GCC) && CPU(ARM_THUMB2)
 asm (
 ".text" "\n"
@@ -1462 +1460 @@
     "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
 );
-#elif CPU(ARM_TRADITIONAL)
+#elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
 asm (
 ".text" "\n"
@@ -1484 +1482 @@
 } // namespace JSC
 
-#endif // COMPILER(GCC)
-
 #endif // ENABLE(JIT)