<!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>[166666] trunk/Source/WebCore</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/166666">166666</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-02 14:27:31 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor the function call generator to take the arguments by value
https://bugs.webkit.org/show_bug.cgi?id=131129
Reviewed by Andreas Kling.
Nothing forces the pointed address to stay alive between setOneArgument/setTwoArguments
and prepareAndCall.
This patch changes FunctionCall to:
-Keep the register by value instead of using pointers.
-Crash at compile time if a register is invalid.
* cssjit/FunctionCall.h:
(WebCore::FunctionCall::FunctionCall):
(WebCore::FunctionCall::setOneArgument):
(WebCore::FunctionCall::setTwoArguments):
(WebCore::FunctionCall::swapArguments):
(WebCore::FunctionCall::prepareAndCall):
* cssjit/RegisterAllocator.h:
(WebCore::RegisterAllocator::isValidRegister):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitFunctionCallh">trunk/Source/WebCore/cssjit/FunctionCall.h</a></li>
<li><a href="#trunkSourceWebCorecssjitRegisterAllocatorh">trunk/Source/WebCore/cssjit/RegisterAllocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166665 => 166666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-02 21:06:33 UTC (rev 166665)
+++ trunk/Source/WebCore/ChangeLog 2014-04-02 21:27:31 UTC (rev 166666)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-02 Benjamin Poulain <benjamin@webkit.org>
+
+ Refactor the function call generator to take the arguments by value
+ https://bugs.webkit.org/show_bug.cgi?id=131129
+
+ Reviewed by Andreas Kling.
+
+ Nothing forces the pointed address to stay alive between setOneArgument/setTwoArguments
+ and prepareAndCall.
+
+ This patch changes FunctionCall to:
+ -Keep the register by value instead of using pointers.
+ -Crash at compile time if a register is invalid.
+
+ * cssjit/FunctionCall.h:
+ (WebCore::FunctionCall::FunctionCall):
+ (WebCore::FunctionCall::setOneArgument):
+ (WebCore::FunctionCall::setTwoArguments):
+ (WebCore::FunctionCall::swapArguments):
+ (WebCore::FunctionCall::prepareAndCall):
+ * cssjit/RegisterAllocator.h:
+ (WebCore::RegisterAllocator::isValidRegister):
+
</ins><span class="cx"> 2014-04-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Settings::maximumDecodedImageSize()
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitFunctionCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/FunctionCall.h (166665 => 166666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/FunctionCall.h 2014-04-02 21:06:33 UTC (rev 166665)
+++ trunk/Source/WebCore/cssjit/FunctionCall.h 2014-04-02 21:27:31 UTC (rev 166666)
</span><span class="lines">@@ -42,8 +42,9 @@
</span><span class="cx"> , m_registerAllocator(registerAllocator)
</span><span class="cx"> , m_stackAllocator(stackAllocator)
</span><span class="cx"> , m_callRegistry(callRegistry)
</span><del>- , m_firstArgument(nullptr)
- , m_secondArgument(nullptr)
</del><ins>+ , m_argumentCount(0)
+ , m_firstArgument(InvalidGPRReg)
+ , m_secondArgument(InvalidGPRReg)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -54,13 +55,15 @@
</span><span class="cx">
</span><span class="cx"> void setOneArgument(const JSC::MacroAssembler::RegisterID& registerID)
</span><span class="cx"> {
</span><del>- m_firstArgument = &registerID;
</del><ins>+ m_argumentCount = 1;
+ m_firstArgument = registerID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setTwoArguments(const JSC::MacroAssembler::RegisterID& firstRegisterID, const JSC::MacroAssembler::RegisterID& secondRegisterID)
</span><span class="cx"> {
</span><del>- m_firstArgument = &firstRegisterID;
- m_secondArgument = &secondRegisterID;
</del><ins>+ m_argumentCount = 2;
+ m_firstArgument = firstRegisterID;
+ m_secondArgument = secondRegisterID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void call()
</span><span class="lines">@@ -80,8 +83,8 @@
</span><span class="cx"> private:
</span><span class="cx"> void swapArguments()
</span><span class="cx"> {
</span><del>- JSC::MacroAssembler::RegisterID a = *m_firstArgument;
- JSC::MacroAssembler::RegisterID b = *m_secondArgument;
</del><ins>+ JSC::MacroAssembler::RegisterID a = m_firstArgument;
+ JSC::MacroAssembler::RegisterID b = m_secondArgument;
</ins><span class="cx"> // x86 can swap without a temporary register. On other architectures, we need allocate a temporary register to switch the values.
</span><span class="cx"> #if CPU(X86) || CPU(X86_64)
</span><span class="cx"> m_assembler.swap(a, b);
</span><span class="lines">@@ -117,31 +120,37 @@
</span><span class="cx"> saveAllocatedRegisters();
</span><span class="cx"> m_stackAllocator.alignStackPreFunctionCall();
</span><span class="cx">
</span><del>- if (m_secondArgument) {
- if (*m_firstArgument != JSC::GPRInfo::argumentGPR0) {
</del><ins>+ if (m_argumentCount == 2) {
+ RELEASE_ASSERT(RegisterAllocator::isValidRegister(m_firstArgument));
+ RELEASE_ASSERT(RegisterAllocator::isValidRegister(m_secondArgument));
+
+ if (m_firstArgument != JSC::GPRInfo::argumentGPR0) {
</ins><span class="cx"> // If firstArgument is not in argumentGPR0, we need to handle potential conflicts:
</span><span class="cx"> // -if secondArgument and firstArgument are in inversted registers, just swap the values.
</span><span class="cx"> // -if secondArgument is in argumentGPR0 but firstArgument is not taking argumentGPR1, we can move in order secondArgument->argumentGPR1, firstArgument->argumentGPR0
</span><span class="cx"> // -if secondArgument does not take argumentGPR0, firstArgument and secondArgument can be moved safely to destination.
</span><del>- if (*m_secondArgument == JSC::GPRInfo::argumentGPR0) {
- if (*m_firstArgument == JSC::GPRInfo::argumentGPR1)
</del><ins>+ if (m_secondArgument == JSC::GPRInfo::argumentGPR0) {
+ if (m_firstArgument == JSC::GPRInfo::argumentGPR1)
</ins><span class="cx"> swapArguments();
</span><span class="cx"> else {
</span><span class="cx"> m_assembler.move(JSC::GPRInfo::argumentGPR0, JSC::GPRInfo::argumentGPR1);
</span><del>- m_assembler.move(*m_firstArgument, JSC::GPRInfo::argumentGPR0);
</del><ins>+ m_assembler.move(m_firstArgument, JSC::GPRInfo::argumentGPR0);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- m_assembler.move(*m_firstArgument, JSC::GPRInfo::argumentGPR0);
- if (*m_secondArgument != JSC::GPRInfo::argumentGPR1)
- m_assembler.move(*m_secondArgument, JSC::GPRInfo::argumentGPR1);
</del><ins>+ m_assembler.move(m_firstArgument, JSC::GPRInfo::argumentGPR0);
+ if (m_secondArgument != JSC::GPRInfo::argumentGPR1)
+ m_assembler.move(m_secondArgument, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // We know firstArgument is already in place, we can safely move secondArgument.
</span><del>- if (*m_secondArgument != JSC::GPRInfo::argumentGPR1)
- m_assembler.move(*m_secondArgument, JSC::GPRInfo::argumentGPR1);
</del><ins>+ if (m_secondArgument != JSC::GPRInfo::argumentGPR1)
+ m_assembler.move(m_secondArgument, JSC::GPRInfo::argumentGPR1);
</ins><span class="cx"> }
</span><del>- } else if (m_firstArgument && *m_firstArgument != JSC::GPRInfo::argumentGPR0)
- m_assembler.move(*m_firstArgument, JSC::GPRInfo::argumentGPR0);
</del><ins>+ } else if (m_argumentCount == 1) {
+ RELEASE_ASSERT(RegisterAllocator::isValidRegister(m_firstArgument));
+ if (m_firstArgument != JSC::GPRInfo::argumentGPR0)
+ m_assembler.move(m_firstArgument, JSC::GPRInfo::argumentGPR0);
+ }
</ins><span class="cx">
</span><span class="cx"> JSC::MacroAssembler::Call call = m_assembler.call();
</span><span class="cx"> m_callRegistry.append(std::make_pair(call, m_functionAddress));
</span><span class="lines">@@ -181,8 +190,9 @@
</span><span class="cx"> Vector<StackAllocator::StackReference> m_savedRegisterStackReferences;
</span><span class="cx">
</span><span class="cx"> JSC::FunctionPtr m_functionAddress;
</span><del>- const JSC::MacroAssembler::RegisterID* m_firstArgument;
- const JSC::MacroAssembler::RegisterID* m_secondArgument;
</del><ins>+ unsigned m_argumentCount;
+ JSC::MacroAssembler::RegisterID m_firstArgument;
+ JSC::MacroAssembler::RegisterID m_secondArgument;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitRegisterAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (166665 => 166666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-04-02 21:06:33 UTC (rev 166665)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-04-02 21:27:31 UTC (rev 166666)
</span><span class="lines">@@ -113,6 +113,15 @@
</span><span class="cx">
</span><span class="cx"> const Vector<JSC::MacroAssembler::RegisterID, registerCount>& allocatedRegisters() const { return m_allocatedRegisters; }
</span><span class="cx">
</span><ins>+ static bool isValidRegister(JSC::MacroAssembler::RegisterID registerID)
+ {
+#if CPU(X86_64)
+ return registerID >= JSC::X86Registers::eax && registerID <= JSC::X86Registers::r15;
+#else
+#error RegisterAllocator does not define the valid register range for the current architecture.
+#endif
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> HashSet<unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> m_registers;
</span><span class="cx"> Vector<JSC::MacroAssembler::RegisterID, registerCount> m_allocatedRegisters;
</span></span></pre>
</div>
</div>
</body>
</html>