<!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>[163345] 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/163345">163345</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 16:54:16 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the cloop due to GenGC
https://bugs.webkit.org/show_bug.cgi?id=128137
Reviewed by Geoffrey Garen.
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::llint_write_barrier_slow):
* llint/LLIntSlowPaths.h:
* llint/LowLevelInterpreter.cpp:
(JSC::CLoopRegister::operator JSCell*):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* offlineasm/cloop.rb:
* offlineasm/instructions.rb:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathsh">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpretercpp">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmclooprb">trunk/Source/JavaScriptCore/offlineasm/cloop.rb</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasminstructionsrb">trunk/Source/JavaScriptCore/offlineasm/instructions.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-03 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Fix the cloop due to GenGC
+ https://bugs.webkit.org/show_bug.cgi?id=128137
+
+ Reviewed by Geoffrey Garen.
+
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::llint_write_barrier_slow):
+ * llint/LLIntSlowPaths.h:
+ * llint/LowLevelInterpreter.cpp:
+ (JSC::CLoopRegister::operator JSCell*):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * offlineasm/cloop.rb:
+ * offlineasm/instructions.rb:
+
</ins><span class="cx"> 2014-02-03 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r163011-r163031): Web Inspector: Latest nightly crashes when showing the Web Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -1436,10 +1436,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-extern "C" SlowPathReturnType llint_write_barrier_slow(ExecState*, JSCell* cell)
</del><ins>+extern "C" void llint_write_barrier_slow(ExecState*, JSCell* cell)
</ins><span class="cx"> {
</span><span class="cx"> Heap::writeBarrier(cell);
</span><del>- return encodeResult(0, 0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::LLInt
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.h 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> extern "C" SlowPathReturnType llint_trace_operand(ExecState*, Instruction*, int fromWhere, int operand);
</span><span class="cx"> extern "C" SlowPathReturnType llint_trace_value(ExecState*, Instruction*, int fromWhere, int operand);
</span><del>-extern "C" SlowPathReturnType llint_write_barrier_slow(ExecState*, JSCell*) WTF_INTERNAL;
</del><ins>+extern "C" void llint_write_barrier_slow(ExecState*, JSCell*) WTF_INTERNAL;
</ins><span class="cx">
</span><span class="cx"> #define LLINT_SLOW_PATH_DECL(name) \
</span><span class="cx"> extern "C" SlowPathReturnType llint_##name(ExecState* exec, Instruction* pc)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -225,6 +225,7 @@
</span><span class="cx"> ExecState* execState;
</span><span class="cx"> void* instruction;
</span><span class="cx"> VM* vm;
</span><ins>+ JSCell* cell;
</ins><span class="cx"> ProtoCallFrame* protoCallFrame;
</span><span class="cx"> NativeFunction nativeFunc;
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -241,6 +242,7 @@
</span><span class="cx"> operator VM*() { return vm; }
</span><span class="cx"> operator ProtoCallFrame*() { return protoCallFrame; }
</span><span class="cx"> operator Register*() { return reinterpret_cast<Register*>(vp); }
</span><ins>+ operator JSCell*() { return cell; }
</ins><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> inline void clearHighWord() { i32padding = 0; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -117,6 +117,14 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+macro cCall2Void(function, arg1, arg2)
+ if C_LOOP
+ cloopCallSlowPathVoid function, arg1, arg2
+ else
+ cCall2(function, arg1, arg2)
+ end
+end
+
</ins><span class="cx"> # This barely works. arg3 and arg4 should probably be immediates.
</span><span class="cx"> macro cCall4(function, arg1, arg2, arg3, arg4)
</span><span class="cx"> if ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
</span><span class="lines">@@ -525,7 +533,7 @@
</span><span class="cx"> push cfr, PC
</span><span class="cx"> # We make two extra slots because cCall2 will poke.
</span><span class="cx"> subp 8, sp
</span><del>- cCall2(_llint_write_barrier_slow, cfr, t2)
</del><ins>+ cCall2Void(_llint_write_barrier_slow, cfr, t2)
</ins><span class="cx"> addp 8, sp
</span><span class="cx"> pop PC, cfr
</span><span class="cx"> end
</span><span class="lines">@@ -558,7 +566,7 @@
</span><span class="cx"> push cfr, PC
</span><span class="cx"> # We make two extra slots because cCall2 will poke.
</span><span class="cx"> subp 8, sp
</span><del>- cCall2(_llint_write_barrier_slow, cfr, t3)
</del><ins>+ cCall2Void(_llint_write_barrier_slow, cfr, t3)
</ins><span class="cx"> addp 8, sp
</span><span class="cx"> pop PC, cfr
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -68,6 +68,14 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+macro cCall2Void(function, arg1, arg2)
+ if C_LOOP
+ cloopCallSlowPathVoid function, arg1, arg2
+ else
+ cCall2(function, arg1, arg2)
+ end
+end
+
</ins><span class="cx"> # This barely works. arg3 and arg4 should probably be immediates.
</span><span class="cx"> macro cCall4(function, arg1, arg2, arg3, arg4)
</span><span class="cx"> checkStackPointerAlignment(t4, 0xbad0c004)
</span><span class="lines">@@ -390,7 +398,7 @@
</span><span class="cx"> macro(marked)
</span><span class="cx"> btbz marked, .writeBarrierDone
</span><span class="cx"> push PB, PC
</span><del>- cCall2(_llint_write_barrier_slow, cfr, t2)
</del><ins>+ cCall2Void(_llint_write_barrier_slow, cfr, t2)
</ins><span class="cx"> pop PC, PB
</span><span class="cx"> end
</span><span class="cx"> )
</span><span class="lines">@@ -421,7 +429,7 @@
</span><span class="cx"> macro(marked)
</span><span class="cx"> btbz marked, .writeBarrierDone
</span><span class="cx"> push PB, PC
</span><del>- cCall2(_llint_write_barrier_slow, cfr, t3)
</del><ins>+ cCall2Void(_llint_write_barrier_slow, cfr, t3)
</ins><span class="cx"> pop PC, PB
</span><span class="cx"> end
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmclooprb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/cloop.rb (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/cloop.rb 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/offlineasm/cloop.rb 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -548,6 +548,10 @@
</span><span class="cx"> $asm.putc "}"
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+def cloopEmitCallSlowPathVoid(operands)
+ $asm.putc "#{operands[0].cLabel}(#{operands[1].clDump}, #{operands[2].clDump});"
+end
+
</ins><span class="cx"> class Instruction
</span><span class="cx"> @@didReturnFromJSLabelCounter = 0
</span><span class="cx">
</span><span class="lines">@@ -1088,9 +1092,15 @@
</span><span class="cx"> when "memfence"
</span><span class="cx">
</span><span class="cx"> when "push"
</span><del>- $asm.putc "PUSH(#{operands[0].clDump});"
</del><ins>+ operands.each {
+ | op |
+ $asm.putc "PUSH(#{op.clDump});"
+ }
</ins><span class="cx"> when "pop"
</span><del>- $asm.putc "POP(#{operands[0].clDump});"
</del><ins>+ operands.each {
+ | op |
+ $asm.putc "POP(#{op.clDump});"
+ }
</ins><span class="cx">
</span><span class="cx"> when "pushCalleeSaves"
</span><span class="cx"> when "popCalleeSaves"
</span><span class="lines">@@ -1133,6 +1143,9 @@
</span><span class="cx"> when "cloopCallSlowPath"
</span><span class="cx"> cloopEmitCallSlowPath(operands)
</span><span class="cx">
</span><ins>+ when "cloopCallSlowPathVoid"
+ cloopEmitCallSlowPathVoid(operands)
+
</ins><span class="cx"> # For debugging only. This is used to insert instrumentation into the
</span><span class="cx"> # generated LLIntAssembly.h during llint development only. Do not use
</span><span class="cx"> # for production code.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasminstructionsrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/instructions.rb (163344 => 163345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/instructions.rb 2014-02-04 00:45:02 UTC (rev 163344)
+++ trunk/Source/JavaScriptCore/offlineasm/instructions.rb 2014-02-04 00:54:16 UTC (rev 163345)
</span><span class="lines">@@ -304,10 +304,11 @@
</span><span class="cx">
</span><span class="cx"> CXX_INSTRUCTIONS =
</span><span class="cx"> [
</span><del>- "cloopCrash", # no operands
- "cloopCallJSFunction", # operands: callee
- "cloopCallNative", # operands: callee
- "cloopCallSlowPath", # operands: callTarget, currentFrame, currentPC
</del><ins>+ "cloopCrash", # no operands
+ "cloopCallJSFunction", # operands: callee
+ "cloopCallNative", # operands: callee
+ "cloopCallSlowPath", # operands: callTarget, currentFrame, currentPC
+ "cloopCallSlowPathVoid", # operands: callTarget, currentFrame, currentPC
</ins><span class="cx">
</span><span class="cx"> # For debugging only:
</span><span class="cx"> # Takes no operands but simply emits whatever follows in // comments as
</span></span></pre>
</div>
</div>
</body>
</html>