<!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>[189362] 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/189362">189362</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-09-04 11:24:38 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of FTLValueFormat
https://bugs.webkit.org/show_bug.cgi?id=148448
Reviewed by Michael Saboff.
FTL::ValueFormat is nothing more than DataFormat (and is actually
slightly less). Let's get rid of it.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bytecode/DataFormat.cpp: Renamed from Source/JavaScriptCore/ftl/FTLValueFormat.h.
(WTF::printInternal):
* bytecode/DataFormat.h:
* ftl/FTLAvailableRecovery.h:
(JSC::FTL::AvailableRecovery::AvailableRecovery):
(JSC::FTL::AvailableRecovery::format):
* ftl/FTLExitArgument.h:
(JSC::FTL::ExitArgument::ExitArgument):
(JSC::FTL::ExitArgument::operator!):
(JSC::FTL::ExitArgument::format):
(JSC::FTL::ExitArgument::withFormat):
* ftl/FTLExitValue.cpp:
(JSC::FTL::ExitValue::dataFormat):
* ftl/FTLExitValue.h:
(JSC::FTL::ExitValue::recovery):
(JSC::FTL::ExitValue::recoveryFormat):
* ftl/FTLFormattedValue.h:
(JSC::FTL::FormattedValue::FormattedValue):
(JSC::FTL::FormattedValue::operator!):
(JSC::FTL::FormattedValue::format):
(JSC::FTL::int32Value):
(JSC::FTL::booleanValue):
(JSC::FTL::jsValueValue):
(JSC::FTL::doubleValue):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub):
(JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
(JSC::FTL::DFG::LowerDFGToLLVM::convertDoubleToInt32):
(JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode):
(JSC::FTL::DFG::LowerDFGToLLVM::exitArgument):
(JSC::FTL::DFG::LowerDFGToLLVM::addAvailableRecovery):
* ftl/FTLOSRExit.cpp:
(JSC::FTL::OSRExit::OSRExit):
* ftl/FTLOSRExit.h:
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::reboxAccordingToFormat):
(JSC::FTL::compileRecovery):
(JSC::FTL::compileStub):
* ftl/FTLValueFormat.cpp: Removed.</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="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeDataFormath">trunk/Source/JavaScriptCore/bytecode/DataFormat.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAvailableRecoveryh">trunk/Source/JavaScriptCore/ftl/FTLAvailableRecovery.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitArgumenth">trunk/Source/JavaScriptCore/ftl/FTLExitArgument.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitValuecpp">trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitValueh">trunk/Source/JavaScriptCore/ftl/FTLExitValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLFormattedValueh">trunk/Source/JavaScriptCore/ftl/FTLFormattedValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExitcpp">trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExith">trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp">trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorebytecodeDataFormatcpp">trunk/Source/JavaScriptCore/bytecode/DataFormat.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreftlFTLValueFormatcpp">trunk/Source/JavaScriptCore/ftl/FTLValueFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLValueFormath">trunk/Source/JavaScriptCore/ftl/FTLValueFormat.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 (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> bytecode/CodeOrigin.cpp
</span><span class="cx"> bytecode/CodeType.cpp
</span><span class="cx"> bytecode/ComplexGetStatus.cpp
</span><ins>+ bytecode/DataFormat.cpp
</ins><span class="cx"> bytecode/DFGExitProfile.cpp
</span><span class="cx"> bytecode/DeferredCompilationCallback.cpp
</span><span class="cx"> bytecode/DeferredSourceDump.cpp
</span><span class="lines">@@ -908,7 +909,6 @@
</span><span class="cx"> ftl/FTLState.cpp
</span><span class="cx"> ftl/FTLThunks.cpp
</span><span class="cx"> ftl/FTLUnwindInfo.cpp
</span><del>- ftl/FTLValueFormat.cpp
</del><span class="cx"> ftl/FTLValueRange.cpp
</span><span class="cx">
</span><span class="cx"> llvm/InitializeLLVM.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2015-08-25 Basile Clement <basile_clement@apple.com>
+
+ Get rid of FTLValueFormat
+ https://bugs.webkit.org/show_bug.cgi?id=148448
+
+ Reviewed by Michael Saboff.
+
+ FTL::ValueFormat is nothing more than DataFormat (and is actually
+ slightly less). Let's get rid of it.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bytecode/DataFormat.cpp: Renamed from Source/JavaScriptCore/ftl/FTLValueFormat.h.
+ (WTF::printInternal):
+ * bytecode/DataFormat.h:
+ * ftl/FTLAvailableRecovery.h:
+ (JSC::FTL::AvailableRecovery::AvailableRecovery):
+ (JSC::FTL::AvailableRecovery::format):
+ * ftl/FTLExitArgument.h:
+ (JSC::FTL::ExitArgument::ExitArgument):
+ (JSC::FTL::ExitArgument::operator!):
+ (JSC::FTL::ExitArgument::format):
+ (JSC::FTL::ExitArgument::withFormat):
+ * ftl/FTLExitValue.cpp:
+ (JSC::FTL::ExitValue::dataFormat):
+ * ftl/FTLExitValue.h:
+ (JSC::FTL::ExitValue::recovery):
+ (JSC::FTL::ExitValue::recoveryFormat):
+ * ftl/FTLFormattedValue.h:
+ (JSC::FTL::FormattedValue::FormattedValue):
+ (JSC::FTL::FormattedValue::operator!):
+ (JSC::FTL::FormattedValue::format):
+ (JSC::FTL::int32Value):
+ (JSC::FTL::booleanValue):
+ (JSC::FTL::jsValueValue):
+ (JSC::FTL::doubleValue):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
+ (JSC::FTL::DFG::LowerDFGToLLVM::convertDoubleToInt32):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitArgument):
+ (JSC::FTL::DFG::LowerDFGToLLVM::addAvailableRecovery):
+ * ftl/FTLOSRExit.cpp:
+ (JSC::FTL::OSRExit::OSRExit):
+ * ftl/FTLOSRExit.h:
+ * ftl/FTLOSRExitCompiler.cpp:
+ (JSC::FTL::reboxAccordingToFormat):
+ (JSC::FTL::compileRecovery):
+ (JSC::FTL::compileStub):
+ * ftl/FTLValueFormat.cpp: Removed.
+
</ins><span class="cx"> 2015-09-04 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce RegisterMap<T>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\CodeOrigin.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\CodeType.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\ComplexGetStatus.cpp" />
</span><ins>+ <ClCompile Include="..\bytecode\DataFormat.cpp" />
</ins><span class="cx"> <ClCompile Include="..\bytecode\DeferredCompilationCallback.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\DeferredSourceDump.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\DFGExitProfile.cpp" />
</span><span class="lines">@@ -551,7 +552,6 @@
</span><span class="cx"> <ClCompile Include="..\ftl\FTLState.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLThunks.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLUnwindInfo.cpp" />
</span><del>- <ClCompile Include="..\ftl\FTLValueFormat.cpp" />
</del><span class="cx"> <ClCompile Include="..\ftl\FTLValueRange.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\CodeBlockSet.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\ConservativeRoots.cpp" />
</span><span class="lines">@@ -1303,7 +1303,6 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLThunks.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLTypedPointer.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLUnwindInfo.h" />
</span><del>- <ClInclude Include="..\ftl\FTLValueFormat.h" />
</del><span class="cx"> <ClInclude Include="..\ftl\FTLValueFromBlock.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLValueRange.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLWeight.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -174,6 +174,9 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\CodeType.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bytecode\DataFormat.cpp">
+ <Filter>bytecode</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bytecode\ExecutionCounter.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1602,9 +1605,6 @@
</span><span class="cx"> <ClCompile Include="..\ftl\FTLUnwindInfo.cpp">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\ftl\FTLValueFormat.cpp">
- <Filter>ftl</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\ftl\FTLValueRange.cpp">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4172,9 +4172,6 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLUnwindInfo.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\ftl\FTLValueFormat.h">
- <Filter>ftl</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\ftl\FTLValueFromBlock.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -135,8 +135,6 @@
</span><span class="cx"> 0F235BE017178E1C00690C7F /* FTLOSRExitCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCA17178E1C00690C7F /* FTLOSRExitCompiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F235BE117178E1C00690C7F /* FTLThunks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BCB17178E1C00690C7F /* FTLThunks.cpp */; };
</span><span class="cx"> 0F235BE217178E1C00690C7F /* FTLThunks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCC17178E1C00690C7F /* FTLThunks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F235BE317178E1C00690C7F /* FTLValueFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */; };
- 0F235BE417178E1C00690C7F /* FTLValueFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCE17178E1C00690C7F /* FTLValueFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F235BEB17178E7300690C7F /* DFGOSRExitBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BE717178E7300690C7F /* DFGOSRExitBase.cpp */; };
</span><span class="cx"> 0F235BEC17178E7300690C7F /* DFGOSRExitBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BE817178E7300690C7F /* DFGOSRExitBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F235BED17178E7300690C7F /* DFGOSRExitPreparation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BE917178E7300690C7F /* DFGOSRExitPreparation.cpp */; };
</span><span class="lines">@@ -980,6 +978,7 @@
</span><span class="cx"> 623A37EC1B87A7C000754209 /* RegisterMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 623A37EB1B87A7BD00754209 /* RegisterMap.h */; };
</span><span class="cx"> 62D2D38F1ADF103F000206C1 /* FunctionRareData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62D2D38D1ADF103F000206C1 /* FunctionRareData.cpp */; };
</span><span class="cx"> 62D2D3901ADF103F000206C1 /* FunctionRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D2D38E1ADF103F000206C1 /* FunctionRareData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 62E3D5F01B8D0B7300B868BB /* DataFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */; };
</ins><span class="cx"> 62F2AA371B0BEDE300610C7A /* DFGLazyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62A9A29E1B0BED4800BD54CA /* DFGLazyNode.cpp */; };
</span><span class="cx"> 62F2AA381B0BEDE300610C7A /* DFGLazyNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 62A9A29F1B0BED4800BD54CA /* DFGLazyNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 6507D29E0E871E5E00D7D896 /* JSTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 6507D2970E871E4A00D7D896 /* JSTypeInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1964,8 +1963,6 @@
</span><span class="cx"> 0F235BCA17178E1C00690C7F /* FTLOSRExitCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLOSRExitCompiler.h; path = ftl/FTLOSRExitCompiler.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BCB17178E1C00690C7F /* FTLThunks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLThunks.cpp; path = ftl/FTLThunks.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BCC17178E1C00690C7F /* FTLThunks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLThunks.h; path = ftl/FTLThunks.h; sourceTree = "<group>"; };
</span><del>- 0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLValueFormat.cpp; path = ftl/FTLValueFormat.cpp; sourceTree = "<group>"; };
- 0F235BCE17178E1C00690C7F /* FTLValueFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLValueFormat.h; path = ftl/FTLValueFormat.h; sourceTree = "<group>"; };
</del><span class="cx"> 0F235BE717178E7300690C7F /* DFGOSRExitBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitBase.cpp; path = dfg/DFGOSRExitBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BE817178E7300690C7F /* DFGOSRExitBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGOSRExitBase.h; path = dfg/DFGOSRExitBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BE917178E7300690C7F /* DFGOSRExitPreparation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitPreparation.cpp; path = dfg/DFGOSRExitPreparation.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2784,6 +2781,7 @@
</span><span class="cx"> 62A9A29F1B0BED4800BD54CA /* DFGLazyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGLazyNode.h; path = dfg/DFGLazyNode.h; sourceTree = "<group>"; };
</span><span class="cx"> 62D2D38D1ADF103F000206C1 /* FunctionRareData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionRareData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 62D2D38E1ADF103F000206C1 /* FunctionRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionRareData.h; sourceTree = "<group>"; };
</span><ins>+ 62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataFormat.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 6507D2970E871E4A00D7D896 /* JSTypeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypeInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 651122E5140469BA002B101D /* testRegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testRegExp.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 6511230514046A4C002B101D /* testRegExp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testRegExp; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -3977,8 +3975,6 @@
</span><span class="cx"> 0FEA0A1B1708B00700BB722C /* FTLTypedPointer.h */,
</span><span class="cx"> 0F6B1CC11862C47800845D97 /* FTLUnwindInfo.cpp */,
</span><span class="cx"> 0F6B1CC21862C47800845D97 /* FTLUnwindInfo.h */,
</span><del>- 0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */,
- 0F235BCE17178E1C00690C7F /* FTLValueFormat.h */,
</del><span class="cx"> 0FDB2CC8173DA51E007B3C1B /* FTLValueFromBlock.h */,
</span><span class="cx"> 0F5A6281188C98D40072C9DF /* FTLValueRange.cpp */,
</span><span class="cx"> 0F5A6282188C98D40072C9DF /* FTLValueRange.h */,
</span><span class="lines">@@ -5547,6 +5543,7 @@
</span><span class="cx"> 0F0B83A514BCF50400885B4F /* CodeType.h */,
</span><span class="cx"> 0F6FC74E196110A800E1D02D /* ComplexGetStatus.cpp */,
</span><span class="cx"> 0F6FC74F196110A800E1D02D /* ComplexGetStatus.h */,
</span><ins>+ 62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */,
</ins><span class="cx"> 0F426A4A1460CD6B00131F8F /* DataFormat.h */,
</span><span class="cx"> 0FC712DC17CD8778008CC93C /* DeferredCompilationCallback.cpp */,
</span><span class="cx"> 0FC712DD17CD8778008CC93C /* DeferredCompilationCallback.h */,
</span><span class="lines">@@ -6313,7 +6310,6 @@
</span><span class="cx"> 0F235BE217178E1C00690C7F /* FTLThunks.h in Headers */,
</span><span class="cx"> 0FEA0A201708B00700BB722C /* FTLTypedPointer.h in Headers */,
</span><span class="cx"> 0F6B1CC61862C47800845D97 /* FTLUnwindInfo.h in Headers */,
</span><del>- 0F235BE417178E1C00690C7F /* FTLValueFormat.h in Headers */,
</del><span class="cx"> 0FDB2CCA173DA523007B3C1B /* FTLValueFromBlock.h in Headers */,
</span><span class="cx"> 0FE7211E193B9C590031F6ED /* DFGTransition.h in Headers */,
</span><span class="cx"> 0F5A6284188C98D40072C9DF /* FTLValueRange.h in Headers */,
</span><span class="lines">@@ -7639,7 +7635,6 @@
</span><span class="cx"> 0FEA0A161706BB9000BB722C /* FTLState.cpp in Sources */,
</span><span class="cx"> 0F235BE117178E1C00690C7F /* FTLThunks.cpp in Sources */,
</span><span class="cx"> 0F6B1CC51862C47800845D97 /* FTLUnwindInfo.cpp in Sources */,
</span><del>- 0F235BE317178E1C00690C7F /* FTLValueFormat.cpp in Sources */,
</del><span class="cx"> 0F5A1273192D9FDF008764A3 /* DFGDoesGC.cpp in Sources */,
</span><span class="cx"> A53CE08718BC1A5600BEDF76 /* JSConsole.cpp in Sources */,
</span><span class="cx"> 0F5A6283188C98D40072C9DF /* FTLValueRange.cpp in Sources */,
</span><span class="lines">@@ -7777,6 +7772,7 @@
</span><span class="cx"> 7C184E1A17BEDBD3007CB63A /* JSPromise.cpp in Sources */,
</span><span class="cx"> 7C184E2217BEE240007CB63A /* JSPromiseConstructor.cpp in Sources */,
</span><span class="cx"> A552C37F1ADDB8FE00139726 /* JSRemoteInspector.cpp in Sources */,
</span><ins>+ 62E3D5F01B8D0B7300B868BB /* DataFormat.cpp in Sources */,
</ins><span class="cx"> 0F893BDB1936E23C001211F4 /* DFGStructureAbstractValue.cpp in Sources */,
</span><span class="cx"> 7C008CDA187124BB00955C24 /* JSPromiseDeferred.cpp in Sources */,
</span><span class="cx"> 7C184E1E17BEE22E007CB63A /* JSPromisePrototype.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeDataFormatcppfromrev189361trunkSourceJavaScriptCoreftlFTLValueFormath"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/bytecode/DataFormat.cpp (from rev 189361, trunk/Source/JavaScriptCore/ftl/FTLValueFormat.h) (0 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/DataFormat.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/bytecode/DataFormat.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2012-2015 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 "DataFormat.h"
+
+#include <wtf/Assertions.h>
+#include <wtf/PrintStream.h>
+
+namespace WTF {
+
+void printInternal(PrintStream& out, JSC::DataFormat dataFormat)
+{
+ out.print(dataFormatToString(dataFormat));
+}
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeDataFormath"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/DataFormat.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/DataFormat.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/bytecode/DataFormat.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -121,6 +121,13 @@
</span><span class="cx"> return isJSFormat(format, DataFormatJSBoolean);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace JSC
</ins><span class="cx">
</span><ins>+namespace WTF {
+
+class PrintStream;
+void printInternal(PrintStream&, JSC::DataFormat);
+
+} // namespace WTF
+
</ins><span class="cx"> #endif // DataFormat_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAvailableRecoveryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAvailableRecovery.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAvailableRecovery.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLAvailableRecovery.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><span class="cx"> #include "DFGNode.h"
</span><ins>+#include "DataFormat.h"
</ins><span class="cx"> #include "FTLAbbreviatedTypes.h"
</span><span class="cx"> #include "FTLRecoveryOpcode.h"
</span><del>-#include "FTLValueFormat.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx"> public:
</span><span class="cx"> AvailableRecovery()
</span><span class="cx"> : m_node(0)
</span><del>- , m_format(InvalidValueFormat)
</del><ins>+ , m_format(DataFormatNone)
</ins><span class="cx"> , m_opcode(AddRecovery)
</span><span class="cx"> , m_left(0)
</span><span class="cx"> , m_right(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AvailableRecovery(DFG::Node* node, RecoveryOpcode opcode, LValue left, LValue right, ValueFormat format)
</del><ins>+ AvailableRecovery(DFG::Node* node, RecoveryOpcode opcode, LValue left, LValue right, DataFormat format)
</ins><span class="cx"> : m_node(node)
</span><span class="cx"> , m_format(format)
</span><span class="cx"> , m_opcode(opcode)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DFG::Node* node() const { return m_node; }
</span><del>- ValueFormat format() const { return m_format; }
</del><ins>+ DataFormat format() const { return m_format; }
</ins><span class="cx"> RecoveryOpcode opcode() const { return m_opcode; }
</span><span class="cx"> LValue left() const { return m_left; }
</span><span class="cx"> LValue right() const { return m_right; }
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DFG::Node* m_node;
</span><del>- ValueFormat m_format;
</del><ins>+ DataFormat m_format;
</ins><span class="cx"> RecoveryOpcode m_opcode;
</span><span class="cx"> LValue m_left;
</span><span class="cx"> LValue m_right;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitArgumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLExitArgument.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitArgument.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitArgument.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -28,13 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><del>-#include "FTLValueFormat.h"
</del><ins>+#include "DataFormat.h"
</ins><span class="cx"> #include <wtf/PrintStream.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><span class="cx"> struct ExitArgumentRepresentation {
</span><del>- ValueFormat format;
</del><ins>+ DataFormat format;
</ins><span class="cx"> unsigned argument;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> public:
</span><span class="cx"> ExitArgument()
</span><span class="cx"> {
</span><del>- m_representation.format = InvalidValueFormat;
</del><ins>+ m_representation.format = DataFormatNone;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ExitArgument(ValueFormat format, unsigned argument)
</del><ins>+ ExitArgument(DataFormat format, unsigned argument)
</ins><span class="cx"> {
</span><span class="cx"> m_representation.format = format;
</span><span class="cx"> m_representation.argument = argument;
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> m_representation = representation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator!() const { return m_representation.format == InvalidValueFormat; }
</del><ins>+ bool operator!() const { return m_representation.format == DataFormatNone; }
</ins><span class="cx">
</span><del>- ValueFormat format() const
</del><ins>+ DataFormat format() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(*this);
</span><span class="cx"> return m_representation.format;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> return m_representation.argument;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExitArgument withFormat(ValueFormat format)
</del><ins>+ ExitArgument withFormat(DataFormat format)
</ins><span class="cx"> {
</span><span class="cx"> return ExitArgument(format, argument());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -51,37 +51,36 @@
</span><span class="cx"> return withVirtualRegister(virtualRegister() + offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ValueFormat ExitValue::valueFormat() const
</del><ins>+DataFormat ExitValue::dataFormat() const
</ins><span class="cx"> {
</span><span class="cx"> switch (kind()) {
</span><span class="cx"> case InvalidExitValue:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><del>- return InvalidValueFormat;
</del><ins>+ return DataFormatNone;
</ins><span class="cx">
</span><span class="cx"> case ExitValueDead:
</span><span class="cx"> case ExitValueConstant:
</span><span class="cx"> case ExitValueInJSStack:
</span><span class="cx"> case ExitValueMaterializeNewObject:
</span><del>- return ValueFormatJSValue;
</del><ins>+ return DataFormatJS;
</ins><span class="cx">
</span><span class="cx"> case ExitValueArgument:
</span><span class="cx"> return exitArgument().format();
</span><span class="cx">
</span><span class="cx"> case ExitValueInJSStackAsInt32:
</span><del>- return ValueFormatInt32;
</del><ins>+ return DataFormatInt32;
</ins><span class="cx">
</span><span class="cx"> case ExitValueInJSStackAsInt52:
</span><del>- return ValueFormatInt52;
</del><ins>+ return DataFormatInt52;
</ins><span class="cx">
</span><span class="cx"> case ExitValueInJSStackAsDouble:
</span><del>- return ValueFormatDouble;
</del><ins>+ return DataFormatDouble;
</ins><span class="cx">
</span><span class="cx"> case ExitValueRecovery:
</span><span class="cx"> return recoveryFormat();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><del>- return InvalidValueFormat;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ExitValue::dumpInContext(PrintStream& out, DumpContext* context) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLExitValue.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitValue.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitValue.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static ExitValue recovery(RecoveryOpcode opcode, unsigned leftArgument, unsigned rightArgument, ValueFormat format)
</del><ins>+ static ExitValue recovery(RecoveryOpcode opcode, unsigned leftArgument, unsigned rightArgument, DataFormat format)
</ins><span class="cx"> {
</span><span class="cx"> ExitValue result;
</span><span class="cx"> result.m_kind = ExitValueRecovery;
</span><span class="lines">@@ -176,10 +176,10 @@
</span><span class="cx"> return u.recovery.rightArgument;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ValueFormat recoveryFormat() const
</del><ins>+ DataFormat recoveryFormat() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isRecovery());
</span><del>- return static_cast<ValueFormat>(u.recovery.format);
</del><ins>+ return static_cast<DataFormat>(u.recovery.format);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RecoveryOpcode recoveryOpcode() const
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> // that is compatible with exitArgument().format(). If it's a constant or it's dead, it
</span><span class="cx"> // will claim to be a JSValue. If it's an argument then it will tell you the argument's
</span><span class="cx"> // format.
</span><del>- ValueFormat valueFormat() const;
</del><ins>+ DataFormat dataFormat() const;
</ins><span class="cx">
</span><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx"> void dumpInContext(PrintStream&, DumpContext*) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLFormattedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLFormattedValue.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLFormattedValue.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLFormattedValue.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><ins>+#include "DataFormat.h"
</ins><span class="cx"> #include "FTLAbbreviations.h"
</span><del>-#include "FTLValueFormat.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> class FormattedValue {
</span><span class="cx"> public:
</span><span class="cx"> FormattedValue()
</span><del>- : m_format(InvalidValueFormat)
</del><ins>+ : m_format(DataFormatNone)
</ins><span class="cx"> , m_value(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FormattedValue(ValueFormat format, LValue value)
</del><ins>+ FormattedValue(DataFormat format, LValue value)
</ins><span class="cx"> : m_format(format)
</span><span class="cx"> , m_value(value)
</span><span class="cx"> {
</span><span class="lines">@@ -56,23 +56,23 @@
</span><span class="cx">
</span><span class="cx"> bool operator!() const
</span><span class="cx"> {
</span><del>- ASSERT((m_format == InvalidValueFormat) == !m_value);
- return m_format == InvalidValueFormat;
</del><ins>+ ASSERT((m_format == DataFormatNone) == !m_value);
+ return m_format == DataFormatNone;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ValueFormat format() const { return m_format; }
</del><ins>+ DataFormat format() const { return m_format; }
</ins><span class="cx"> LValue value() const { return m_value; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ValueFormat m_format;
</del><ins>+ DataFormat m_format;
</ins><span class="cx"> LValue m_value;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static inline FormattedValue noValue() { return FormattedValue(); }
</span><del>-static inline FormattedValue int32Value(LValue value) { return FormattedValue(ValueFormatInt32, value); }
-static inline FormattedValue booleanValue(LValue value) { return FormattedValue(ValueFormatBoolean, value); }
-static inline FormattedValue jsValueValue(LValue value) { return FormattedValue(ValueFormatJSValue, value); }
-static inline FormattedValue doubleValue(LValue value) { return FormattedValue(ValueFormatDouble, value); }
</del><ins>+static inline FormattedValue int32Value(LValue value) { return FormattedValue(DataFormatInt32, value); }
+static inline FormattedValue booleanValue(LValue value) { return FormattedValue(DataFormatBoolean, value); }
+static inline FormattedValue jsValueValue(LValue value) { return FormattedValue(DataFormatJS, value); }
+static inline FormattedValue doubleValue(LValue value) { return FormattedValue(DataFormatDouble, value); }
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -1359,11 +1359,11 @@
</span><span class="cx"> if (doesKill(m_node->child2())) {
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child2(), SubRecovery,
</span><del>- m_out.extractValue(result, 0), left, ValueFormatInt32);
</del><ins>+ m_out.extractValue(result, 0), left, DataFormatInt32);
</ins><span class="cx"> } else if (doesKill(m_node->child1())) {
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child1(), SubRecovery,
</span><del>- m_out.extractValue(result, 0), right, ValueFormatInt32);
</del><ins>+ m_out.extractValue(result, 0), right, DataFormatInt32);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> result = m_out.subWithOverflow32(left, right);
</span><span class="lines">@@ -1374,13 +1374,13 @@
</span><span class="cx"> // right = left - result
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child2(), SubRecovery,
</span><del>- left, m_out.extractValue(result, 0), ValueFormatInt32);
</del><ins>+ left, m_out.extractValue(result, 0), DataFormatInt32);
</ins><span class="cx"> } else if (doesKill(m_node->child1())) {
</span><span class="cx"> // result = left - right
</span><span class="cx"> // result + right = left
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child1(), AddRecovery,
</span><del>- m_out.extractValue(result, 0), right, ValueFormatInt32);
</del><ins>+ m_out.extractValue(result, 0), right, DataFormatInt32);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1409,11 +1409,11 @@
</span><span class="cx"> if (doesKill(m_node->child2())) {
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child2(), SubRecovery,
</span><del>- m_out.extractValue(result, 0), left, ValueFormatInt52);
</del><ins>+ m_out.extractValue(result, 0), left, DataFormatInt52);
</ins><span class="cx"> } else if (doesKill(m_node->child1())) {
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child1(), SubRecovery,
</span><del>- m_out.extractValue(result, 0), right, ValueFormatInt52);
</del><ins>+ m_out.extractValue(result, 0), right, DataFormatInt52);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> result = m_out.subWithOverflow64(left, right);
</span><span class="lines">@@ -1424,13 +1424,13 @@
</span><span class="cx"> // right = left - result
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child2(), SubRecovery,
</span><del>- left, m_out.extractValue(result, 0), ValueFormatInt52);
</del><ins>+ left, m_out.extractValue(result, 0), DataFormatInt52);
</ins><span class="cx"> } else if (doesKill(m_node->child1())) {
</span><span class="cx"> // result = left - right
</span><span class="cx"> // result + right = left
</span><span class="cx"> addAvailableRecovery(
</span><span class="cx"> m_node->child1(), AddRecovery,
</span><del>- m_out.extractValue(result, 0), right, ValueFormatInt52);
</del><ins>+ m_out.extractValue(result, 0), right, DataFormatInt52);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4761,7 +4761,7 @@
</span><span class="cx"> DFG_ASSERT(m_graph, m_node, m_origin.exitOK);
</span><span class="cx">
</span><span class="cx"> m_ftlState.jitCode->osrExit.append(OSRExit(
</span><del>- UncountableInvalidation, InvalidValueFormat, MethodOfGettingAValueProfile(),
</del><ins>+ UncountableInvalidation, DataFormatNone, MethodOfGettingAValueProfile(),
</ins><span class="cx"> m_origin.forExit, m_origin.semantic,
</span><span class="cx"> availabilityMap().m_locals.numberOfArguments(),
</span><span class="cx"> availabilityMap().m_locals.numberOfLocals()));
</span><span class="lines">@@ -7379,7 +7379,7 @@
</span><span class="cx"> LValue integerValue = m_out.fpToInt32(value);
</span><span class="cx"> LValue integerValueConvertedToDouble = m_out.intToDouble(integerValue);
</span><span class="cx"> LValue valueNotConvertibleToInteger = m_out.doubleNotEqualOrUnordered(value, integerValueConvertedToDouble);
</span><del>- speculate(Overflow, FormattedValue(ValueFormatDouble, value), m_node, valueNotConvertibleToInteger);
</del><ins>+ speculate(Overflow, FormattedValue(DataFormatDouble, value), m_node, valueNotConvertibleToInteger);
</ins><span class="cx">
</span><span class="cx"> if (shouldCheckNegativeZero) {
</span><span class="cx"> LBasicBlock valueIsZero = FTL_NEW_BLOCK(m_out, ("ConvertDoubleToInt32 on zero"));
</span><span class="lines">@@ -7391,7 +7391,7 @@
</span><span class="cx"> LValue doubleBitcastToInt64 = m_out.bitCast(value, m_out.int64);
</span><span class="cx"> LValue signBitSet = m_out.lessThan(doubleBitcastToInt64, m_out.constInt64(0));
</span><span class="cx">
</span><del>- speculate(NegativeZero, FormattedValue(ValueFormatDouble, value), m_node, signBitSet);
</del><ins>+ speculate(NegativeZero, FormattedValue(DataFormatDouble, value), m_node, signBitSet);
</ins><span class="cx"> m_out.jump(continuation);
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span><span class="cx"> }
</span><span class="lines">@@ -8305,35 +8305,35 @@
</span><span class="cx">
</span><span class="cx"> LoweredNodeValue value = m_int32Values.get(node);
</span><span class="cx"> if (isValid(value))
</span><del>- return exitArgument(arguments, ValueFormatInt32, value.value());
</del><ins>+ return exitArgument(arguments, DataFormatInt32, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_int52Values.get(node);
</span><span class="cx"> if (isValid(value))
</span><del>- return exitArgument(arguments, ValueFormatInt52, value.value());
</del><ins>+ return exitArgument(arguments, DataFormatInt52, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_strictInt52Values.get(node);
</span><span class="cx"> if (isValid(value))
</span><del>- return exitArgument(arguments, ValueFormatStrictInt52, value.value());
</del><ins>+ return exitArgument(arguments, DataFormatStrictInt52, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_booleanValues.get(node);
</span><span class="cx"> if (isValid(value)) {
</span><span class="cx"> LValue valueToPass = m_out.zeroExt(value.value(), m_out.int32);
</span><del>- return exitArgument(arguments, ValueFormatBoolean, valueToPass);
</del><ins>+ return exitArgument(arguments, DataFormatBoolean, valueToPass);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> value = m_jsValueValues.get(node);
</span><span class="cx"> if (isValid(value))
</span><del>- return exitArgument(arguments, ValueFormatJSValue, value.value());
</del><ins>+ return exitArgument(arguments, DataFormatJS, value.value());
</ins><span class="cx">
</span><span class="cx"> value = m_doubleValues.get(node);
</span><span class="cx"> if (isValid(value))
</span><del>- return exitArgument(arguments, ValueFormatDouble, value.value());
</del><ins>+ return exitArgument(arguments, DataFormatDouble, value.value());
</ins><span class="cx">
</span><span class="cx"> DFG_CRASH(m_graph, m_node, toCString("Cannot find value for node: ", node).data());
</span><span class="cx"> return ExitValue::dead();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExitValue exitArgument(ExitArgumentList& arguments, ValueFormat format, LValue value)
</del><ins>+ ExitValue exitArgument(ExitArgumentList& arguments, DataFormat format, LValue value)
</ins><span class="cx"> {
</span><span class="cx"> ExitValue result = ExitValue::exitArgument(ExitArgument(format, arguments.size()));
</span><span class="cx"> arguments.append(value);
</span><span class="lines">@@ -8352,13 +8352,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void addAvailableRecovery(
</span><del>- Node* node, RecoveryOpcode opcode, LValue left, LValue right, ValueFormat format)
</del><ins>+ Node* node, RecoveryOpcode opcode, LValue left, LValue right, DataFormat format)
</ins><span class="cx"> {
</span><span class="cx"> m_availableRecoveries.append(AvailableRecovery(node, opcode, left, right, format));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void addAvailableRecovery(
</span><del>- Edge edge, RecoveryOpcode opcode, LValue left, LValue right, ValueFormat format)
</del><ins>+ Edge edge, RecoveryOpcode opcode, LValue left, LValue right, DataFormat format)
</ins><span class="cx"> {
</span><span class="cx"> addAvailableRecovery(edge.node(), opcode, left, right, format);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> using namespace DFG;
</span><span class="cx">
</span><span class="cx"> OSRExit::OSRExit(
</span><del>- ExitKind exitKind, ValueFormat profileValueFormat,
</del><ins>+ ExitKind exitKind, DataFormat profileDataFormat,
</ins><span class="cx"> MethodOfGettingAValueProfile valueProfile, CodeOrigin codeOrigin,
</span><span class="cx"> CodeOrigin originForProfile, unsigned numberOfArguments,
</span><span class="cx"> unsigned numberOfLocals)
</span><span class="cx"> : OSRExitBase(exitKind, codeOrigin, originForProfile)
</span><del>- , m_profileValueFormat(profileValueFormat)
</del><ins>+ , m_profileDataFormat(profileDataFormat)
</ins><span class="cx"> , m_valueProfile(valueProfile)
</span><span class="cx"> , m_patchableCodeOffset(0)
</span><span class="cx"> , m_values(numberOfArguments, numberOfLocals)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExith"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> struct OSRExit : public DFG::OSRExitBase {
</span><span class="cx"> OSRExit(
</span><del>- ExitKind, ValueFormat profileValueFormat, MethodOfGettingAValueProfile,
</del><ins>+ ExitKind, DataFormat profileDataFormat, MethodOfGettingAValueProfile,
</ins><span class="cx"> CodeOrigin, CodeOrigin originForProfile,
</span><span class="cx"> unsigned numberOfArguments, unsigned numberOfLocals);
</span><span class="cx">
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> // method of getting a value profile. Note that all of the ExitArgument's
</span><span class="cx"> // are already aware of this possible off-by-one, so there is no need to
</span><span class="cx"> // correct them.
</span><del>- ValueFormat m_profileValueFormat;
</del><ins>+ DataFormat m_profileDataFormat;
</ins><span class="cx"> MethodOfGettingAValueProfile m_valueProfile;
</span><span class="cx">
</span><span class="cx"> // Offset within the exit stubs of the stub for this exit.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -46,6 +46,57 @@
</span><span class="cx">
</span><span class="cx"> using namespace DFG;
</span><span class="cx">
</span><ins>+static void reboxAccordingToFormat(
+ DataFormat format, AssemblyHelpers& jit, GPRReg value, GPRReg scratch1, GPRReg scratch2)
+{
+ switch (format) {
+ case DataFormatInt32: {
+ jit.zeroExtend32ToPtr(value, value);
+ jit.or64(GPRInfo::tagTypeNumberRegister, value);
+ break;
+ }
+
+ case DataFormatInt52: {
+ jit.rshift64(AssemblyHelpers::TrustedImm32(JSValue::int52ShiftAmount), value);
+ jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch2);
+ jit.boxInt52(value, value, scratch1, FPRInfo::fpRegT0);
+ jit.move64ToDouble(scratch2, FPRInfo::fpRegT0);
+ break;
+ }
+
+ case DataFormatStrictInt52: {
+ jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch2);
+ jit.boxInt52(value, value, scratch1, FPRInfo::fpRegT0);
+ jit.move64ToDouble(scratch2, FPRInfo::fpRegT0);
+ break;
+ }
+
+ case DataFormatBoolean: {
+ jit.zeroExtend32ToPtr(value, value);
+ jit.or32(MacroAssembler::TrustedImm32(ValueFalse), value);
+ break;
+ }
+
+ case DataFormatJS: {
+ // Done already!
+ break;
+ }
+
+ case DataFormatDouble: {
+ jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch1);
+ jit.move64ToDouble(value, FPRInfo::fpRegT0);
+ jit.purifyNaN(FPRInfo::fpRegT0);
+ jit.boxDouble(FPRInfo::fpRegT0, value);
+ jit.move64ToDouble(scratch1, FPRInfo::fpRegT0);
+ break;
+ }
+
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
</ins><span class="cx"> static void compileRecovery(
</span><span class="cx"> CCallHelpers& jit, const ExitValue& value, StackMaps::Record* record, StackMaps& stackmaps,
</span><span class="cx"> char* registerScratch,
</span><span class="lines">@@ -80,10 +131,10 @@
</span><span class="cx"> switch (value.recoveryOpcode()) {
</span><span class="cx"> case AddRecovery:
</span><span class="cx"> switch (value.recoveryFormat()) {
</span><del>- case ValueFormatInt32:
</del><ins>+ case DataFormatInt32:
</ins><span class="cx"> jit.add32(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><del>- case ValueFormatInt52:
</del><ins>+ case DataFormatInt52:
</ins><span class="cx"> jit.add64(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -93,10 +144,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case SubRecovery:
</span><span class="cx"> switch (value.recoveryFormat()) {
</span><del>- case ValueFormatInt32:
</del><ins>+ case DataFormatInt32:
</ins><span class="cx"> jit.sub32(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><del>- case ValueFormatInt52:
</del><ins>+ case DataFormatInt52:
</ins><span class="cx"> jit.sub64(GPRInfo::regT1, GPRInfo::regT0);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -120,7 +171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reboxAccordingToFormat(
</span><del>- value.valueFormat(), jit, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT2);
</del><ins>+ value.dataFormat(), jit, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void compileStub(
</span><span class="lines">@@ -203,10 +254,10 @@
</span><span class="cx"> jit.move(MacroAssembler::TrustedImm64(TagMask), GPRInfo::tagMaskRegister);
</span><span class="cx">
</span><span class="cx"> // Do some value profiling.
</span><del>- if (exit.m_profileValueFormat != InvalidValueFormat) {
</del><ins>+ if (exit.m_profileDataFormat != DataFormatNone) {
</ins><span class="cx"> record->locations[0].restoreInto(jit, jitCode->stackmaps, registerScratch, GPRInfo::regT0);
</span><span class="cx"> reboxAccordingToFormat(
</span><del>- exit.m_profileValueFormat, jit, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT2);
</del><ins>+ exit.m_profileDataFormat, jit, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT2);
</ins><span class="cx">
</span><span class="cx"> if (exit.m_kind == BadCache || exit.m_kind == BadIndexingType) {
</span><span class="cx"> CodeOrigin codeOrigin = exit.m_codeOriginForExitProfile;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLValueFormatcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/ftl/FTLValueFormat.cpp (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLValueFormat.cpp 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLValueFormat.cpp 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013, 2014 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 "FTLValueFormat.h"
-
-#if ENABLE(FTL_JIT)
-
-#include "AssemblyHelpers.h"
-
-namespace JSC { namespace FTL {
-
-void reboxAccordingToFormat(
- ValueFormat format, AssemblyHelpers& jit, GPRReg value, GPRReg scratch1, GPRReg scratch2)
-{
- switch (format) {
- case ValueFormatInt32: {
- jit.zeroExtend32ToPtr(value, value);
- jit.or64(GPRInfo::tagTypeNumberRegister, value);
- break;
- }
-
- case ValueFormatInt52: {
- jit.rshift64(AssemblyHelpers::TrustedImm32(JSValue::int52ShiftAmount), value);
- jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch2);
- jit.boxInt52(value, value, scratch1, FPRInfo::fpRegT0);
- jit.move64ToDouble(scratch2, FPRInfo::fpRegT0);
- break;
- }
-
- case ValueFormatStrictInt52: {
- jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch2);
- jit.boxInt52(value, value, scratch1, FPRInfo::fpRegT0);
- jit.move64ToDouble(scratch2, FPRInfo::fpRegT0);
- break;
- }
-
- case ValueFormatBoolean: {
- jit.zeroExtend32ToPtr(value, value);
- jit.or32(MacroAssembler::TrustedImm32(ValueFalse), value);
- break;
- }
-
- case ValueFormatJSValue: {
- // Done already!
- break;
- }
-
- case ValueFormatDouble: {
- jit.moveDoubleTo64(FPRInfo::fpRegT0, scratch1);
- jit.move64ToDouble(value, FPRInfo::fpRegT0);
- jit.purifyNaN(FPRInfo::fpRegT0);
- jit.boxDouble(FPRInfo::fpRegT0, value);
- jit.move64ToDouble(scratch1, FPRInfo::fpRegT0);
- break;
- }
-
- default:
- RELEASE_ASSERT_NOT_REACHED();
- break;
- }
-}
-
-} } // namespace JSC::FTL
-
-namespace WTF {
-
-using namespace JSC::FTL;
-
-void printInternal(PrintStream& out, ValueFormat format)
-{
- switch (format) {
- case InvalidValueFormat:
- out.print("Invalid");
- return;
- case ValueFormatInt32:
- out.print("Int32");
- return;
- case ValueFormatInt52:
- out.print("Int52");
- return;
- case ValueFormatStrictInt52:
- out.print("StrictInt52");
- return;
- case ValueFormatBoolean:
- out.print("Boolean");
- return;
- case ValueFormatJSValue:
- out.print("JSValue");
- return;
- case ValueFormatDouble:
- out.print("Double");
- return;
- }
-
- RELEASE_ASSERT_NOT_REACHED();
-}
-
-} // namespace WTF
-
-#endif // ENABLE(FTL_JIT)
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLValueFormath"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/ftl/FTLValueFormat.h (189361 => 189362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLValueFormat.h 2015-09-04 18:22:27 UTC (rev 189361)
+++ trunk/Source/JavaScriptCore/ftl/FTLValueFormat.h 2015-09-04 18:24:38 UTC (rev 189362)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * 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.
- */
-
-#ifndef FTLValueFormat_h
-#define FTLValueFormat_h
-
-#if ENABLE(FTL_JIT)
-
-#include "GPRInfo.h"
-#include <wtf/PrintStream.h>
-
-namespace JSC {
-
-class AssemblyHelpers;
-
-namespace FTL {
-
-// Note that this is awkwardly similar to DataFormat in other parts of JSC, except that
-// unlike DataFormat and like ValueRecovery, it distinguishes between UInt32 and Int32.
-
-enum ValueFormat {
- InvalidValueFormat,
- ValueFormatInt32,
- ValueFormatInt52,
- ValueFormatStrictInt52,
- ValueFormatBoolean,
- ValueFormatJSValue,
- ValueFormatDouble
-};
-
-void reboxAccordingToFormat(
- ValueFormat, AssemblyHelpers&, GPRReg value, GPRReg scratch1, GPRReg scratch2);
-
-} } // namespace JSC::FTL
-
-namespace WTF {
-
-void printInternal(PrintStream&, JSC::FTL::ValueFormat);
-
-} // namespace WTF
-
-#endif // ENABLE(FTL_JIT)
-
-#endif // FTLValueFormat_h
-
</del></span></pre>
</div>
</div>
</body>
</html>