<!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>[165067] 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/165067">165067</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-03-04 12:12:01 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Build the Udis86 disassembler
https://bugs.webkit.org/show_bug.cgi?id=129679
Reviewed by Michael Saboff.
.:
* GNUmakefile.am: Add the Udis86_nosources variable.
* Source/cmake/OptionsGTK.cmake: Enable the Udis86 disassembler.
Source/JavaScriptCore:
* GNUmakefile.am: Generate the Udis86-related derived sources. Distribute the required files.
* GNUmakefile.list.am: Add the Udis86 disassembler files to the build.
Source/WTF:
* wtf/Platform.h: Also enable the Udis86 disassembler for the GTK port on Linux.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkGNUmakefileam">trunk/GNUmakefile.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefileam">trunk/Source/JavaScriptCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefilelistam">trunk/Source/JavaScriptCore/GNUmakefile.list.am</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="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-04 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * GNUmakefile.am: Add the Udis86_nosources variable.
+ * Source/cmake/OptionsGTK.cmake: Enable the Udis86 disassembler.
+
</ins><span class="cx"> 2014-03-04 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Simplify the GObject DOM bindings API break check into one step
</span></span></pre></div>
<a id="trunkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/GNUmakefile.am (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/GNUmakefile.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/GNUmakefile.am 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> javascriptcore_built_nosources :=
</span><span class="cx"> llint_nosources :=
</span><span class="cx"> offlineasm_nosources :=
</span><ins>+udis86_nosources :=
</ins><span class="cx"> platform_webcore_cppflags :=
</span><span class="cx"> platform_cppflags :=
</span><span class="cx"> platform_built_sources :=
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-04 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * GNUmakefile.am: Generate the Udis86-related derived sources. Distribute the required files.
+ * GNUmakefile.list.am: Add the Udis86 disassembler files to the build.
+
</ins><span class="cx"> 2014-03-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix too-narrow assertion I added in r165054.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.am (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/JavaScriptCore/GNUmakefile.am 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/debugger \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/dfg \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/disassembler \
</span><ins>+ -I$(srcdir)/Source/JavaScriptCore/disassembler/udis86 \
</ins><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/ftl \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/heap \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/inspector \
</span><span class="lines">@@ -127,6 +128,10 @@
</span><span class="cx"> DerivedSources/JavaScriptCore/JSCBuiltins.cpp: $(srcdir)/Source/JavaScriptCore/generate-js-builtins $(javascriptcore_builtins_js_nosources)
</span><span class="cx"> $(AM_V_GEN)$(PYTHON) $^ $@
</span><span class="cx">
</span><ins>+DerivedSources/JavaScriptCore/udis86_itab.h: DerivedSources/JavaScriptCore/udis86_itab.c
+DerivedSources/JavaScriptCore/udis86_itab.c: $(udis86_nosources)
+ $(AM_V_GEN)$(PYTHON) $(srcdir)/Source/JavaScriptCore/disassembler/udis86/itab.py --outputDir DerivedSources/JavaScriptCore $(srcdir)/Source/JavaScriptCore/disassembler/udis86/optable.xml
+
</ins><span class="cx"> $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS): DerivedSources/JavaScriptCore/LLIntAssembly.h
</span><span class="cx">
</span><span class="cx"> jsc: $(javascriptcore_built_nosources) Programs/jsc$(EXEEXT)
</span><span class="lines">@@ -230,7 +235,8 @@
</span><span class="cx"> Source/JavaScriptCore/THANKS \
</span><span class="cx"> $(javascriptcore_builtins_js_nosources) \
</span><span class="cx"> $(llint_nosources) \
</span><del>- $(offlineasm_nosources)
</del><ins>+ $(offlineasm_nosources) \
+ $(udis86_nosources)
</ins><span class="cx">
</span><span class="cx"> CLEANFILES += \
</span><span class="cx"> $(javascriptcore_built_nosources) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.list.am (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/JavaScriptCore/GNUmakefile.list.am 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> DerivedSources/JavaScriptCore/Bytecodes.h \
</span><span class="cx"> DerivedSources/JavaScriptCore/InitBytecodes.asm \
</span><span class="cx"> DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h \
</span><del>- DerivedSources/JavaScriptCore/LLIntAssembly.h
</del><ins>+ DerivedSources/JavaScriptCore/LLIntAssembly.h \
+ DerivedSources/JavaScriptCore/udis86_itab.c \
+ DerivedSources/JavaScriptCore/udis86_itab.h
</ins><span class="cx">
</span><span class="cx"> javascriptcore_builtins_js_nosources += \
</span><span class="cx"> $(wildcard $(srcdir)/Source/JavaScriptCore/builtins/*.js)
</span><span class="lines">@@ -463,7 +465,22 @@
</span><span class="cx"> Source/JavaScriptCore/disassembler/Disassembler.h \
</span><span class="cx"> Source/JavaScriptCore/disassembler/LLVMDisassembler.cpp \
</span><span class="cx"> Source/JavaScriptCore/disassembler/LLVMDisassembler.h \
</span><ins>+ Source/JavaScriptCore/disassembler/UDis86Disassembler.cpp \
+ Source/JavaScriptCore/disassembler/UDis86Disassembler.h \
</ins><span class="cx"> Source/JavaScriptCore/disassembler/X86Disassembler.cpp \
</span><ins>+ Source/JavaScriptCore/disassembler/udis86/udis86.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86.h \
+ Source/JavaScriptCore/disassembler/udis86/udis86_decode.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_decode.h \
+ Source/JavaScriptCore/disassembler/udis86/udis86_extern.h \
+ Source/JavaScriptCore/disassembler/udis86/udis86_input.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_input.h \
+ Source/JavaScriptCore/disassembler/udis86/udis86_itab_holder.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_syn.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_syn.h \
+ Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c \
+ Source/JavaScriptCore/disassembler/udis86/udis86_types.h \
</ins><span class="cx"> Source/JavaScriptCore/ftl/FTLAbbreviatedTypes.h \
</span><span class="cx"> Source/JavaScriptCore/ftl/FTLAbbreviations.h \
</span><span class="cx"> Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp \
</span><span class="lines">@@ -1326,6 +1343,12 @@
</span><span class="cx"> Source/JavaScriptCore/offlineasm/transform.rb \
</span><span class="cx"> Source/JavaScriptCore/offlineasm/x86.rb
</span><span class="cx">
</span><ins>+udis86_nosources += \
+ Source/JavaScriptCore/disassembler/udis86/itab.py \
+ Source/JavaScriptCore/disassembler/udis86/optable.xml \
+ Source/JavaScriptCore/disassembler/udis86/ud_opcode.py \
+ Source/JavaScriptCore/disassembler/udis86/ud_optable.py
+
</ins><span class="cx"> # minidom
</span><span class="cx"> Programs_minidom_SOURCES = \
</span><span class="cx"> Source/JavaScriptCore/API/tests/JSNode.c \
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/WTF/ChangeLog 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-04 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Build the Udis86 disassembler
+ https://bugs.webkit.org/show_bug.cgi?id=129679
+
+ Reviewed by Michael Saboff.
+
+ * wtf/Platform.h: Also enable the Udis86 disassembler for the GTK port on Linux.
+
</ins><span class="cx"> 2014-03-02 Jaehun Lim <ljaehun.lim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove m_initEfl from RunLoop.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/WTF/wtf/Platform.h 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> /* If possible, try to enable a disassembler. This is optional. We proceed in two
</span><span class="cx"> steps: first we try to find some disassembler that we can use, and then we
</span><span class="cx"> decide if the high-level disassembler API can be enabled. */
</span><del>-#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (PLATFORM(EFL) && OS(LINUX))) \
</del><ins>+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
</ins><span class="cx"> && (CPU(X86) || CPU(X86_64))
</span><span class="cx"> #define WTF_USE_UDIS86 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (165066 => 165067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-04 19:56:01 UTC (rev 165066)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-04 20:12:01 UTC (rev 165067)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> set(VERSION ${PROJECT_VERSION})
</span><span class="cx">
</span><span class="cx"> set(WTF_USE_SOUP 1)
</span><ins>+set(WTF_USE_UDIS86 1)
</ins><span class="cx">
</span><span class="cx"> set(WTF_OUTPUT_NAME WTFGTK)
</span><span class="cx"> set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
</span></span></pre>
</div>
</div>
</body>
</html>