<!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>[193955] trunk/Source/JavaScriptCore</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/193955">193955</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-11 09:15:58 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Little cleanup of FTLOutput type casts and conversions
https://bugs.webkit.org/show_bug.cgi?id=152166
Reviewed by Geoffrey Garen.
Clean up:
-Change fpCast() to explicit conversion doubleToFloat() and floatToDouble()
to match B3's opcodes.
-Remove unused conversion functions.
-Use the most specific cast function when possible.
-Functions that are only used inside FTLOutput are made private.
In FTLB3Output, those functions were removed.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::doubleToFloat):
(JSC::FTL::Output::floatToDouble):
(JSC::FTL::Output::fround):
(JSC::FTL::Output::fpToInt): Deleted.
(JSC::FTL::Output::fpToUInt): Deleted.
(JSC::FTL::Output::intToFP): Deleted.
(JSC::FTL::Output::unsignedToFP): Deleted.
(JSC::FTL::Output::intCast): Deleted.
(JSC::FTL::Output::fpCast): Deleted.
(JSC::FTL::Output::intToPtr): Deleted.
(JSC::FTL::Output::ptrToInt): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
(JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
* ftl/FTLOutput.h:
(JSC::FTL::Output::doubleToFloat):
(JSC::FTL::Output::floatToDouble):
(JSC::FTL::Output::intCast):
(JSC::FTL::Output::fpToInt):
(JSC::FTL::Output::fpToUInt):
(JSC::FTL::Output::fpCast):
(JSC::FTL::Output::intToFP):
(JSC::FTL::Output::unsignedToFP):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputh">trunk/Source/JavaScriptCore/ftl/FTLOutput.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193954 => 193955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-11 17:15:58 UTC (rev 193955)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-12-11 Benjamin Poulain <benjamin@webkit.org>
+
+ [JSC] Little cleanup of FTLOutput type casts and conversions
+ https://bugs.webkit.org/show_bug.cgi?id=152166
+
+ Reviewed by Geoffrey Garen.
+
+ Clean up:
+ -Change fpCast() to explicit conversion doubleToFloat() and floatToDouble()
+ to match B3's opcodes.
+ -Remove unused conversion functions.
+ -Use the most specific cast function when possible.
+ -Functions that are only used inside FTLOutput are made private.
+ In FTLB3Output, those functions were removed.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::doubleToFloat):
+ (JSC::FTL::Output::floatToDouble):
+ (JSC::FTL::Output::fround):
+ (JSC::FTL::Output::fpToInt): Deleted.
+ (JSC::FTL::Output::fpToUInt): Deleted.
+ (JSC::FTL::Output::intToFP): Deleted.
+ (JSC::FTL::Output::unsignedToFP): Deleted.
+ (JSC::FTL::Output::intCast): Deleted.
+ (JSC::FTL::Output::fpCast): Deleted.
+ (JSC::FTL::Output::intToPtr): Deleted.
+ (JSC::FTL::Output::ptrToInt): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::doubleToFloat):
+ (JSC::FTL::Output::floatToDouble):
+ (JSC::FTL::Output::intCast):
+ (JSC::FTL::Output::fpToInt):
+ (JSC::FTL::Output::fpToUInt):
+ (JSC::FTL::Output::fpCast):
+ (JSC::FTL::Output::intToFP):
+ (JSC::FTL::Output::unsignedToFP):
+
</ins><span class="cx"> 2015-12-10 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Binding and builtin generators should lowercase RTCXX as rtcXX and not rTCXX
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (193954 => 193955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-11 17:15:58 UTC (rev 193955)
</span><span class="lines">@@ -181,23 +181,17 @@
</span><span class="cx"> LValue signExt32To64(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::SExt32, origin(), value); }
</span><span class="cx"> LValue zeroExt(LValue value, LType type) { return m_block->appendNew<B3::Value>(m_proc, B3::ZExt32, type, origin(), value); }
</span><span class="cx"> LValue zeroExtPtr(LValue value) { return zeroExt(value, B3::Int64); }
</span><del>- LValue fpToInt(LValue value, LType type) { CRASH(); }
- LValue fpToUInt(LValue value, LType type) { CRASH(); }
</del><span class="cx"> LValue fpToInt32(LValue value) { CRASH(); }
</span><span class="cx"> LValue fpToUInt32(LValue value) { CRASH(); }
</span><del>- LValue intToFP(LValue value, LType type) { CRASH(); }
</del><span class="cx"> LValue intToDouble(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::IToD, origin(), value); }
</span><del>- LValue unsignedToFP(LValue value, LType type) { CRASH(); }
</del><span class="cx"> LValue unsignedToDouble(LValue value) { CRASH(); }
</span><del>- LValue intCast(LValue value, LType type) { CRASH(); }
</del><span class="cx"> LValue castToInt32(LValue value)
</span><span class="cx"> {
</span><span class="cx"> return value->type() == B3::Int32 ? value :
</span><span class="cx"> m_block->appendNew<B3::Value>(m_proc, B3::Trunc, origin(), value);
</span><span class="cx"> }
</span><del>- LValue fpCast(LValue value, LType type) { CRASH(); }
- LValue intToPtr(LValue value, LType type) { CRASH(); }
- LValue ptrToInt(LValue value, LType type) { CRASH(); }
</del><ins>+ LValue doubleToFloat(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::DoubleToFloat, origin(), value); }
+ LValue floatToDouble(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::FloatToDouble, origin(), value); }
</ins><span class="cx"> LValue bitCast(LValue, LType);
</span><span class="cx"> LValue fround(LValue doubleValue);
</span><span class="cx">
</span><span class="lines">@@ -545,8 +539,7 @@
</span><span class="cx">
</span><span class="cx"> inline LValue Output::fround(LValue doubleValue)
</span><span class="cx"> {
</span><del>- LValue asFloat = m_block->appendNew<B3::Value>(m_proc, B3::DoubleToFloat, origin(), doubleValue);
- return m_block->appendNew<B3::Value>(m_proc, B3::FloatToDouble, origin(), asFloat);
</del><ins>+ return floatToDouble(doubleToFloat(doubleValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC_OR_CLANG)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (193954 => 193955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-11 17:15:58 UTC (rev 193955)
</span><span class="lines">@@ -3011,7 +3011,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setDouble(m_out.unsignedToFP(result, m_out.doubleType));
</del><ins>+ setDouble(m_out.unsignedToDouble(result));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3020,7 +3020,7 @@
</span><span class="cx"> LValue result;
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TypeFloat32:
</span><del>- result = m_out.fpCast(m_out.loadFloat(pointer), m_out.doubleType);
</del><ins>+ result = m_out.floatToDouble(m_out.loadFloat(pointer));
</ins><span class="cx"> break;
</span><span class="cx"> case TypeFloat64:
</span><span class="cx"> result = m_out.loadDouble(pointer);
</span><span class="lines">@@ -3291,7 +3291,7 @@
</span><span class="cx"> LValue value = lowDouble(child3);
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TypeFloat32:
</span><del>- valueToStore = m_out.fpCast(value, m_out.floatType);
</del><ins>+ valueToStore = m_out.doubleToFloat(value);
</ins><span class="cx"> storeType = Output::StoreFloat;
</span><span class="cx"> break;
</span><span class="cx"> case TypeFloat64:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.h (193954 => 193955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-12-11 17:15:58 UTC (rev 193955)
</span><span class="lines">@@ -219,17 +219,13 @@
</span><span class="cx"> LValue signExt32To64(LValue value) { return signExt(value, int64); }
</span><span class="cx"> LValue zeroExt(LValue value, LType type) { return buildZExt(m_builder, value, type); }
</span><span class="cx"> LValue zeroExtPtr(LValue value) { return zeroExt(value, intPtr); }
</span><del>- LValue fpToInt(LValue value, LType type) { return buildFPToSI(m_builder, value, type); }
- LValue fpToUInt(LValue value, LType type) { return buildFPToUI(m_builder, value, type); }
</del><span class="cx"> LValue fpToInt32(LValue value) { return fpToInt(value, int32); }
</span><span class="cx"> LValue fpToUInt32(LValue value) { return fpToUInt(value, int32); }
</span><del>- LValue intToFP(LValue value, LType type) { return buildSIToFP(m_builder, value, type); }
</del><span class="cx"> LValue intToDouble(LValue value) { return intToFP(value, doubleType); }
</span><del>- LValue unsignedToFP(LValue value, LType type) { return buildUIToFP(m_builder, value, type); }
</del><span class="cx"> LValue unsignedToDouble(LValue value) { return unsignedToFP(value, doubleType); }
</span><del>- LValue intCast(LValue value, LType type) { return buildIntCast(m_builder, value, type); }
</del><span class="cx"> LValue castToInt32(LValue value) { return intCast(value, int32); }
</span><del>- LValue fpCast(LValue value, LType type) { return buildFPCast(m_builder, value, type); }
</del><ins>+ LValue doubleToFloat(LValue value) { return fpCast(value, floatType); }
+ LValue floatToDouble(LValue value) { return fpCast(value, doubleType); }
</ins><span class="cx"> LValue intToPtr(LValue value, LType type) { return buildIntToPtr(m_builder, value, type); }
</span><span class="cx"> LValue ptrToInt(LValue value, LType type) { return buildPtrToInt(m_builder, value, type); }
</span><span class="cx"> LValue bitCast(LValue value, LType type) { return buildBitCast(m_builder, value, type); }
</span><span class="lines">@@ -476,6 +472,12 @@
</span><span class="cx"> LBasicBlock m_nextBlock;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ LValue intCast(LValue value, LType type) { return buildIntCast(m_builder, value, type); }
+ LValue fpToInt(LValue value, LType type) { return buildFPToSI(m_builder, value, type); }
+ LValue fpToUInt(LValue value, LType type) { return buildFPToUI(m_builder, value, type); }
+ LValue fpCast(LValue value, LType type) { return buildFPCast(m_builder, value, type); }
+ LValue intToFP(LValue value, LType type) { return buildSIToFP(m_builder, value, type); }
+ LValue unsignedToFP(LValue value, LType type) { return buildUIToFP(m_builder, value, type); }
</ins><span class="cx"> LValue signExt(LValue value, LType type) { return buildSExt(m_builder, value, type); }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>