<!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>[160660] branches/jsCStack/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/160660">160660</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 13:31:42 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Eliminate topOfStack parameter from callToJavaScript() and callToNativeFunction()
https://bugs.webkit.org/show_bug.cgi?id=125791
Reviewed by Geoffrey Garen.
Eliminated topOfStack from the callToJavaScript() and callToNativeFunction() calling chains.
* interpreter/Interpreter.cpp:
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
* jit/JITCode.cpp:
(JSC::JITCode::execute):
* jit/JITCode.h:
* jit/JITStubs.h:
* llint/LLIntThunks.h:
* llint/LowLevelInterpreter.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterInterpretercpp">branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITCodecpp">branches/jsCStack/Source/JavaScriptCore/jit/JITCode.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITCodeh">branches/jsCStack/Source/JavaScriptCore/jit/JITCode.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITStubsh">branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLLIntThunksh">branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2013-12-16 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ CStack Branch: Eliminate topOfStack parameter from callToJavaScript() and callToNativeFunction()
+ https://bugs.webkit.org/show_bug.cgi?id=125791
+
+ Reviewed by Geoffrey Garen.
+
+ Eliminated topOfStack from the callToJavaScript() and callToNativeFunction() calling chains.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::Interpreter::execute):
+ (JSC::Interpreter::executeCall):
+ (JSC::Interpreter::executeConstruct):
+ * jit/JITCode.cpp:
+ (JSC::JITCode::execute):
+ * jit/JITCode.h:
+ * jit/JITStubs.h:
+ * llint/LLIntThunks.h:
+ * llint/LowLevelInterpreter.asm:
+
+2013-12-16 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> CStack Branch: REGRESSION(r160600) ASSERT failure in Heap::collect()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125789
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx"> SamplingTool::CallRecord callRecord(m_sampler.get());
</span><span class="cx"> Watchdog::Scope watchdogScope(vm.watchdog);
</span><span class="cx">
</span><del>- result = program->generatedJITCode()->execute(&vm, &protoCallFrame, m_stack.getTopOfStack());
</del><ins>+ result = program->generatedJITCode()->execute(&vm, &protoCallFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="lines">@@ -963,9 +963,9 @@
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><span class="cx"> if (isJSCall)
</span><del>- result = callData.js.functionExecutable->generatedJITCodeForCall()->execute(&vm, &protoCallFrame, m_stack.getTopOfStack());
</del><ins>+ result = callData.js.functionExecutable->generatedJITCodeForCall()->execute(&vm, &protoCallFrame);
</ins><span class="cx"> else
</span><del>- result = JSValue::decode(callToNativeFunction(reinterpret_cast<void*>(callData.native.function), &vm.topCallFrame, &protoCallFrame, m_stack.getTopOfStack()));
</del><ins>+ result = JSValue::decode(callToNativeFunction(reinterpret_cast<void*>(callData.native.function), &vm.topCallFrame, &protoCallFrame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="lines">@@ -1031,9 +1031,9 @@
</span><span class="cx">
</span><span class="cx"> // Execute the code.
</span><span class="cx"> if (isJSConstruct)
</span><del>- result = constructData.js.functionExecutable->generatedJITCodeForConstruct()->execute(&vm, &protoCallFrame, m_stack.getTopOfStack());
</del><ins>+ result = constructData.js.functionExecutable->generatedJITCodeForConstruct()->execute(&vm, &protoCallFrame);
</ins><span class="cx"> else {
</span><del>- result = JSValue::decode(callToNativeFunction(reinterpret_cast<void*>(constructData.native.function), &vm.topCallFrame, &protoCallFrame, m_stack.getTopOfStack()));
</del><ins>+ result = JSValue::decode(callToNativeFunction(reinterpret_cast<void*>(constructData.native.function), &vm.topCallFrame, &protoCallFrame));
</ins><span class="cx">
</span><span class="cx"> if (!callFrame->hadException())
</span><span class="cx"> RELEASE_ASSERT(result.isObject());
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> SamplingTool::CallRecord callRecord(m_sampler.get());
</span><span class="cx"> Watchdog::Scope watchdogScope(vm.watchdog);
</span><span class="cx">
</span><del>- result = closure.functionExecutable->generatedJITCodeForCall()->execute(&vm, closure.protoCallFrame, m_stack.getTopOfStack());
</del><ins>+ result = closure.functionExecutable->generatedJITCodeForCall()->execute(&vm, closure.protoCallFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx"> SamplingTool::CallRecord callRecord(m_sampler.get());
</span><span class="cx"> Watchdog::Scope watchdogScope(vm.watchdog);
</span><span class="cx">
</span><del>- result = eval->generatedJITCode()->execute(&vm, &protoCallFrame, m_stack.getTopOfStack());
</del><ins>+ result = eval->generatedJITCode()->execute(&vm, &protoCallFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (LegacyProfiler* profiler = vm.enabledProfiler())
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITCodecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITCode.cpp (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITCode.cpp 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITCode.cpp 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -41,11 +41,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JITCode::execute(VM* vm, ProtoCallFrame* protoCallFrame, Register* topOfStack)
</del><ins>+JSValue JITCode::execute(VM* vm, ProtoCallFrame* protoCallFrame)
</ins><span class="cx"> {
</span><del>- ASSERT(!vm->topCallFrame || ((Register*)(vm->topCallFrame) >= topOfStack));
-
- JSValue result = JSValue::decode(callToJavaScript(executableAddress(), &vm->topCallFrame, protoCallFrame, topOfStack));
</del><ins>+ JSValue result = JSValue::decode(callToJavaScript(executableAddress(), &vm->topCallFrame, protoCallFrame));
</ins><span class="cx"> return vm->exception() ? jsNull() : result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITCodeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITCode.h (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITCode.h 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITCode.h 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> virtual FTL::JITCode* ftl();
</span><span class="cx"> virtual FTL::ForOSREntryJITCode* ftlForOSREntry();
</span><span class="cx">
</span><del>- JSValue execute(VM*, ProtoCallFrame*, Register*);
</del><ins>+ JSValue execute(VM*, ProtoCallFrame*);
</ins><span class="cx">
</span><span class="cx"> void* start() { return dataAddressAtOffset(0); }
</span><span class="cx"> virtual size_t size() = 0;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITStubsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> struct ProtoCallFrame;
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><del>- EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*, Register*);
</del><ins>+ EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*);
</ins><span class="cx"> void handleUncaughtException();
</span><del>- EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
</del><ins>+ EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLLIntThunksh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> struct ProtoCallFrame;
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><del>- EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*, Register*);
- EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
</del><ins>+ EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*);
+ EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*);
</ins><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> void handleUncaughtException();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (160659 => 160660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-16 21:26:59 UTC (rev 160659)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-12-16 21:31:42 UTC (rev 160660)
</span><span class="lines">@@ -464,8 +464,8 @@
</span><span class="cx"> if C_LOOP
</span><span class="cx"> else
</span><span class="cx"> # stub to call into JavaScript or Native functions
</span><del>-# EncodedJSValue callToJavaScript(void* code, ExecState** vm, ProtoCallFrame* protoFrame, Register* topOfStack)
-# EncodedJSValue callToNativeFunction(void* code, ExecState** vm, ProtoCallFrame* protoFrame, Register* topOfStack)
</del><ins>+# EncodedJSValue callToJavaScript(void* code, ExecState** vmTopCallFrame, ProtoCallFrame* protoFrame)
+# EncodedJSValue callToNativeFunction(void* code, ExecState** vmTopCallFrame, ProtoCallFrame* protoFrame)
</ins><span class="cx"> # Note, if these stubs or one of their related macros are changed, make the
</span><span class="cx"> # equivalent changes in jit/JITStubsX86.h and/or jit/JITStubsMSVC64.asm
</span><span class="cx"> _callToJavaScript:
</span></span></pre>
</div>
</div>
</body>
</html>