<!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>[160497] 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/160497">160497</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 11:21:09 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename returnFromJavaScript to handleUncaughtException.
https://bugs.webkit.org/show_bug.cgi?id=125613.
Reviewed by Filip Pizlo.
Also did a few minor fixes to get the C Loop LLINT offline asm stage
to build properly, and also some trivial changes to minimize the
compile errors for LowLevelInterpreter.cpp. It doesn't build completely
and run yet since we'll need to update it for CStack changes that have
not been implemented for the C Loop LLINT yet.
* interpreter/Interpreter.cpp:
(JSC::unwindCallFrame):
* jit/JITExceptions.cpp:
(JSC::genericUnwind):
* jit/JITStubs.h:
* jit/JITStubsMSVC64.asm:
* jit/JITStubsX86.h:
* llint/LLIntOpcode.h:
* llint/LLIntThunks.h:
* llint/LowLevelInterpreter.cpp:
(JSC::CLoop::execute):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* offlineasm/cloop.rb:</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="#branchesjsCStackSourceJavaScriptCorejitJITExceptionscpp">branches/jsCStack/Source/JavaScriptCore/jit/JITExceptions.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITStubsh">branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITStubsMSVC64asm">branches/jsCStack/Source/JavaScriptCore/jit/JITStubsMSVC64.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitJITStubsX86h">branches/jsCStack/Source/JavaScriptCore/jit/JITStubsX86.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLLIntOpcodeh">branches/jsCStack/Source/JavaScriptCore/llint/LLIntOpcode.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLLIntThunksh">branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpretercpp">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter32_64asm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreofflineasmclooprb">branches/jsCStack/Source/JavaScriptCore/offlineasm/cloop.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2013-12-12 Mark Lam <mark.lam@apple.com>
+
+ Rename returnFromJavaScript to handleUncaughtException.
+ https://bugs.webkit.org/show_bug.cgi?id=125613.
+
+ Reviewed by Filip Pizlo.
+
+ Also did a few minor fixes to get the C Loop LLINT offline asm stage
+ to build properly, and also some trivial changes to minimize the
+ compile errors for LowLevelInterpreter.cpp. It doesn't build completely
+ and run yet since we'll need to update it for CStack changes that have
+ not been implemented for the C Loop LLINT yet.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::unwindCallFrame):
+ * jit/JITExceptions.cpp:
+ (JSC::genericUnwind):
+ * jit/JITStubs.h:
+ * jit/JITStubsMSVC64.asm:
+ * jit/JITStubsX86.h:
+ * llint/LLIntOpcode.h:
+ * llint/LLIntThunks.h:
+ * llint/LowLevelInterpreter.cpp:
+ (JSC::CLoop::execute):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * offlineasm/cloop.rb:
+
</ins><span class="cx"> 2013-12-11 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack Branch: Set stack pointer in OSR exit handler
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> if (callerFrame->vmEntrySentinelCallerFrame())
</span><span class="cx"> callFrame->vm().topCallFrame = callerFrame->vmEntrySentinelCallerFrame();
</span><span class="cx"> else
</span><del>- callFrame->vm().topCallFrame = callFrame; // _returnFromJavaScript will pop the frame off.
</del><ins>+ callFrame->vm().topCallFrame = callFrame; // _handleUncaughtException will pop the frame off.
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITExceptionscpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITExceptions.cpp (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITExceptions.cpp 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITExceptions.cpp 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> catchRoutine = catchPCForInterpreter->u.pointer;
</span><span class="cx"> #endif
</span><span class="cx"> } else
</span><del>- catchRoutine = LLInt::getCodePtr(returnFromJavaScript);
</del><ins>+ catchRoutine = LLInt::getCodePtr(handleUncaughtException);
</ins><span class="cx">
</span><span class="cx"> vm->callFrameForThrow = callFrame;
</span><span class="cx"> vm->targetMachinePCForThrow = catchRoutine;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITStubsh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx"> EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*, Register*);
</span><del>- void returnFromJavaScript();
</del><ins>+ void handleUncaughtException();
</ins><span class="cx"> EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITStubsMSVC64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITStubsMSVC64.asm (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITStubsMSVC64.asm 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITStubsMSVC64.asm 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> EXTERN getHostCallReturnValueWithExecState : near
</span><span class="cx">
</span><span class="cx"> PUBLIC callToJavaScript
</span><del>-PUBLIC returnFromJavaScript
</del><ins>+PUBLIC handleUncaughtException
</ins><span class="cx"> PUBLIC getHostCallReturnValue
</span><span class="cx">
</span><span class="cx"> _TEXT SEGMENT
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> ret
</span><span class="cx"> callToNativeFunction ENDP
</span><span class="cx">
</span><del>-returnFromJavaScript PROC
</del><ins>+handleUncaughtException PROC
</ins><span class="cx"> add rsp, 28h
</span><span class="cx"> pop rdi
</span><span class="cx"> pop rsi
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> pop r12
</span><span class="cx"> pop rbp
</span><span class="cx"> ret
</span><del>-returnFromJavaScript ENDP
</del><ins>+handleUncaughtException ENDP
</ins><span class="cx">
</span><span class="cx"> getHostCallReturnValue PROC
</span><span class="cx"> mov rbp, [rbp] ; CallFrame
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitJITStubsX86h"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/JITStubsX86.h (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/JITStubsX86.h 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/jit/JITStubsX86.h 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- __declspec(naked) void returnFromJavaScript()
</del><ins>+ __declspec(naked) void handleUncaughtException()
</ins><span class="cx"> {
</span><span class="cx"> __asm {
</span><span class="cx"> add esp, 0x1c;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLLIntOpcodeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LLIntOpcode.h (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LLIntOpcode.h 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LLIntOpcode.h 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_LLINT_NOJIT_NATIVE_HELPER(macro) \
</span><span class="cx"> macro(getHostCallReturnValue, 1) \
</span><del>- macro(returnFromJavaScript, 1)
</del><ins>+ macro(handleUncaughtException, 1)
</ins><span class="cx">
</span><span class="cx"> #else // !ENABLE(LLINT_C_LOOP)
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLLIntThunksh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*, Register*);
</span><span class="cx"> EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
</span><span class="cx"> #if ENABLE(JIT)
</span><del>- void returnFromJavaScript();
</del><ins>+ void handleUncaughtException();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpretercpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> // 2. 32 bit result values will be in the low 32-bit of t0.
</span><span class="cx"> // 3. 64 bit result values will be in t0.
</span><span class="cx">
</span><del>- CLoopRegister t0, t1, t2, t3;
</del><ins>+ CLoopRegister t0, t1, t2, t3, t5, sp;
</ins><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> CLoopRegister rBasePC, tagTypeNumber, tagMask;
</span><span class="cx"> #endif
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> goto doReturnHelper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OFFLINE_ASM_GLUE_LABEL(returnFromJavaScript)
</del><ins>+ OFFLINE_ASM_GLUE_LABEL(handleUncaughtException)
</ins><span class="cx"> {
</span><span class="cx"> return vm->exception();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -343,8 +343,8 @@
</span><span class="cx"> call temp
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro doReturnFromJavaScript(extraStackSpace)
-_returnFromJavaScript:
</del><ins>+macro doHandleUncaughtException(extraStackSpace)
+_handleUncaughtException:
</ins><span class="cx"> functionEpilogue(extraStackSpace)
</span><span class="cx"> ret
</span><span class="cx"> end
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx">
</span><del>-_returnFromJavaScript:
</del><ins>+_handleUncaughtException:
</ins><span class="cx"> subp 16, sp
</span><span class="cx">
</span><span class="cx"> checkStackPointerAlignment(t3, 0xbad0eeee)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreofflineasmclooprb"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/offlineasm/cloop.rb (160496 => 160497)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/offlineasm/cloop.rb 2013-12-12 18:42:53 UTC (rev 160496)
+++ branches/jsCStack/Source/JavaScriptCore/offlineasm/cloop.rb 2013-12-12 19:21:09 UTC (rev 160497)
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx"> "t3"
</span><span class="cx"> when "t4"
</span><span class="cx"> "rPC"
</span><ins>+ when "t5"
+ "t5"
</ins><span class="cx"> when "t6"
</span><span class="cx"> "rBasePC"
</span><span class="cx"> when "csr1"
</span><span class="lines">@@ -1097,6 +1099,8 @@
</span><span class="cx"> cloopEmitOpAndBranch(operands, "|", :int32, "!= 0")
</span><span class="cx">
</span><span class="cx"> when "memfence"
</span><ins>+ when "pop"
+ $asm.putc "#error FIXME: Need implementation for pop"
</ins><span class="cx"> when "pushCalleeSaves"
</span><span class="cx"> when "popCalleeSaves"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>