<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161498] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161498">161498</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-08 07:21:27 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Make FTL buildable
https://bugs.webkit.org/show_bug.cgi?id=125777
Patch by Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com> on 2014-01-08
Reviewed by Csaba Osztrogonác.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* CMakeLists.txt:
* ftl/FTLOSREntry.cpp:
* ftl/FTLOSRExitCompiler.cpp:
* llvm/library/config_llvm.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellvmlibraryconfig_llvmh">trunk/Source/JavaScriptCore/llvm/library/config_llvm.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorellvmInitializeLLVMLinuxcpp">trunk/Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp</a></li>
<li><a href="#trunkSourcecmakeFindLLVMcmake">trunk/Source/cmake/FindLLVM.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/ChangeLog 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-08 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
+
+ [EFL] Make FTL buildable
+ https://bugs.webkit.org/show_bug.cgi?id=125777
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmakeconfig.h.cmake:
+
</ins><span class="cx"> 2014-01-08 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r160304): [GTK] Disable libtool fast install
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/interpreter"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/jit"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/llint"
</span><ins>+ "${JAVASCRIPTCORE_DIR}/llvm"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/parser"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/profiler"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/runtime"
</span><span class="lines">@@ -576,6 +577,81 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_FTL_JIT)
+ if (NOT LLVM_STATIC_LIBRARIES)
+ message(FATAL_ERROR "No LLVM libs found, but FTL is enabled. Stopping build.")
+ endif ()
+
+ # Configure llvmForJSC.so
+ set(llvmForJSC_SOURCES
+ llvm/library/LLVMAnchor.cpp
+ llvm/library/LLVMExports.cpp
+ llvm/library/LLVMOverrides.cpp
+ )
+ set(llvmForJSC_INCLUDE_DIRECTORIES
+ ${LLVM_INCLUDE_DIRS}
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ )
+
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+ DEPENDS ${LLVM_STATIC_LIBRARIES}
+ COMMAND ${CMAKE_COMMAND} -E touch ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+ VERBATIM)
+
+ WEBKIT_WRAP_SOURCELIST(${llvmForJSC_SOURCES})
+ add_library(llvmForJSC SHARED ${llvmForJSC_SOURCES} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h)
+ target_link_libraries(llvmForJSC ${LLVM_STATIC_LIBRARIES} "pthread" "dl")
+
+ # Added extra items for JavaScriptCore
+ list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ ${LLVM_INCLUDE_DIRS}
+ )
+
+ list(APPEND JavaScriptCore_SOURCES
+ llvm/InitializeLLVM.cpp
+ llvm/InitializeLLVMPOSIX.cpp
+ llvm/InitializeLLVMLinux.cpp
+ llvm/LLVMAPI.cpp
+
+ dfg/DFGToFTLDeferredCompilationCallback.cpp
+ dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
+
+ disassembler/LLVMDisassembler.cpp
+ disassembler/X86Disassembler.cpp
+
+ ftl/FTLAbstractHeap.cpp
+ ftl/FTLAbstractHeapRepository.cpp
+ ftl/FTLCapabilities.cpp
+ ftl/FTLCommonValues.cpp
+ ftl/FTLCompile.cpp
+ ftl/FTLExitArgument.cpp
+ ftl/FTLExitArgumentForOperand.cpp
+ ftl/FTLExitThunkGenerator.cpp
+ ftl/FTLExitValue.cpp
+ ftl/FTLFail.cpp
+ ftl/FTLForOSREntryJITCode.cpp
+ ftl/FTLInlineCacheSize.cpp
+ ftl/FTLIntrinsicRepository.cpp
+ ftl/FTLJITCode.cpp
+ ftl/FTLJITFinalizer.cpp
+ ftl/FTLLink.cpp
+ ftl/FTLLocation.cpp
+ ftl/FTLLowerDFGToLLVM.cpp
+ ftl/FTLOSREntry.cpp
+ ftl/FTLOSRExit.cpp
+ ftl/FTLOSRExitCompiler.cpp
+ ftl/FTLOutput.cpp
+ ftl/FTLSaveRestore.cpp
+ ftl/FTLSlowPathCall.cpp
+ ftl/FTLSlowPathCallKey.cpp
+ ftl/FTLStackMaps.cpp
+ ftl/FTLState.cpp
+ ftl/FTLThunks.cpp
+ ftl/FTLValueFormat.cpp
+ )
+endif ()
+
</ins><span class="cx"> set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table)
</span><span class="cx"> macro(GENERATE_HASH_LUT _input _output)
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -596,7 +672,6 @@
</span><span class="cx"> assembler
</span><span class="cx"> bindings
</span><span class="cx"> bytecode
</span><del>- collector/handles
</del><span class="cx"> debugger
</span><span class="cx"> heap
</span><span class="cx"> inspector
</span><span class="lines">@@ -607,6 +682,8 @@
</span><span class="cx"> profiler
</span><span class="cx"> runtime
</span><span class="cx"> yarr
</span><ins>+
+ collector/handles
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_FORWARDING_HEADERS_FILES
</span><span class="lines">@@ -771,3 +848,7 @@
</span><span class="cx"> set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
</span><span class="cx"> install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
</span><span class="cx"> endif ()
</span><ins>+
+if (ENABLE_FTL_JIT)
+ add_dependencies(JavaScriptCore llvmForJSC)
+endif ()
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-08 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
+
+ [EFL] Make FTL buildable
+ https://bugs.webkit.org/show_bug.cgi?id=125777
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt:
+ * ftl/FTLOSREntry.cpp:
+ * ftl/FTLOSRExitCompiler.cpp:
+ * llvm/library/config_llvm.h:
+
</ins><span class="cx"> 2014-01-08 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Automake] Scripts for generated build targets do not necessarily produce their output
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmInitializeLLVMLinuxcppfromrev161497trunkSourceJavaScriptCorellvmlibraryconfig_llvmh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp (from rev 161497, trunk/Source/JavaScriptCore/llvm/library/config_llvm.h) (0 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Szeged. All rights reserved.
+ * Copyright (C) 2013 Samsung Electronics. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "InitializeLLVM.h"
+
+#if HAVE(LLVM)
+
+#include "InitializeLLVMPOSIX.h"
+
+namespace JSC {
+
+void initializeLLVMImpl()
+{
+ initializeLLVMPOSIX("libllvmForJSC.so");
+}
+
+} // namespace JSC
+
+#endif // HAVE(LLVM)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmlibraryconfig_llvmh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llvm/library/config_llvm.h (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/library/config_llvm.h 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/Source/JavaScriptCore/llvm/library/config_llvm.h 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -23,6 +23,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#endif
+#endif
</ins><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/ExportMacros.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindLLVMcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindLLVM.cmake (0 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindLLVM.cmake (rev 0)
+++ trunk/Source/cmake/FindLLVM.cmake 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+#
+# Check if the llvm-config gives us the path for the llvm libs.
+#
+# The following variables are set:
+# LLVM_CONFIG_EXE
+# LLVM_VERSION
+# LLVM_INCLUDE_DIRS - include directories for the llvm headers.
+# LLVM_STATIC_LIBRARIES - list of paths for the static llvm libraries.
+
+find_program(LLVM_CONFIG_EXE NAMES "llvm-config")
+
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --libfiles OUTPUT_VARIABLE LLVM_STATIC_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# convert the list of paths into a cmake list
+separate_arguments(LLVM_STATIC_LIBRARIES)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LLVM DEFAULT_MSG
+ LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_STATIC_LIBRARIES)
+
+mark_as_advanced(LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_STATIC_LIBRARIES)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -281,3 +281,8 @@
</span><span class="cx"> set(WTF_USE_LEVELDB 1)
</span><span class="cx"> add_definitions(-DWTF_USE_LEVELDB=1)
</span><span class="cx"> endif ()
</span><ins>+
+if (ENABLE_FTL_JIT)
+ find_package(LLVM REQUIRED)
+ set(HAVE_LLVM ON)
+endif ()
</ins></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (161497 => 161498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-01-08 15:13:06 UTC (rev 161497)
+++ trunk/Source/cmakeconfig.h.cmake 2014-01-08 15:21:27 UTC (rev 161498)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #cmakedefine01 ENABLE_FILTERS
</span><span class="cx"> #cmakedefine01 ENABLE_FIXED_REPORTED_SIZE
</span><span class="cx"> #cmakedefine01 ENABLE_FTPDIR
</span><ins>+#cmakedefine01 ENABLE_FTL_JIT
</ins><span class="cx"> #cmakedefine01 ENABLE_FONT_LOAD_EVENTS
</span><span class="cx"> #cmakedefine01 ENABLE_FULLSCREEN_API
</span><span class="cx"> #cmakedefine01 ENABLE_GAMEPAD
</span><span class="lines">@@ -125,5 +126,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_XSLT
</span><span class="cx"> #cmakedefine01 USE_SYSTEM_MALLOC
</span><span class="cx"> #cmakedefine01 WTF_USE_TILED_BACKING_STORE
</span><ins>+#cmakedefine01 HAVE_LLVM
</ins><span class="cx">
</span><span class="cx"> #endif /* CMAKECONFIG_H */
</span></span></pre>
</div>
</div>
</body>
</html>