<!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>[161672] 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/161672">161672</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 13:37:34 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][JSC] Enable udis86 disassembler on efl.
https://bugs.webkit.org/show_bug.cgi?id=125502
Patch by Tamas Gergely <tgergely.u-szeged@partner.samsung.com> on 2014-01-10
Reviewed by Michael Saboff.
Enable udis86 disassembler on efl and fix build warnings.
.:
* Source/cmake/OptionsEfl.cmake:
Enable udis86 disassembler.
Source/JavaScriptCore:
* CMakeLists.txt:
Add udis86 disassembler source files.
* disassembler/udis86/udis86_decode.c:
(decode_modrm_rm):
Build warning fixes.
* disassembler/udis86/udis86_syn-att.c:
(gen_operand):
Build warning fixes.
* disassembler/udis86/udis86_syn-intel.c:
(gen_operand):
Build warning fixes.
* disassembler/udis86/udis86_types.h:
Correct FMT64 for uint64_t.
Source/WTF:
* wtf/Platform.h:
Enable udis86 disassembler on EFL.</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="#trunkSourceJavaScriptCoredisassemblerudis86udis86_decodec">trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerudis86udis86_synattc">trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerudis86udis86_synintelc">trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerudis86udis86_typesh">trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h</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="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-10 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
+
+ [EFL][JSC] Enable udis86 disassembler on efl.
+ https://bugs.webkit.org/show_bug.cgi?id=125502
+
+ Reviewed by Michael Saboff.
+
+ Enable udis86 disassembler on efl and fix build warnings.
+
+ * Source/cmake/OptionsEfl.cmake:
+ Enable udis86 disassembler.
+
</ins><span class="cx"> 2014-01-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry port from trunk
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -498,6 +498,36 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (WTF_USE_UDIS86)
+ set(UDIS_GEN_DEP
+ disassembler/udis86/ud_opcode.py
+ disassembler/udis86/ud_optable.py
+ )
+
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+ DEPENDS ${UDIS_GEN_DEP}
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+ COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml
+ VERBATIM)
+
+ list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+ ${JAVASCRIPTCORE_DIR}/disassembler/udis86
+ )
+ list(APPEND JavaScriptCore_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
+ )
+ list(APPEND JavaScriptCore_SOURCES
+ disassembler/udis86/udis86.c
+ disassembler/udis86/udis86_decode.c
+ disassembler/udis86/udis86_input.c
+ disassembler/udis86/udis86_itab_holder.c
+ disassembler/udis86/udis86_syn-att.c
+ disassembler/udis86/udis86_syn-intel.c
+ disassembler/udis86/udis86_syn.c
+ )
+endif ()
+
</ins><span class="cx"> if (ENABLE_LLINT)
</span><span class="cx"> # We cannot check for RUBY_FOUND because it is set only when the full package is installed and
</span><span class="cx"> # the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-10 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
+
+ [EFL][JSC] Enable udis86 disassembler on efl.
+ https://bugs.webkit.org/show_bug.cgi?id=125502
+
+ Reviewed by Michael Saboff.
+
+ Enable udis86 disassembler on efl and fix build warnings.
+
+ * CMakeLists.txt:
+ Add udis86 disassembler source files.
+ * disassembler/udis86/udis86_decode.c:
+ (decode_modrm_rm):
+ Build warning fixes.
+ * disassembler/udis86/udis86_syn-att.c:
+ (gen_operand):
+ Build warning fixes.
+ * disassembler/udis86/udis86_syn-intel.c:
+ (gen_operand):
+ Build warning fixes.
+ * disassembler/udis86/udis86_types.h:
+ Correct FMT64 for uint64_t.
+
</ins><span class="cx"> 2014-01-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry files outside WebCore
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerudis86udis86_decodec"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -459,6 +459,8 @@
</span><span class="cx"> rm = (REX_B(u->pfx_rex) << 3) | MODRM_RM(modrm(u));
</span><span class="cx"> reg = (REX_R(u->pfx_rex) << 3) | MODRM_REG(modrm(u));
</span><span class="cx">
</span><ins>+ UNUSED_PARAM(reg);
+
</ins><span class="cx"> op->size = resolve_operand_size(u, size);
</span><span class="cx">
</span><span class="cx"> /*
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerudis86udis86_synattc"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> mkasm(u, "0x%x", op->lval.sdword);
</span><span class="cx"> } else if (op->offset == 64) {
</span><span class="cx"> if (op->lval.sdword < 0)
</span><del>- mkasm(u, "-0x" FMT64 "x", -op->lval.sqword);
</del><ins>+ mkasm(u, "-0x" FMT64 "x", (uint64_t)-op->lval.sqword);
</ins><span class="cx"> else
</span><del>- mkasm(u, "0x" FMT64 "x", op->lval.sqword);
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)op->lval.sqword);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (op->base)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( sext_size < 64 )
</span><span class="cx"> sext_mask = ( 1ull << sext_size ) - 1;
</span><del>- mkasm( u, "$0x" FMT64 "x", imm & sext_mask );
</del><ins>+ mkasm( u, "$0x" FMT64 "x", (uint64_t)(imm & sext_mask) );
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -127,16 +127,16 @@
</span><span class="cx"> case UD_OP_JIMM:
</span><span class="cx"> switch (op->size) {
</span><span class="cx"> case 8:
</span><del>- mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sbyte);
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sbyte));
</ins><span class="cx"> break;
</span><span class="cx"> case 16:
</span><del>- mkasm(u, "0x" FMT64 "x", (u->pc + op->lval.sword) & 0xffff );
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)((u->pc + op->lval.sword) & 0xffff) );
</ins><span class="cx"> break;
</span><span class="cx"> case 32:
</span><span class="cx"> if (u->dis_mode == 32)
</span><del>- mkasm(u, "0x" FMT64 "x", (u->pc + op->lval.sdword) & 0xffffffff);
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)((u->pc + op->lval.sdword) & 0xffffffff));
</ins><span class="cx"> else
</span><del>- mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sdword);
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sdword));
</ins><span class="cx"> break;
</span><span class="cx"> default:break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerudis86udis86_synintelc"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> else mkasm(u, "%s0x%lx", (op_f) ? "+" : "", (unsigned long)op->lval.udword);
</span><span class="cx"> }
</span><span class="cx"> else if (op->offset == 64)
</span><del>- mkasm(u, "%s0x" FMT64 "x", (op_f) ? "+" : "", op->lval.uqword);
</del><ins>+ mkasm(u, "%s0x" FMT64 "x", (op_f) ? "+" : "", (uint64_t)op->lval.uqword);
</ins><span class="cx">
</span><span class="cx"> mkasm(u, "]");
</span><span class="cx"> break;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( sext_size < 64 )
</span><span class="cx"> sext_mask = ( 1ull << sext_size ) - 1;
</span><del>- mkasm( u, "0x" FMT64 "x", imm & sext_mask );
</del><ins>+ mkasm( u, "0x" FMT64 "x", (uint64_t)(imm & sext_mask) );
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -143,13 +143,13 @@
</span><span class="cx"> if (syn_cast) opr_cast(u, op);
</span><span class="cx"> switch (op->size) {
</span><span class="cx"> case 8:
</span><del>- mkasm(u, "0x" FMT64 "x", u->pc + op->lval.sbyte);
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)(u->pc + op->lval.sbyte));
</ins><span class="cx"> break;
</span><span class="cx"> case 16:
</span><del>- mkasm(u, "0x" FMT64 "x", ( u->pc + op->lval.sword ) & 0xffff );
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)(( u->pc + op->lval.sword ) & 0xffff) );
</ins><span class="cx"> break;
</span><span class="cx"> case 32:
</span><del>- mkasm(u, "0x" FMT64 "x", ( u->pc + op->lval.sdword ) & 0xfffffffful );
</del><ins>+ mkasm(u, "0x" FMT64 "x", (uint64_t)(( u->pc + op->lval.sdword ) & 0xfffffffful) );
</ins><span class="cx"> break;
</span><span class="cx"> default:break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerudis86udis86_typesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -48,7 +48,11 @@
</span><span class="cx"> typedef __int32 int32_t;
</span><span class="cx"> typedef __int64 int64_t;
</span><span class="cx"> #else
</span><del>-# define FMT64 "%ll"
</del><ins>+# if defined(__GNU_LIBRARY__) && defined(__WORDSIZE) && (__WORDSIZE == 64)
+# define FMT64 "%l"
+# else
+# define FMT64 "%ll"
+# endif
</ins><span class="cx"> # ifndef __UD_STANDALONE__
</span><span class="cx"> # include <inttypes.h>
</span><span class="cx"> # endif /* __UD_STANDALONE__ */
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/WTF/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-10 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
+
+ [EFL][JSC] Enable udis86 disassembler on efl.
+ https://bugs.webkit.org/show_bug.cgi?id=125502
+
+ Reviewed by Michael Saboff.
+
+ Enable udis86 disassembler on efl and fix build warnings.
+
+ * wtf/Platform.h:
+ Enable udis86 disassembler on EFL.
+
</ins><span class="cx"> 2014-01-10 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable the DFG_JIT on ARMv7
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/WTF/wtf/Platform.h 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -685,7 +685,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) && PLATFORM(MAC) \
</del><ins>+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && (PLATFORM(MAC) || (PLATFORM(EFL) && OS(LINUX))) \
</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="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (161671 => 161672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-01-10 21:37:19 UTC (rev 161671)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-01-10 21:37:34 UTC (rev 161672)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> set(WTF_USE_ICU_UNICODE 1)
</span><span class="cx"> set(WTF_USE_SOUP 1)
</span><ins>+set(WTF_USE_UDIS86 1)
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DWTF_USE_GLIB=1)
</span><span class="cx"> add_definitions(-DWTF_USE_SOUP=1)
</span></span></pre>
</div>
</div>
</body>
</html>