<!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>[159871] 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/159871">159871</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-29 06:16:18 -0800 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge arm and sh4 paths in nativeForGenerator and privateCompileCTINativeCall functions.
https://bugs.webkit.org/show_bug.cgi?id=124892
Patch by Julien Brianceau <jbriance@cisco.com> on 2013-11-29
Reviewed by Zoltan Herczeg.
* assembler/MacroAssemblerSH4.h:
(JSC::MacroAssemblerSH4::call): Pick a scratch register instead of getting it as a
parameter. The sh4 port was the only one to have this call(Address, RegisterID) prototype.
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::privateCompileCTINativeCall): Use argumentGPRx and merge arm and sh4 paths.
* jit/ThunkGenerators.cpp:
(JSC::nativeForGenerator): Use argumentGPRx and merge arm and sh4 paths.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (159870 => 159871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-11-29 12:23:14 UTC (rev 159870)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-11-29 14:16:18 UTC (rev 159871)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-29 Julien Brianceau <jbriance@cisco.com>
+
+ Merge arm and sh4 paths in nativeForGenerator and privateCompileCTINativeCall functions.
+ https://bugs.webkit.org/show_bug.cgi?id=124892
+
+ Reviewed by Zoltan Herczeg.
+
+ * assembler/MacroAssemblerSH4.h:
+ (JSC::MacroAssemblerSH4::call): Pick a scratch register instead of getting it as a
+ parameter. The sh4 port was the only one to have this call(Address, RegisterID) prototype.
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::privateCompileCTINativeCall): Use argumentGPRx and merge arm and sh4 paths.
+ * jit/ThunkGenerators.cpp:
+ (JSC::nativeForGenerator): Use argumentGPRx and merge arm and sh4 paths.
+
</ins><span class="cx"> 2013-11-28 Nadav Rotem <nrotem@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert the X86 assembler peephole changes
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h (159870 => 159871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2013-11-29 12:23:14 UTC (rev 159870)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2013-11-29 14:16:18 UTC (rev 159871)
</span><span class="lines">@@ -2360,12 +2360,14 @@
</span><span class="cx"> return Call(m_assembler.call(target), Call::None);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void call(Address address, RegisterID target)
</del><ins>+ void call(Address address)
</ins><span class="cx"> {
</span><ins>+ RegisterID target = claimScratch();
</ins><span class="cx"> load32(address.base, address.offset, target);
</span><span class="cx"> m_assembler.ensureSpace(m_assembler.maxInstructionSize + 2);
</span><span class="cx"> m_assembler.branch(JSR_OPCODE, target);
</span><span class="cx"> m_assembler.nop();
</span><ins>+ releaseScratch(target);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void breakpoint()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (159870 => 159871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-11-29 12:23:14 UTC (rev 159870)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-11-29 14:16:18 UTC (rev 159871)
</span><span class="lines">@@ -74,9 +74,8 @@
</span><span class="cx">
</span><span class="cx"> addPtr(TrustedImm32(16 - sizeof(void*)), stackPointerRegister);
</span><span class="cx">
</span><del>-#elif CPU(ARM)
- // Load caller frame's scope chain into this callframe so that whatever we call can
- // get to its global data.
</del><ins>+#elif CPU(ARM) || CPU(SH4)
+ // Load caller frame's scope chain into this callframe so that whatever we call can get to its global data.
</ins><span class="cx"> emitGetCallerFrameFromCallFrameHeaderPtr(regT2);
</span><span class="cx"> emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, regT1, regT2);
</span><span class="cx"> emitPutCellToCallFrameHeader(regT1, JSStack::ScopeChain);
</span><span class="lines">@@ -84,19 +83,18 @@
</span><span class="cx"> preserveReturnAddressAfterCall(regT3); // Callee preserved
</span><span class="cx"> emitPutReturnPCToCallFrameHeader(regT3);
</span><span class="cx">
</span><del>- // Calling convention: f(r0 == regT0, r1 == regT1, ...);
- // Host function signature: f(ExecState*);
- move(callFrameRegister, ARMRegisters::r0);
</del><ins>+ // Calling convention is f(argumentGPR0, argumentGPR1, ...).
+ // Host function signature is f(ExecState*).
+ move(callFrameRegister, argumentGPR0);
</ins><span class="cx">
</span><del>- emitGetFromCallFrameHeaderPtr(JSStack::Callee, ARMRegisters::r1);
</del><ins>+ emitGetFromCallFrameHeaderPtr(JSStack::Callee, argumentGPR1);
</ins><span class="cx"> move(regT2, callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack.
</span><del>- loadPtr(Address(ARMRegisters::r1, OBJECT_OFFSETOF(JSFunction, m_executable)), regT2);
</del><ins>+ loadPtr(Address(argumentGPR1, OBJECT_OFFSETOF(JSFunction, m_executable)), regT2);
</ins><span class="cx">
</span><span class="cx"> // call the function
</span><span class="cx"> nativeCall = call();
</span><span class="cx">
</span><span class="cx"> restoreReturnAddressBeforeReturn(regT3);
</span><del>-
</del><span class="cx"> #elif CPU(MIPS)
</span><span class="cx"> // Load caller frame's scope chain into this callframe so that whatever we call can
</span><span class="cx"> // get to its global data.
</span><span class="lines">@@ -129,28 +127,6 @@
</span><span class="cx"> addPtr(TrustedImm32(16), stackPointerRegister);
</span><span class="cx">
</span><span class="cx"> restoreReturnAddressBeforeReturn(regT3);
</span><del>-#elif CPU(SH4)
- // Load caller frame's scope chain into this callframe so that whatever we call can
- // get to its global data.
- emitGetCallerFrameFromCallFrameHeaderPtr(regT2);
- emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, regT1, regT2);
- emitPutCellToCallFrameHeader(regT1, JSStack::ScopeChain);
-
- preserveReturnAddressAfterCall(regT3); // Callee preserved
- emitPutReturnPCToCallFrameHeader(regT3);
-
- // Calling convention: f(r0 == regT4, r1 == regT5, ...);
- // Host function signature: f(ExecState*);
- move(callFrameRegister, regT4);
-
- emitGetFromCallFrameHeaderPtr(JSStack::Callee, regT5);
- move(regT2, callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack.
- loadPtr(Address(regT5, OBJECT_OFFSETOF(JSFunction, m_executable)), regT2);
-
- // call the function
- nativeCall = call();
-
- restoreReturnAddressBeforeReturn(regT3);
</del><span class="cx"> #else
</span><span class="cx"> #error "JIT not supported on this platform."
</span><span class="cx"> breakpoint();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (159870 => 159871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2013-11-29 12:23:14 UTC (rev 159870)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2013-11-29 14:16:18 UTC (rev 159871)
</span><span class="lines">@@ -343,9 +343,8 @@
</span><span class="cx">
</span><span class="cx"> jit.restoreReturnAddressBeforeReturn(JSInterfaceJIT::regT3);
</span><span class="cx">
</span><del>-#elif CPU(ARM)
- // Load caller frame's scope chain into this callframe so that whatever we call can
- // get to its global data.
</del><ins>+#elif CPU(ARM) || CPU(SH4)
+ // Load caller frame's scope chain into this callframe so that whatever we call can get to its global data.
</ins><span class="cx"> jit.emitGetCallerFrameFromCallFrameHeaderPtr(JSInterfaceJIT::regT2);
</span><span class="cx"> jit.emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, JSInterfaceJIT::regT1, JSInterfaceJIT::regT2);
</span><span class="cx"> jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
</span><span class="lines">@@ -353,38 +352,16 @@
</span><span class="cx"> jit.preserveReturnAddressAfterCall(JSInterfaceJIT::regT3); // Callee preserved
</span><span class="cx"> jit.emitPutReturnPCToCallFrameHeader(JSInterfaceJIT::regT3);
</span><span class="cx">
</span><del>- // Calling convention: f(r0 == regT0, r1 == regT1, ...);
- // Host function signature: f(ExecState*);
- jit.move(JSInterfaceJIT::callFrameRegister, ARMRegisters::r0);
</del><ins>+ // Calling convention is f(argumentGPR0, argumentGPR1, ...).
+ // Host function signature is f(ExecState*).
+ jit.move(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR0);
</ins><span class="cx">
</span><del>- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, ARMRegisters::r1);
</del><ins>+ jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::argumentGPR1);
</ins><span class="cx"> jit.move(JSInterfaceJIT::regT2, JSInterfaceJIT::callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack.
</span><del>- jit.loadPtr(JSInterfaceJIT::Address(ARMRegisters::r1, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
</del><ins>+ jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::argumentGPR1, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
</ins><span class="cx"> jit.call(JSInterfaceJIT::Address(JSInterfaceJIT::regT2, executableOffsetToFunction));
</span><span class="cx">
</span><span class="cx"> jit.restoreReturnAddressBeforeReturn(JSInterfaceJIT::regT3);
</span><del>-
-#elif CPU(SH4)
- // Load caller frame's scope chain into this callframe so that whatever we call can
- // get to its global data.
- jit.emitGetCallerFrameFromCallFrameHeaderPtr(JSInterfaceJIT::regT2);
- jit.emitGetFromCallFrameHeaderPtr(JSStack::ScopeChain, JSInterfaceJIT::regT1, JSInterfaceJIT::regT2);
- jit.emitPutCellToCallFrameHeader(JSInterfaceJIT::regT1, JSStack::ScopeChain);
-
- jit.preserveReturnAddressAfterCall(JSInterfaceJIT::regT3); // Callee preserved
- jit.emitPutReturnPCToCallFrameHeader(JSInterfaceJIT::regT3);
-
- // Calling convention: f(r0 == regT4, r1 == regT5, ...);
- // Host function signature: f(ExecState*);
- jit.move(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::regT4);
-
- jit.emitGetFromCallFrameHeaderPtr(JSStack::Callee, JSInterfaceJIT::regT5);
- jit.move(JSInterfaceJIT::regT2, JSInterfaceJIT::callFrameRegister); // Eagerly restore caller frame register to avoid loading from stack.
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::regT5, JSFunction::offsetOfExecutable()), JSInterfaceJIT::regT2);
-
- jit.call(JSInterfaceJIT::Address(JSInterfaceJIT::regT2, executableOffsetToFunction), JSInterfaceJIT::regT0);
- jit.restoreReturnAddressBeforeReturn(JSInterfaceJIT::regT3);
-
</del><span class="cx"> #elif CPU(MIPS)
</span><span class="cx"> // Load caller frame's scope chain into this callframe so that whatever we call can
</span><span class="cx"> // get to its global data.
</span></span></pre>
</div>
</div>
</body>
</html>