<!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>[172799] trunk/Source</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/172799">172799</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-20 10:59:10 -0700 (Wed, 20 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable ARM64 disassembler on EFL
https://bugs.webkit.org/show_bug.cgi?id=136089
Patch by Akos Kiss <akiss@inf.u-szeged.hu> on 2014-08-20
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
* CMakeLists.txt:
Added disassembler/ARM64Disassembler.cpp and
disassembler/ARM64/A64DOpcode.cpp to JavaScriptCore_SOURCES.
* disassembler/ARM64/A64DOpcode.cpp:
Added USE(ARM64_DISASSEMBLER) guard around implementation.
* disassembler/ARM64/A64DOpcode.h:
(JSC::ARM64Disassembler::A64DOpcode::appendUnsignedImmediate64):
(JSC::ARM64Disassembler::A64DOpcode::appendPCRelativeOffset):
Made format strings portable by changing "%llx" to "%" PRIx64 for
uint64_t arguments.
Source/WTF:
* wtf/Platform.h:
Enable WTF_USE_ARM64_DISASSEMBLER for EFL as well.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodecpp">trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodeh">trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -225,7 +225,9 @@
</span><span class="cx"> dfg/DFGWatchpointCollectionPhase.cpp
</span><span class="cx"> dfg/DFGWorklist.cpp
</span><span class="cx">
</span><ins>+ disassembler/ARM64/A64DOpcode.cpp
</ins><span class="cx"> disassembler/ARMv7/ARMv7DOpcode.cpp
</span><ins>+ disassembler/ARM64Disassembler.cpp
</ins><span class="cx"> disassembler/ARMv7Disassembler.cpp
</span><span class="cx"> disassembler/Disassembler.cpp
</span><span class="cx"> disassembler/LLVMDisassembler.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-20 Akos Kiss <akiss@inf.u-szeged.hu>
+
+ Enable ARM64 disassembler on EFL
+ https://bugs.webkit.org/show_bug.cgi?id=136089
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ Added disassembler/ARM64Disassembler.cpp and
+ disassembler/ARM64/A64DOpcode.cpp to JavaScriptCore_SOURCES.
+
+ * disassembler/ARM64/A64DOpcode.cpp:
+ Added USE(ARM64_DISASSEMBLER) guard around implementation.
+
+ * disassembler/ARM64/A64DOpcode.h:
+ (JSC::ARM64Disassembler::A64DOpcode::appendUnsignedImmediate64):
+ (JSC::ARM64Disassembler::A64DOpcode::appendPCRelativeOffset):
+ Made format strings portable by changing "%llx" to "%" PRIx64 for
+ uint64_t arguments.
+
</ins><span class="cx"> 2014-08-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r172401): for-in optimization no longer works at all
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if USE(ARM64_DISASSEMBLER)
+
</ins><span class="cx"> #include "A64DOpcode.h"
</span><span class="cx">
</span><span class="cx"> #include <stdarg.h>
</span><span class="lines">@@ -1194,3 +1197,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::ARM64Disassembler
</span><ins>+
+#endif // USE(ARM64_DISASSEMBLER)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredisassemblerARM64A64DOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -172,12 +172,12 @@
</span><span class="cx">
</span><span class="cx"> void appendUnsignedImmediate64(uint64_t immediate)
</span><span class="cx"> {
</span><del>- bufferPrintf("#0x%llx", immediate);
</del><ins>+ bufferPrintf("#0x%" PRIx64, immediate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendPCRelativeOffset(uint32_t* pc, int32_t immediate)
</span><span class="cx"> {
</span><del>- bufferPrintf("0x%llx", reinterpret_cast<uint64_t>(pc + immediate));
</del><ins>+ bufferPrintf("0x%" PRIx64, reinterpret_cast<uint64_t>(pc + immediate));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendShiftAmount(unsigned amount)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/WTF/ChangeLog 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-20 Akos Kiss <akiss@inf.u-szeged.hu>
+
+ Enable ARM64 disassembler on EFL
+ https://bugs.webkit.org/show_bug.cgi?id=136089
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/Platform.h:
+ Enable WTF_USE_ARM64_DISASSEMBLER for EFL as well.
+
</ins><span class="cx"> 2014-08-19 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PurgeableBuffer since it is not very useful any more
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (172798 => 172799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-08-20 17:56:27 UTC (rev 172798)
+++ trunk/Source/WTF/wtf/Platform.h 2014-08-20 17:59:10 UTC (rev 172799)
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> #define ENABLE_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && PLATFORM(IOS) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
</del><ins>+#if !defined(WTF_USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && (PLATFORM(IOS) || PLATFORM(EFL)) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
</ins><span class="cx"> #define WTF_USE_ARM64_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>