<!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>[161298] 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/161298">161298</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 16:58:11 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: Make emitPutToCallFrameHeaderBeforePrologue and friends work for all platforms
https://bugs.webkit.org/show_bug.cgi?id=126421
Reviewed by Filip Pizlo.
Added new helper prologueStackPointerDelta() that returns the amount the stack
pointer should be adjusted when accessing a CallFrame via the stack pointer
before the function prologue has been executed.
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::prologueStackPointerDelta):
(JSC::AssemblyHelpers::emitFunctionEpilogue):
(JSC::AssemblyHelpers::emitPutToCallFrameHeaderBeforePrologue):
(JSC::AssemblyHelpers::emitPutPayloadToCallFrameHeaderBeforePrologue):
(JSC::AssemblyHelpers::emitPutTagToCallFrameHeaderBeforePrologue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejitAssemblyHelpersh">branches/jsCStack/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161297 => 161298)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-04 00:52:16 UTC (rev 161297)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-04 00:58:11 UTC (rev 161298)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-03 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: Make emitPutToCallFrameHeaderBeforePrologue and friends work for all platforms
+ https://bugs.webkit.org/show_bug.cgi?id=126421
+
+ Reviewed by Filip Pizlo.
+
+ Added new helper prologueStackPointerDelta() that returns the amount the stack
+ pointer should be adjusted when accessing a CallFrame via the stack pointer
+ before the function prologue has been executed.
+
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::prologueStackPointerDelta):
+ (JSC::AssemblyHelpers::emitFunctionEpilogue):
+ (JSC::AssemblyHelpers::emitPutToCallFrameHeaderBeforePrologue):
+ (JSC::AssemblyHelpers::emitPutPayloadToCallFrameHeaderBeforePrologue):
+ (JSC::AssemblyHelpers::emitPutTagToCallFrameHeaderBeforePrologue):
+
</ins><span class="cx"> 2014-01-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, some trivial 32-bit build fixes.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jit/AssemblyHelpers.h (161297 => 161298)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jit/AssemblyHelpers.h 2014-01-04 00:52:16 UTC (rev 161297)
+++ branches/jsCStack/Source/JavaScriptCore/jit/AssemblyHelpers.h 2014-01-04 00:58:11 UTC (rev 161298)
</span><span class="lines">@@ -58,8 +58,7 @@
</span><span class="cx"> CodeBlock* codeBlock() { return m_codeBlock; }
</span><span class="cx"> VM* vm() { return m_vm; }
</span><span class="cx"> AssemblerType_T& assembler() { return m_assembler; }
</span><del>-
-#if CPU(X86_64) || CPU(X86)
</del><ins>+
</ins><span class="cx"> void checkStackPointerAlignment()
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -69,6 +68,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if CPU(X86_64) || CPU(X86)
+ size_t prologueStackPointerDelta()
+ {
+ // Prologue only saves the framePointerRegister
+ return sizeof(void*);
+ }
+
</ins><span class="cx"> void emitFunctionPrologue()
</span><span class="cx"> {
</span><span class="cx"> push(framePointerRegister);
</span><span class="lines">@@ -77,11 +83,10 @@
</span><span class="cx">
</span><span class="cx"> void emitFunctionEpilogue()
</span><span class="cx"> {
</span><del>- // FIXME: The stack pointer need to be calculated from the framePointer
</del><span class="cx"> move(framePointerRegister, stackPointerRegister);
</span><span class="cx"> pop(framePointerRegister);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void preserveReturnAddressAfterCall(GPRReg reg)
</span><span class="cx"> {
</span><span class="cx"> pop(reg);
</span><span class="lines">@@ -96,32 +101,15 @@
</span><span class="cx"> {
</span><span class="cx"> push(address);
</span><span class="cx"> }
</span><ins>+#endif // CPU(X86_64) || CPU(X86)
</ins><span class="cx">
</span><del>- // emitPutToCallFrameHeaderBeforePrologue() and related are used to access callee frame header
- // fields before the code from emitFunctionPrologue() has executed.
- // First, the access is via the stack pointer. Second, the address calculation must also take
- // into account that the stack pointer may not have been adjusted down for the return PC and/or
- // caller's frame pointer. On some platforms, the callee is responsible for pushing the
- // "link register" containing the return address in the function prologue.
-#if USE(JSVALUE64)
- void emitPutToCallFrameHeaderBeforePrologue(GPRReg from, JSStack::CallFrameHeaderEntry entry)
</del><ins>+#if CPU(ARM) || CPU(ARM64)
+ size_t prologueStackPointerDelta()
</ins><span class="cx"> {
</span><del>- storePtr(from, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - sizeof(void*)));
</del><ins>+ // Prologue saves the framePointerRegister and linkRegister
+ return 2 * sizeof(void*);
</ins><span class="cx"> }
</span><del>-#else
- void emitPutPayloadToCallFrameHeaderBeforePrologue(GPRReg from, JSStack::CallFrameHeaderEntry entry)
- {
- storePtr(from, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - sizeof(void*) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)));
- }
</del><span class="cx">
</span><del>- void emitPutTagToCallFrameHeaderBeforePrologue(TrustedImm32 tag, JSStack::CallFrameHeaderEntry entry)
- {
- storePtr(tag, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - sizeof(void*) + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)));
- }
-#endif
-#endif // CPU(X86_64) || CPU(X86)
-
-#if CPU(ARM) || CPU(ARM64)
</del><span class="cx"> ALWAYS_INLINE void preserveReturnAddressAfterCall(RegisterID reg)
</span><span class="cx"> {
</span><span class="cx"> move(linkRegister, reg);
</span><span class="lines">@@ -139,6 +127,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CPU(MIPS)
</span><ins>+ size_t prologueStackPointerDelta()
+ {
+ // Prologue saves the framePointerRegister and returnAddressRegister
+ return 2 * sizeof(void*);
+ }
+
</ins><span class="cx"> ALWAYS_INLINE void preserveReturnAddressAfterCall(RegisterID reg)
</span><span class="cx"> {
</span><span class="cx"> move(returnAddressRegister, reg);
</span><span class="lines">@@ -156,6 +150,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CPU(SH4)
</span><ins>+ size_t prologueStackPointerDelta()
+ {
+ // Prologue saves the framePointerRegister and link register
+ return 2 * sizeof(void*);
+ }
+
</ins><span class="cx"> ALWAYS_INLINE void preserveReturnAddressAfterCall(RegisterID reg)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.stspr(reg);
</span><span class="lines">@@ -208,6 +208,29 @@
</span><span class="cx"> storePtr(from, Address(GPRInfo::callFrameRegister, CallFrame::returnPCOffset()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // emitPutToCallFrameHeaderBeforePrologue() and related are used to access callee frame header
+ // fields before the code from emitFunctionPrologue() has executed.
+ // First, the access is via the stack pointer. Second, the address calculation must also take
+ // into account that the stack pointer may not have been adjusted down for the return PC and/or
+ // caller's frame pointer. On some platforms, the callee is responsible for pushing the
+ // "link register" containing the return address in the function prologue.
+#if USE(JSVALUE64)
+ void emitPutToCallFrameHeaderBeforePrologue(GPRReg from, JSStack::CallFrameHeaderEntry entry)
+ {
+ storePtr(from, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - prologueStackPointerDelta()));
+ }
+#else
+ void emitPutPayloadToCallFrameHeaderBeforePrologue(GPRReg from, JSStack::CallFrameHeaderEntry entry)
+ {
+ storePtr(from, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - prologueStackPointerDelta() + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.payload)));
+ }
+
+ void emitPutTagToCallFrameHeaderBeforePrologue(TrustedImm32 tag, JSStack::CallFrameHeaderEntry entry)
+ {
+ storePtr(tag, Address(stackPointerRegister, entry * static_cast<ptrdiff_t>(sizeof(Register)) - prologueStackPointerDelta() + OBJECT_OFFSETOF(EncodedValueDescriptor, asBits.tag)));
+ }
+#endif
+
</ins><span class="cx"> Jump branchIfNotCell(GPRReg reg)
</span><span class="cx"> {
</span><span class="cx"> #if USE(JSVALUE64)
</span></span></pre>
</div>
</div>
</body>
</html>