Title: [108323] trunk/Source/_javascript_Core
- Revision
- 108323
- Author
- [email protected]
- Date
- 2012-02-21 01:09:22 -0800 (Tue, 21 Feb 2012)
Log Message
Attempted build fix for ELF platforms.
* dfg/DFGOperations.cpp:
(JSC):
(JSC::getHostCallReturnValueWithExecState):
* jit/HostCallReturnValue.cpp:
(JSC):
* jit/HostCallReturnValue.h:
(JSC::initializeHostCallReturnValue):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108322 => 108323)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-21 09:00:03 UTC (rev 108322)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-21 09:09:22 UTC (rev 108323)
@@ -1,3 +1,15 @@
+2012-02-21 Filip Pizlo <[email protected]>
+
+ Attempted build fix for ELF platforms.
+
+ * dfg/DFGOperations.cpp:
+ (JSC):
+ (JSC::getHostCallReturnValueWithExecState):
+ * jit/HostCallReturnValue.cpp:
+ (JSC):
+ * jit/HostCallReturnValue.h:
+ (JSC::initializeHostCallReturnValue):
+
2012-02-20 Filip Pizlo <[email protected]>
JSC should be a triple-tier VM
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.cpp (108322 => 108323)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-02-21 09:00:03 UTC (rev 108322)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2012-02-21 09:09:22 UTC (rev 108323)
@@ -1048,6 +1048,52 @@
#endif
} // extern "C"
-} } // namespace JSC::DFG
+} // namespace DFG
+#if COMPILER(GCC)
+
+#if CPU(X86_64)
+asm (
+".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
+HIDE_SYMBOL(getHostCallReturnValue) "\n"
+SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
+ "mov -40(%r13), %r13\n"
+ "mov %r13, %rdi\n"
+ "jmp " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
+);
+#elif CPU(X86)
+asm (
+".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
+HIDE_SYMBOL(getHostCallReturnValue) "\n"
+SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
+ "mov -40(%edi), %edi\n"
+ "mov %edi, 4(%esp)\n"
+ "jmp " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
+);
+#elif CPU(ARM_THUMB2)
+asm (
+".text" "\n"
+".align 2" "\n"
+".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
+HIDE_SYMBOL(getHostCallReturnValue) "\n"
+".thumb" "\n"
+".thumb_func " THUMB_FUNC_PARAM(getHostCallReturnValue) "\n"
+SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
+ "ldr r5, [r5, #-40]" "\n"
+ "cpy r0, r5" "\n"
+ "b " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
+);
#endif
+
+extern "C" EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValueWithExecState(ExecState* exec)
+{
+ if (!exec)
+ return JSValue::encode(JSValue());
+ return JSValue::encode(exec->globalData().hostCallReturnValue);
+}
+
+#endif // COMPILER(GCC)
+
+} // namespace JSC
+
+#endif
Modified: trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp (108322 => 108323)
--- trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp 2012-02-21 09:00:03 UTC (rev 108322)
+++ trunk/Source/_javascript_Core/jit/HostCallReturnValue.cpp 2012-02-21 09:09:22 UTC (rev 108323)
@@ -34,49 +34,7 @@
namespace JSC {
-#if COMPILER(GCC)
+// Nothing to see here.
-#if CPU(X86_64)
-asm (
-".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
-HIDE_SYMBOL(getHostCallReturnValue) "\n"
-SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
- "mov -40(%r13), %r13\n"
- "mov %r13, %rdi\n"
- "jmp " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
-);
-#elif CPU(X86)
-asm (
-".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
-HIDE_SYMBOL(getHostCallReturnValue) "\n"
-SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
- "mov -40(%edi), %edi\n"
- "mov %edi, 4(%esp)\n"
- "jmp " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
-);
-#elif CPU(ARM_THUMB2)
-asm (
-".text" "\n"
-".align 2" "\n"
-".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
-HIDE_SYMBOL(getHostCallReturnValue) "\n"
-".thumb" "\n"
-".thumb_func " THUMB_FUNC_PARAM(getHostCallReturnValue) "\n"
-SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
- "ldr r5, [r5, #-40]" "\n"
- "cpy r0, r5" "\n"
- "b " SYMBOL_STRING_RELOCATION(getHostCallReturnValueWithExecState) "\n"
-);
-#endif
-
-extern "C" EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValueWithExecState(ExecState* exec)
-{
- if (!exec)
- return JSValue::encode(JSValue());
- return JSValue::encode(exec->globalData().hostCallReturnValue);
-}
-
-#endif // COMPILER(GCC)
-
} // namespace JSC
Modified: trunk/Source/_javascript_Core/jit/HostCallReturnValue.h (108322 => 108323)
--- trunk/Source/_javascript_Core/jit/HostCallReturnValue.h 2012-02-21 09:00:03 UTC (rev 108322)
+++ trunk/Source/_javascript_Core/jit/HostCallReturnValue.h 2012-02-21 09:09:22 UTC (rev 108323)
@@ -50,6 +50,7 @@
inline void initializeHostCallReturnValue()
{
+ getHostCallReturnValue();
getHostCallReturnValueWithExecState(0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
