Changeset 37457 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Oct 9, 2008, 5:50:25 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-09 Alp Toker <​[email protected]>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=20760
Implement support for x86 Linux in CTI

Prepare to enable CTI/WREC on supported architectures.

Make it possible to use the CTI_ARGUMENT workaround with GCC as well
as MSVC by fixing some preprocessor conditionals.

Note that CTI/WREC no longer requires CTI_ARGUMENT on Linux so we
don't actually enable it except when building with MSVC. GCC on Win32
remains untested.

Adapt inline ASM code to use the global symbol underscore prefix only
on Darwin and to call the properly mangled Machine::cti_vm_throw
symbol name depending on CTI_ARGUMENT.

Also avoid global inclusion of the JIT infrastructure headers
throughout WebCore and WebKit causing recompilation of about ~1500
source files after modification to X86Assembler.h, CTI.h, WREC.h,
which are only used deep inside JavaScriptCore.

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -85 +85 @@
 #if COMPILER(GCC) && PLATFORM(X86)
 
+#if PLATFORM(DARWIN)
+#define SYMBOL_STRING(name) "_" #name
+#else
+#define SYMBOL_STRING(name) #name
+#endif
+
 asm(
-".globl _ctiTrampoline" "\n"
-"_ctiTrampoline:" "\n"
+".globl " SYMBOL_STRING(ctiTrampoline) "\n"
+SYMBOL_STRING(ctiTrampoline) ":" "\n"
     "pushl %esi" "\n"
     "pushl %edi" "\n"
@@ -101 +107 @@
 
 asm(
-".globl _ctiVMThrowTrampoline" "\n"
-"_ctiVMThrowTrampoline:" "\n"
-    "call __ZN3JSC7Machine12cti_vm_throwEPv" "\n"
+".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
+SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
+#if USE(CTI_ARGUMENT)
+    "call " SYMBOL_STRING(_ZN3JSC7Machine12cti_vm_throwEPPv) "\n"
+#else
+    "call " SYMBOL_STRING(_ZN3JSC7Machine12cti_vm_throwEPv) "\n"
+#endif
     "addl $0x24, %esp" "\n"
     "popl %edi" "\n"