<!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>[204084] 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/204084">204084</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-03 10:12:55 -0700 (Wed, 03 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lacking support on a arm-traditional disassembler.
https://bugs.webkit.org/show_bug.cgi?id=123717
Reviewed by Mark Lam.
.:
* Source/cmake/FindLLVM.cmake: Added back the <a href="http://trac.webkit.org/projects/webkit/changeset/196749">r196749</a> state.
* Source/cmake/OptionsCommon.cmake: Added back the <a href="http://trac.webkit.org/projects/webkit/changeset/196749">r196749</a> state.
Source/JavaScriptCore:
* CMakeLists.txt:
* disassembler/ARMLLVMDisassembler.cpp: Added, based on pre <a href="http://trac.webkit.org/projects/webkit/changeset/196729">r196729</a> LLVMDisassembler, but it is ARM traditional only now.
(JSC::tryToDisassemble):
Source/WTF:
* wtf/Platform.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="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoredisassemblerARMLLVMDisassemblercpp">trunk/Source/JavaScriptCore/disassembler/ARMLLVMDisassembler.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 (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/ChangeLog 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-03 Csaba Osztrogonác <ossy@webkit.org>
+
+ Lacking support on a arm-traditional disassembler.
+ https://bugs.webkit.org/show_bug.cgi?id=123717
+
+ Reviewed by Mark Lam.
+
+ * Source/cmake/FindLLVM.cmake: Added back the r196749 state.
+ * Source/cmake/OptionsCommon.cmake: Added back the r196749 state.
+
</ins><span class="cx"> 2016-08-01 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> We should not keep the JavaScript tests inside the Source/JavaScriptCore/ directory.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -383,6 +383,7 @@
</span><span class="cx"> dfg/DFGWorklist.cpp
</span><span class="cx">
</span><span class="cx"> disassembler/ARM64Disassembler.cpp
</span><ins>+ disassembler/ARMLLVMDisassembler.cpp
</ins><span class="cx"> disassembler/ARMv7Disassembler.cpp
</span><span class="cx"> disassembler/Disassembler.cpp
</span><span class="cx"> disassembler/UDis86Disassembler.cpp
</span><span class="lines">@@ -893,6 +894,7 @@
</span><span class="cx"> set(JavaScriptCore_LIBRARIES
</span><span class="cx"> WTF${DEBUG_SUFFIX}
</span><span class="cx"> ${ICU_I18N_LIBRARIES}
</span><ins>+ ${LLVM_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(JavaScriptCore_SCRIPTS_SOURCES_DIR "${JAVASCRIPTCORE_DIR}/Scripts")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-03 Csaba Osztrogonác <ossy@webkit.org>
+
+ Lacking support on a arm-traditional disassembler.
+ https://bugs.webkit.org/show_bug.cgi?id=123717
+
+ Reviewed by Mark Lam.
+
+ * CMakeLists.txt:
+ * disassembler/ARMLLVMDisassembler.cpp: Added, based on pre r196729 LLVMDisassembler, but it is ARM traditional only now.
+ (JSC::tryToDisassemble):
+
</ins><span class="cx"> 2016-08-03 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement nested rest destructuring w.r.t the ES7 spec
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARMLLVMDisassemblercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/disassembler/ARMLLVMDisassembler.cpp (0 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARMLLVMDisassembler.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/disassembler/ARMLLVMDisassembler.cpp 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. 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 APPLE INC. ``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 "Disassembler.h"
+
+#if USE(ARM_LLVM_DISASSEMBLER)
+
+#include "MacroAssemblerCodeRef.h"
+#include <llvm-c/Disassembler.h>
+#include <llvm-c/Target.h>
+
+namespace JSC {
+
+bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out)
+{
+ LLVMInitializeAllTargetInfos();
+ LLVMInitializeAllTargetMCs();
+ LLVMInitializeAllDisassemblers();
+
+ const char* triple = "armv7-unknown-linux-gnueabihf";
+ LLVMDisasmContextRef disassemblyContext = LLVMCreateDisasm(triple, 0, 0, 0, 0);
+
+ RELEASE_ASSERT(disassemblyContext);
+
+ char pcString[20];
+ char instructionString[100];
+
+ uint8_t* pc = static_cast<uint8_t*>(codePtr.executableAddress());
+ uint8_t* end = pc + size;
+
+ while (pc < end) {
+ snprintf(
+ pcString, sizeof(pcString), "0x%lx",
+ static_cast<unsigned long>(bitwise_cast<uintptr_t>(pc)));
+
+ size_t instructionSize = LLVMDisasmInstruction(
+ disassemblyContext, pc, end - pc, bitwise_cast<uintptr_t>(pc),
+ instructionString, sizeof(instructionString));
+
+ if (!instructionSize)
+ snprintf(instructionString, sizeof(instructionString), "unknown instruction");
+
+ out.printf("%s%16s: [0x%08lx] %s\n", prefix, pcString, *(reinterpret_cast<unsigned long*>(pc)), instructionString);
+ pc += 4;
+ }
+
+ LLVMDisasmDispose(disassemblyContext);
+ return true;
+}
+
+} // namespace JSC
+
+#endif // USE(ARM_LLVM_DISASSEMBLER)
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/Source/WTF/ChangeLog 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-03 Csaba Osztrogonác <ossy@webkit.org>
+
+ Lacking support on a arm-traditional disassembler.
+ https://bugs.webkit.org/show_bug.cgi?id=123717
+
+ Reviewed by Mark Lam.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-08-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Update breaking rules to match ICU 57
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/Source/WTF/wtf/Platform.h 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -743,7 +743,11 @@
</span><span class="cx"> #define USE_ARMV7_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(ARM64_DISASSEMBLER))
</del><ins>+#if !defined(USE_ARM_LLVM_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM_TRADITIONAL) && HAVE(LLVM)
+#define USE_ARM_LLVM_DISASSEMBLER 1
+#endif
+
+#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(ARM64_DISASSEMBLER) || USE(ARM_LLVM_DISASSEMBLER))
</ins><span class="cx"> #define ENABLE_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindLLVMcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindLLVM.cmake (0 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindLLVM.cmake (rev 0)
+++ trunk/Source/cmake/FindLLVM.cmake 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -0,0 +1,49 @@
</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.
+
+
+foreach (_program_name llvm-config llvm-config-3.7 llvm-config-3.6 llvm-config-3.5)
+ find_program(LLVM_CONFIG_EXE NAMES ${_program_name})
+ if (LLVM_CONFIG_EXE)
+ execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if ("${LLVM_VERSION}" VERSION_LESS "${LLVM_FIND_VERSION}")
+ unset(LLVM_CONFIG_EXE CACHE)
+ else ()
+ break ()
+ endif ()
+ endif ()
+endforeach ()
+
+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)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --system-libs OUTPUT_VARIABLE LLVM_SYSTEM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --libdir OUTPUT_VARIABLE LLVM_LIBS_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --libs OUTPUT_VARIABLE LLVM_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Depending on how llvm was built, we could have either a global .so file when built using autotools,
+# or multiple .so files for each static library when built using CMake. So, we set the LLVM_LIBS_DIRECTORY
+# variable here accordingly for each case.
+# We need to build the soname manually in any case, since there's currently no way to get it from llvm-config.
+set(LLVM_SONAME "LLVM-${LLVM_VERSION}")
+if (EXISTS "${LLVM_LIBS_DIRECTORY}/lib${LLVM_SONAME}.so")
+ set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -l${LLVM_SONAME}")
+else ()
+ set(LLVM_LIBRARIES "${LLVM_LDFLAGS} ${LLVM_LIBS}")
+endif ()
+
+# convert the list of paths into a cmake list
+separate_arguments(LLVM_STATIC_LIBRARIES)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LLVM
+ REQUIRED_VARS LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_STATIC_LIBRARIES
+ VERSION_VAR LLVM_VERSION)
+
+mark_as_advanced(LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_STATIC_LIBRARIES)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (204083 => 204084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2016-08-03 16:53:15 UTC (rev 204083)
+++ trunk/Source/cmake/OptionsCommon.cmake 2016-08-03 17:12:55 UTC (rev 204084)
</span><span class="lines">@@ -144,6 +144,11 @@
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (USE_ARM_LLVM_DISASSEMBLER)
+ find_package(LLVM REQUIRED)
+ SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
+endif ()
+
</ins><span class="cx"> # Enable the usage of OpenMP.
</span><span class="cx"> # - At this moment, OpenMP is only used as an alternative implementation
</span><span class="cx"> # to native threads for the parallelization of the SVG filters.
</span></span></pre>
</div>
</div>
</body>
</html>