<!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>[179503] 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/179503">179503</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 15:32:00 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>VirtualRegister should really know how to dump itself
https://bugs.webkit.org/show_bug.cgi?id=141171
Reviewed by Geoffrey Garen.
Gives VirtualRegister a dump() method that pretty-prints the virtual register. The rest of
the patch is all about using this new power.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bytecode/CodeBlock.cpp:
(JSC::constantName):
(JSC::CodeBlock::registerName):
* bytecode/CodeBlock.h:
(JSC::missingThisObjectMarker): Deleted.
* bytecode/VirtualRegister.cpp: Added.
(JSC::VirtualRegister::dump):
* bytecode/VirtualRegister.h:
(WTF::printInternal): Deleted.
* dfg/DFGArgumentPosition.h:
(JSC::DFG::ArgumentPosition::dump):
* dfg/DFGFlushedAt.cpp:
(JSC::DFG::FlushedAt::dump):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::dump):
* dfg/DFGPutLocalSinkingPhase.cpp:
* dfg/DFGSSAConversionPhase.cpp:
(JSC::DFG::SSAConversionPhase::run):
* dfg/DFGValidate.cpp:
(JSC::DFG::Validate::reportValidationContext):
* dfg/DFGValueSource.cpp:
(JSC::DFG::ValueSource::dump):
* dfg/DFGVariableEvent.cpp:
(JSC::DFG::VariableEvent::dump):
(JSC::DFG::VariableEvent::dumpSpillInfo):
* ftl/FTLExitArgumentForOperand.cpp:
(JSC::FTL::ExitArgumentForOperand::dump):
* ftl/FTLExitValue.cpp:
(JSC::FTL::ExitValue::dumpInContext):
* profiler/ProfilerBytecodeSequence.cpp:
(JSC::Profiler::BytecodeSequence::BytecodeSequence):</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="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeVirtualRegisterh">trunk/Source/JavaScriptCore/bytecode/VirtualRegister.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArgumentPositionh">trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFlushedAtcpp">trunk/Source/JavaScriptCore/dfg/DFGFlushedAt.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPutLocalSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPutLocalSinkingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGValidatecpp">trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGValueSourcecpp">trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGVariableEventcpp">trunk/Source/JavaScriptCore/dfg/DFGVariableEvent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitArgumentForOperandcpp">trunk/Source/JavaScriptCore/ftl/FTLExitArgumentForOperand.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitValuecpp">trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerBytecodeSequencecpp">trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorebytecodeVirtualRegistercpp">trunk/Source/JavaScriptCore/bytecode/VirtualRegister.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> bytecode/UnlinkedInstructionStream.cpp
</span><span class="cx"> bytecode/ValueRecovery.cpp
</span><span class="cx"> bytecode/VariableWatchpointSet.cpp
</span><ins>+ bytecode/VirtualRegister.cpp
</ins><span class="cx"> bytecode/Watchpoint.cpp
</span><span class="cx">
</span><span class="cx"> bytecompiler/BytecodeGenerator.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-02-02 Filip Pizlo <fpizlo@apple.com>
+
+ VirtualRegister should really know how to dump itself
+ https://bugs.webkit.org/show_bug.cgi?id=141171
+
+ Reviewed by Geoffrey Garen.
+
+ Gives VirtualRegister a dump() method that pretty-prints the virtual register. The rest of
+ the patch is all about using this new power.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bytecode/CodeBlock.cpp:
+ (JSC::constantName):
+ (JSC::CodeBlock::registerName):
+ * bytecode/CodeBlock.h:
+ (JSC::missingThisObjectMarker): Deleted.
+ * bytecode/VirtualRegister.cpp: Added.
+ (JSC::VirtualRegister::dump):
+ * bytecode/VirtualRegister.h:
+ (WTF::printInternal): Deleted.
+ * dfg/DFGArgumentPosition.h:
+ (JSC::DFG::ArgumentPosition::dump):
+ * dfg/DFGFlushedAt.cpp:
+ (JSC::DFG::FlushedAt::dump):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::dump):
+ * dfg/DFGPutLocalSinkingPhase.cpp:
+ * dfg/DFGSSAConversionPhase.cpp:
+ (JSC::DFG::SSAConversionPhase::run):
+ * dfg/DFGValidate.cpp:
+ (JSC::DFG::Validate::reportValidationContext):
+ * dfg/DFGValueSource.cpp:
+ (JSC::DFG::ValueSource::dump):
+ * dfg/DFGVariableEvent.cpp:
+ (JSC::DFG::VariableEvent::dump):
+ (JSC::DFG::VariableEvent::dumpSpillInfo):
+ * ftl/FTLExitArgumentForOperand.cpp:
+ (JSC::FTL::ExitArgumentForOperand::dump):
+ * ftl/FTLExitValue.cpp:
+ (JSC::FTL::ExitValue::dumpInContext):
+ * profiler/ProfilerBytecodeSequence.cpp:
+ (JSC::Profiler::BytecodeSequence::BytecodeSequence):
+
</ins><span class="cx"> 2015-02-02 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -353,6 +353,7 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\UnlinkedInstructionStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\ValueRecovery.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\VariableWatchpointSet.cpp" />
</span><ins>+ <ClCompile Include="..\bytecode\VirtualRegister.cpp" />
</ins><span class="cx"> <ClCompile Include="..\bytecode\Watchpoint.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecompiler\BytecodeGenerator.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecompiler\NodesCodegen.cpp" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> 0F1E3A471534CBB9000F9456 /* DFGDoubleFormatState.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F1E3A441534CBAD000F9456 /* DFGDoubleFormatState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F1E3A67153A21E2000F9456 /* DFGSilentRegisterSavePlan.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F1E3A65153A21DF000F9456 /* DFGSilentRegisterSavePlan.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F1FE51C1922A3BC006987C5 /* AbortReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F1FE51B1922A3BC006987C5 /* AbortReason.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0F20C2591A8013AB00DA3229 /* VirtualRegister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F20C2581A8013AB00DA3229 /* VirtualRegister.cpp */; };
</ins><span class="cx"> 0F21C27D14BE727A00ADC64B /* CodeSpecializationKind.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F21C27914BE727300ADC64B /* CodeSpecializationKind.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F21C27F14BEAA8200ADC64B /* BytecodeConventions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F21C27E14BEAA8000ADC64B /* BytecodeConventions.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F235BD317178E1C00690C7F /* FTLExitArgument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BBD17178E1C00690C7F /* FTLExitArgument.cpp */; };
</span><span class="lines">@@ -1782,6 +1783,7 @@
</span><span class="cx"> 0F1E3A501537C2CB000F9456 /* DFGSlowPathGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGSlowPathGenerator.h; path = dfg/DFGSlowPathGenerator.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F1E3A65153A21DF000F9456 /* DFGSilentRegisterSavePlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGSilentRegisterSavePlan.h; path = dfg/DFGSilentRegisterSavePlan.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F1FE51B1922A3BC006987C5 /* AbortReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbortReason.h; sourceTree = "<group>"; };
</span><ins>+ 0F20C2581A8013AB00DA3229 /* VirtualRegister.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualRegister.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0F21C27914BE727300ADC64B /* CodeSpecializationKind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeSpecializationKind.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F21C27E14BEAA8000ADC64B /* BytecodeConventions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BytecodeConventions.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BBD17178E1C00690C7F /* FTLExitArgument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLExitArgument.cpp; path = ftl/FTLExitArgument.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5124,6 +5126,7 @@
</span><span class="cx"> 0FCA9112195E66A000426438 /* VariableWatchpointSet.cpp */,
</span><span class="cx"> 0F9181C618415CA50057B669 /* VariableWatchpointSet.h */,
</span><span class="cx"> FE5248F8191442D900B7FDE4 /* VariableWatchpointSetInlines.h */,
</span><ins>+ 0F20C2581A8013AB00DA3229 /* VirtualRegister.cpp */,
</ins><span class="cx"> 0F426A461460CBAB00131F8F /* VirtualRegister.h */,
</span><span class="cx"> 0F919D2215853CDE004A4E7D /* Watchpoint.cpp */,
</span><span class="cx"> 0F919D2315853CDE004A4E7D /* Watchpoint.h */,
</span><span class="lines">@@ -7118,6 +7121,7 @@
</span><span class="cx"> A7C0C4AD1681067E0017011D /* JSScriptRef.cpp in Sources */,
</span><span class="cx"> 0F919D10157F3329004A4E7D /* JSSegmentedVariableObject.cpp in Sources */,
</span><span class="cx"> A7299D9D17D12837005F5FF9 /* JSSet.cpp in Sources */,
</span><ins>+ 0F20C2591A8013AB00DA3229 /* VirtualRegister.cpp in Sources */,
</ins><span class="cx"> A790DD6F182F499700588807 /* JSSetIterator.cpp in Sources */,
</span><span class="cx"> 2A83638918D7D0FE0000EBCC /* FullGCActivityCallback.cpp in Sources */,
</span><span class="cx"> 1428083A107EC0750013E7B2 /* JSStack.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> static CString constantName(int k, JSValue value)
</span><span class="cx"> {
</span><del>- return toCString(value, "(@k", k - FirstConstantRegisterIndex, ")");
</del><ins>+ return toCString(value, "(", VirtualRegister(k), ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CString idName(int id0, const Identifier& ident)
</span><span class="lines">@@ -184,19 +184,10 @@
</span><span class="cx">
</span><span class="cx"> CString CodeBlock::registerName(int r) const
</span><span class="cx"> {
</span><del>- if (r == missingThisObjectMarker())
- return "<null>";
-
</del><span class="cx"> if (isConstantRegisterIndex(r))
</span><span class="cx"> return constantName(r, getConstant(r));
</span><span class="cx">
</span><del>- if (operandIsArgument(r)) {
- if (!VirtualRegister(r).toArgument())
- return "this";
- return toCString("arg", VirtualRegister(r).toArgument());
- }
-
- return toCString("loc", VirtualRegister(r).toLocal());
</del><ins>+ return toCString(VirtualRegister(r));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CString regexpToSourceString(RegExp* regExp)
</span><span class="lines">@@ -3946,7 +3937,7 @@
</span><span class="cx">
</span><span class="cx"> if (codeBlock->captureCount() && codeBlock->symbolTable()->isCaptured(operand)) {
</span><span class="cx"> codeBlock->beginValidationDidFail();
</span><del>- dataLog(" At bc#", bytecodeOffset, " encountered invalid assignment to captured variable loc", virtualReg.toLocal(), ".\n");
</del><ins>+ dataLog(" At bc#", bytecodeOffset, " encountered invalid assignment to captured variable ", virtualReg, ".\n");
</ins><span class="cx"> codeBlock->endValidationDidFail();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx">
</span><span class="cx"> inline VirtualRegister unmodifiedArgumentsRegister(VirtualRegister argumentsRegister) { return VirtualRegister(argumentsRegister.offset() + 1); }
</span><span class="cx">
</span><del>-static ALWAYS_INLINE int missingThisObjectMarker() { return std::numeric_limits<int>::max(); }
-
</del><span class="cx"> enum ReoptimizationMode { DontCountReoptimization, CountReoptimization };
</span><span class="cx">
</span><span class="cx"> class CodeBlock : public ThreadSafeRefCounted<CodeBlock>, public UnconditionalFinalizer, public WeakReferenceHarvester {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeVirtualRegistercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/bytecode/VirtualRegister.cpp (0 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/VirtualRegister.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/bytecode/VirtualRegister.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * Copyright (C) 2011, 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 "VirtualRegister.h"
+
+namespace JSC {
+
+void VirtualRegister::dump(PrintStream& out) const
+{
+ if (!isValid()) {
+ out.print("<invalid>");
+ return;
+ }
+
+ if (isHeader()) {
+ out.print("head", m_virtualRegister);
+ return;
+ }
+
+ if (isConstant()) {
+ out.print("const", toConstantIndex());
+ return;
+ }
+
+ if (isArgument()) {
+ if (!toArgument())
+ out.print("this");
+ else
+ out.print("arg", toArgument());
+ return;
+ }
+
+ if (isLocal()) {
+ out.print("loc", toLocal());
+ return;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+}
+
+} // namespace JSC
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeVirtualRegisterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/VirtualRegister.h (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/VirtualRegister.h 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/bytecode/VirtualRegister.h 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx">
</span><span class="cx"> bool operator==(const VirtualRegister other) const { return m_virtualRegister == other.m_virtualRegister; }
</span><span class="cx"> bool operator!=(const VirtualRegister other) const { return m_virtualRegister != other.m_virtualRegister; }
</span><ins>+
+ void dump(PrintStream& out) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static const int s_invalidVirtualRegister = 0x3fffffff;
</span><span class="lines">@@ -96,13 +98,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><del>-namespace WTF {
-
-inline void printInternal(PrintStream& out, JSC::VirtualRegister value)
-{
- out.print(value.offset());
-}
-
-} // namespace WTF
-
</del><span class="cx"> #endif // VirtualRegister_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentPosition.h 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -123,10 +123,7 @@
</span><span class="cx"> if (i)
</span><span class="cx"> out.print(" ");
</span><span class="cx">
</span><del>- if (operand.isArgument())
- out.print("arg", operand.toArgument(), "(", VariableAccessDataDump(*graph, variable), ")");
- else
- out.print("r", operand.toLocal(), "(", VariableAccessDataDump(*graph, variable), ")");
</del><ins>+ out.print(operand, "(", VariableAccessDataDump(*graph, variable), ")");
</ins><span class="cx"> }
</span><span class="cx"> out.print("\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFlushedAtcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFlushedAt.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFlushedAt.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGFlushedAt.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> if (m_format == DeadFlush || m_format == ConflictingFlush)
</span><span class="cx"> out.print(m_format);
</span><span class="cx"> else if (m_virtualRegister.isValid())
</span><del>- out.print("r", m_virtualRegister, ":", m_format);
</del><ins>+ out.print(m_virtualRegister, ":", m_format);
</ins><span class="cx"> else
</span><span class="cx"> out.print(m_format);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -276,35 +276,18 @@
</span><span class="cx"> VariableAccessData* variableAccessData = node->tryGetVariableAccessData();
</span><span class="cx"> if (variableAccessData) {
</span><span class="cx"> VirtualRegister operand = variableAccessData->local();
</span><del>- if (operand.isArgument())
- out.print(comma, "arg", operand.toArgument(), "(", VariableAccessDataDump(*this, variableAccessData), ")");
- else
- out.print(comma, "loc", operand.toLocal(), "(", VariableAccessDataDump(*this, variableAccessData), ")");
-
</del><ins>+ out.print(comma, variableAccessData->local(), "(", VariableAccessDataDump(*this, variableAccessData), ")");
</ins><span class="cx"> operand = variableAccessData->machineLocal();
</span><del>- if (operand.isValid()) {
- if (operand.isArgument())
- out.print(comma, "machine:arg", operand.toArgument());
- else
- out.print(comma, "machine:loc", operand.toLocal());
- }
</del><ins>+ if (operand.isValid())
+ out.print(comma, "machine:", operand);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (node->hasUnlinkedLocal()) {
- VirtualRegister operand = node->unlinkedLocal();
- if (operand.isArgument())
- out.print(comma, "arg", operand.toArgument());
- else
- out.print(comma, "loc", operand.toLocal());
- }
</del><ins>+ if (node->hasUnlinkedLocal())
+ out.print(comma, node->unlinkedLocal());
</ins><span class="cx"> if (node->hasUnlinkedMachineLocal()) {
</span><span class="cx"> VirtualRegister operand = node->unlinkedMachineLocal();
</span><del>- if (operand.isValid()) {
- if (operand.isArgument())
- out.print(comma, "machine:arg", operand.toArgument());
- else
- out.print(comma, "machine:loc", operand.toLocal());
- }
</del><ins>+ if (operand.isValid())
+ out.print(comma, "machine:", operand);
</ins><span class="cx"> }
</span><span class="cx"> if (node->hasConstantBuffer()) {
</span><span class="cx"> out.print(comma);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPutLocalSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPutLocalSinkingPhase.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPutLocalSinkingPhase.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGPutLocalSinkingPhase.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if (operand.isHeader())
</span><span class="cx"> return;
</span><span class="cx"> if (verbose)
</span><del>- dataLog(" r", operand, " is live at ", node, "\n");
</del><ins>+ dataLog(" ", operand, " is live at ", node, "\n");
</ins><span class="cx"> live.operand(operand) = true;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> for (BasicBlock* successor : block->successors()) {
</span><span class="cx"> for (size_t i = deferred.size(); i--;) {
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Considering r", deferred.operandForIndex(i), " at ", pointerDump(block), "->", pointerDump(successor), ": ", deferred[i], " and ", deferredAtHead[successor][i], " merges to ");
</del><ins>+ dataLog("Considering ", VirtualRegister(deferred.operandForIndex(i)), " at ", pointerDump(block), "->", pointerDump(successor), ": ", deferred[i], " and ", deferredAtHead[successor][i], " merges to ");
</ins><span class="cx">
</span><span class="cx"> deferredAtHead[successor][i] =
</span><span class="cx"> deferredAtHead[successor][i].merge(deferred[i]);
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Adding Phi for r", operand, " at ", pointerDump(block), "\n");
</del><ins>+ dataLog("Adding Phi for ", operand, " at ", pointerDump(block), "\n");
</ins><span class="cx">
</span><span class="cx"> Node* phiNode = m_graph.addNode(SpecHeapTop, Phi, NodeOrigin());
</span><span class="cx"> DFG_ASSERT(m_graph, nullptr, variableDeferral.hasVariable());
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> insertionSet.insert(0, phiDef->value());
</span><span class="cx">
</span><span class="cx"> if (verbose)
</span><del>- dataLog(" Mapping r", operand, " to ", phiDef->value(), "\n");
</del><ins>+ dataLog(" Mapping ", operand, " to ", phiDef->value(), "\n");
</ins><span class="cx"> mapping.operand(operand) = phiDef->value();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> VirtualRegister operand = variable->local();
</span><span class="cx"> deferred.operand(operand) = VariableDeferral(variable);
</span><span class="cx"> if (verbose)
</span><del>- dataLog(" Mapping r", operand, " to ", node->child1().node(), " at ", node, "\n");
</del><ins>+ dataLog(" Mapping ", operand, " to ", node->child1().node(), " at ", node, "\n");
</ins><span class="cx"> mapping.operand(operand) = node->child1().node();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx">
</span><span class="cx"> // Gotta insert a PutLocal.
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Inserting a PutLocal for r", operand, " at ", node, "\n");
</del><ins>+ dataLog("Inserting a PutLocal for ", operand, " at ", node, "\n");
</ins><span class="cx">
</span><span class="cx"> Node* incoming = mapping.operand(operand);
</span><span class="cx"> DFG_ASSERT(m_graph, node, incoming);
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> SSACalculator::Variable* variable = phiDef->variable();
</span><span class="cx"> VirtualRegister operand = indexToOperand[variable->index()];
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Creating Upsilon for r", operand, " at ", pointerDump(block), "->", pointerDump(successorBlock), "\n");
</del><ins>+ dataLog("Creating Upsilon for ", operand, " at ", pointerDump(block), "->", pointerDump(successorBlock), "\n");
</ins><span class="cx"> VariableDeferral variableDeferral =
</span><span class="cx"> deferredAtHead[successorBlock].operand(operand);
</span><span class="cx"> DFG_ASSERT(m_graph, nullptr, variableDeferral.hasVariable());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> ASSERT(!node->replacement);
</span><span class="cx"> }
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Mapping: r", valueForOperand.operandForIndex(i), " -> ", node, "\n");
</del><ins>+ dataLog("Mapping: ", VirtualRegister(valueForOperand.operandForIndex(i)), " -> ", node, "\n");
</ins><span class="cx"> valueForOperand[i] = node;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> if (!variable->isCaptured()) {
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Mapping: r", variable->local(), " -> ", node->child1().node(), "\n");
</del><ins>+ dataLog("Mapping: ", variable->local(), " -> ", node->child1().node(), "\n");
</ins><span class="cx"> valueForOperand.operand(variable->local()) = node->child1().node();
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> VariableAccessData* variable = node->variableAccessData();
</span><span class="cx"> ASSERT(!variable->isCaptured());
</span><span class="cx"> if (verbose)
</span><del>- dataLog("Mapping: r", variable->local(), " -> ", node, "\n");
</del><ins>+ dataLog("Mapping: ", variable->local(), " -> ", node, "\n");
</ins><span class="cx"> valueForOperand.operand(variable->local()) = node;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGValidatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGValidate.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -542,23 +542,23 @@
</span><span class="cx"> void reportValidationContext(VirtualRegister local, BasicBlock* block)
</span><span class="cx"> {
</span><span class="cx"> if (!block) {
</span><del>- dataLog("r", local, " in null Block ");
</del><ins>+ dataLog(local, " in null Block ");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dataLog("r", local, " in Block ", *block);
</del><ins>+ dataLog(local, " in Block ", *block);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reportValidationContext(
</span><span class="cx"> VirtualRegister local, BasicBlock* sourceBlock, BasicBlock* destinationBlock)
</span><span class="cx"> {
</span><del>- dataLog("r", local, " in Block ", *sourceBlock, " -> ", *destinationBlock);
</del><ins>+ dataLog(local, " in Block ", *sourceBlock, " -> ", *destinationBlock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reportValidationContext(
</span><span class="cx"> VirtualRegister local, BasicBlock* sourceBlock, Node* prevNode)
</span><span class="cx"> {
</span><del>- dataLog(prevNode, " for r", local, " in Block ", *sourceBlock);
</del><ins>+ dataLog(prevNode, " for ", local, " in Block ", *sourceBlock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reportValidationContext(Node* node, BasicBlock* block)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGValueSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -42,22 +42,22 @@
</span><span class="cx"> out.print("IsDead");
</span><span class="cx"> break;
</span><span class="cx"> case ValueInJSStack:
</span><del>- out.print("JS:r", virtualRegister());
</del><ins>+ out.print("JS:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case Int32InJSStack:
</span><del>- out.print("Int32:r", virtualRegister());
</del><ins>+ out.print("Int32:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case Int52InJSStack:
</span><del>- out.print("Int52:r", virtualRegister());
</del><ins>+ out.print("Int52:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case CellInJSStack:
</span><del>- out.print("Cell:r", virtualRegister());
</del><ins>+ out.print("Cell:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case BooleanInJSStack:
</span><del>- out.print("Bool:r", virtualRegister());
</del><ins>+ out.print("Bool:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case DoubleInJSStack:
</span><del>- out.print("Double:r", virtualRegister());
</del><ins>+ out.print("Double:", virtualRegister());
</ins><span class="cx"> break;
</span><span class="cx"> case ArgumentsSource:
</span><span class="cx"> out.print("Arguments");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGVariableEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGVariableEvent.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGVariableEvent.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/dfg/DFGVariableEvent.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -56,11 +56,11 @@
</span><span class="cx"> out.print("Death(", id(), ")");
</span><span class="cx"> break;
</span><span class="cx"> case MovHintEvent:
</span><del>- out.print("MovHint(", id(), ", r", bytecodeRegister(), ")");
</del><ins>+ out.print("MovHint(", id(), ", ", bytecodeRegister(), ")");
</ins><span class="cx"> break;
</span><span class="cx"> case SetLocalEvent:
</span><span class="cx"> out.print(
</span><del>- "SetLocal(machine:r", machineRegister(), " -> bytecode:r", bytecodeRegister(),
</del><ins>+ "SetLocal(machine:", machineRegister(), " -> bytecode:", bytecodeRegister(),
</ins><span class="cx"> ", ", dataFormatToString(dataFormat()), ")");
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void VariableEvent::dumpSpillInfo(const char* name, PrintStream& out) const
</span><span class="cx"> {
</span><del>- out.print(name, "(", id(), ", r", spillRegister(), ", ", dataFormatToString(dataFormat()), ")");
</del><ins>+ out.print(name, "(", id(), ", ", spillRegister(), ", ", dataFormatToString(dataFormat()), ")");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitArgumentForOperandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLExitArgumentForOperand.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitArgumentForOperand.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitArgumentForOperand.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> void ExitArgumentForOperand::dump(PrintStream& out) const
</span><span class="cx"> {
</span><del>- out.print(m_exitArgument, " for r", m_operand);
</del><ins>+ out.print(m_exitArgument, " for ", m_operand);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitValue.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> out.print("Constant(", inContext(constant(), context), ")");
</span><span class="cx"> return;
</span><span class="cx"> case ExitValueInJSStack:
</span><del>- out.print("InJSStack:r", virtualRegister());
</del><ins>+ out.print("InJSStack:", virtualRegister());
</ins><span class="cx"> return;
</span><span class="cx"> case ExitValueInJSStackAsInt32:
</span><del>- out.print("InJSStackAsInt32:r", virtualRegister());
</del><ins>+ out.print("InJSStackAsInt32:", virtualRegister());
</ins><span class="cx"> return;
</span><span class="cx"> case ExitValueInJSStackAsInt52:
</span><del>- out.print("InJSStackAsInt52:r", virtualRegister());
</del><ins>+ out.print("InJSStackAsInt52:", virtualRegister());
</ins><span class="cx"> return;
</span><span class="cx"> case ExitValueInJSStackAsDouble:
</span><del>- out.print("InJSStackAsDouble:r", virtualRegister());
</del><ins>+ out.print("InJSStackAsDouble:", virtualRegister());
</ins><span class="cx"> return;
</span><span class="cx"> case ExitValueArgumentsObjectThatWasNotCreated:
</span><span class="cx"> out.print("ArgumentsObjectThatWasNotCreated");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerBytecodeSequencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp (179502 => 179503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp 2015-02-02 23:14:50 UTC (rev 179502)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp 2015-02-02 23:32:00 UTC (rev 179503)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> if (!description.length())
</span><span class="cx"> continue;
</span><span class="cx"> out.reset();
</span><del>- out.print("arg", i, " (r", virtualRegisterForArgument(i).offset(), "): ", description);
</del><ins>+ out.print("arg", i, ": ", description);
</ins><span class="cx"> m_header.append(out.toCString());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>