<!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>[164333] 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/164333">164333</a></dd>

<dt>Author</dt> <dd>fpizlo@apple.com</dd>

<dt>Date</dt> <dd>2014-02-18 17:07:29 -0800 (Tue, 18 Feb 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>FTL should build on ARM64

https://bugs.webkit.org/show_bug.cgi?id=129010

Reviewed by Sam Weinig.

* disassembler/X86Disassembler.cpp: Just because we have the LLVM disassembler doesn't mean we're on X86.

* ftl/FTLLocation.cpp: DWARF parsing for ARM64 is super easy.

(JSC::FTL::Location::isGPR):

(JSC::FTL::Location::gpr):

(JSC::FTL::Location::isFPR):

(JSC::FTL::Location::fpr):

(JSC::FTL::Location::restoreInto): This function wasn't even X86-specific to begin with so move it out of the #if stuff.

* ftl/FTLUnwindInfo.cpp: They're called q not d.

(JSC::FTL::UnwindInfo::parse):

* jit/GPRInfo.h:

(JSC::GPRInfo::toArgumentRegister): Add this method; we alraedy had it on X86.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoredisassemblerX86Disassemblercpp">trunk/Source/JavaScriptCore/disassembler/X86Disassembler.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreftlFTLLocationcpp">trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreftlFTLUnwindInfocpp">trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorejitGPRInfoh">trunk/Source/JavaScriptCore/jit/GPRInfo.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164332 => 164333)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-02-19 00:45:07 UTC (rev 164332)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-02-19 01:07:29 UTC (rev 164333)

</span><span class="lines">@@ -1,5 +1,24 @@

</span><span class="cx"> 2014-02-18  Filip Pizlo  &lt;fpizlo@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        FTL should build on ARM64

+        https://bugs.webkit.org/show_bug.cgi?id=129010

+

+        Reviewed by Sam Weinig.

+        

+        * disassembler/X86Disassembler.cpp: Just because we have the LLVM disassembler doesn't mean we're on X86.

+        * ftl/FTLLocation.cpp: DWARF parsing for ARM64 is super easy.

+        (JSC::FTL::Location::isGPR):

+        (JSC::FTL::Location::gpr):

+        (JSC::FTL::Location::isFPR):

+        (JSC::FTL::Location::fpr):

+        (JSC::FTL::Location::restoreInto): This function wasn't even X86-specific to begin with so move it out of the #if stuff.

+        * ftl/FTLUnwindInfo.cpp: They're called q not d.

+        (JSC::FTL::UnwindInfo::parse):

+        * jit/GPRInfo.h:

+        (JSC::GPRInfo::toArgumentRegister): Add this method; we alraedy had it on X86.

+

+2014-02-18  Filip Pizlo  &lt;fpizlo@apple.com&gt;

+

</ins><span class="cx">         FTL unwind parsing should handle ARM64

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=128984

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoredisassemblerX86Disassemblercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/disassembler/X86Disassembler.cpp (164332 => 164333)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/disassembler/X86Disassembler.cpp        2014-02-19 00:45:07 UTC (rev 164332)

+++ trunk/Source/JavaScriptCore/disassembler/X86Disassembler.cpp        2014-02-19 01:07:29 UTC (rev 164333)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.

</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -27,7 +27,7 @@

</span><span class="cx"> #include &quot;Disassembler.h&quot;

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(DISASSEMBLER)

</span><del>-#if USE(UDIS86) || USE(LLVM_DISASSEMBLER)

</del><ins>+#if USE(UDIS86) || (USE(LLVM_DISASSEMBLER) &amp;&amp; (CPU(X86_64) || CPU(X86)))

</ins><span class="cx"> 

</span><span class="cx"> #include &quot;MacroAssemblerCodeRef.h&quot;

</span><span class="cx"> #include &quot;Options.h&quot;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreftlFTLLocationcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp (164332 => 164333)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp        2014-02-19 00:45:07 UTC (rev 164332)

+++ trunk/Source/JavaScriptCore/ftl/FTLLocation.cpp        2014-02-19 01:07:29 UTC (rev 164333)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -128,7 +128,33 @@

</span><span class="cx">     RELEASE_ASSERT(isFPR());

</span><span class="cx">     return static_cast&lt;FPRReg&gt;(dwarfRegNum() - 17);

</span><span class="cx"> }

</span><ins>+#elif CPU(ARM64)

+// This decodes Dwarf flavour 0 for ARM64.

+bool Location::isGPR() const

+{

+    return kind() == Register &amp;&amp; dwarfRegNum() &gt;= 0 &amp;&amp; dwarfRegNum() &lt;= 31;

+}

</ins><span class="cx"> 

</span><ins>+GPRReg Location::gpr() const

+{

+    RELEASE_ASSERT(involvesGPR());

+    return static_cast&lt;GPRReg&gt;(dwarfRegNum());

+}

+

+bool Location::isFPR() const

+{

+    return kind() == Register &amp;&amp; dwarfRegNum() &gt;= 64 &amp;&amp; dwarfRegNum() &lt;= 95;

+}

+

+FPRReg Location::fpr() const

+{

+    RELEASE_ASSERT(isFPR());

+    return static_cast&lt;FPRReg&gt;(dwarfRegNum() - 64);

+}

+#else // CPU cases for Location methods

+#error &quot;CPU architecture not supported.&quot;

+#endif // CPU cases for Location methods

+

</ins><span class="cx"> void Location::restoreInto(MacroAssembler&amp; jit, char* savedRegisters, GPRReg result, unsigned numFramesToPop) const

</span><span class="cx"> {

</span><span class="cx">     if (involvesGPR() &amp;&amp; MacroAssembler::isStackRelated(gpr())) {

</span><span class="lines">@@ -194,9 +220,6 @@

</span><span class="cx">     

</span><span class="cx">     RELEASE_ASSERT_NOT_REACHED();

</span><span class="cx"> }

</span><del>-#else // CPU cases for Location methods

-#error &quot;CPU architecture not supported.&quot;

-#endif // CPU cases for Location methods

</del><span class="cx"> 

</span><span class="cx"> GPRReg Location::directGPR() const

</span><span class="cx"> {

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreftlFTLUnwindInfocpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp (164332 => 164333)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp        2014-02-19 00:45:07 UTC (rev 164332)

+++ trunk/Source/JavaScriptCore/ftl/FTLUnwindInfo.cpp        2014-02-19 01:07:29 UTC (rev 164333)

</span><span class="lines">@@ -136,20 +136,20 @@

</span><span class="cx">         m_registers.append(RegisterAtOffset(ARM64Registers::x28, offset -= 8));

</span><span class="cx">     }

</span><span class="cx">     if (encoding &amp; UNWIND_ARM64_FRAME_D8_D9_PAIR) {

</span><del>-        m_registers.append(RegisterAtOffset(ARM64Registers::d8, offset -= 8));

-        m_registers.append(RegisterAtOffset(ARM64Registers::d9, offset -= 8));

</del><ins>+        m_registers.append(RegisterAtOffset(ARM64Registers::q8, offset -= 8));

+        m_registers.append(RegisterAtOffset(ARM64Registers::q9, offset -= 8));

</ins><span class="cx">     }

</span><span class="cx">     if (encoding &amp; UNWIND_ARM64_FRAME_D10_D11_PAIR) {

</span><del>-        m_registers.append(RegisterAtOffset(ARM64Registers::d10, offset -= 8));

-        m_registers.append(RegisterAtOffset(ARM64Registers::d11, offset -= 8));

</del><ins>+        m_registers.append(RegisterAtOffset(ARM64Registers::q10, offset -= 8));

+        m_registers.append(RegisterAtOffset(ARM64Registers::q11, offset -= 8));

</ins><span class="cx">     }

</span><span class="cx">     if (encoding &amp; UNWIND_ARM64_FRAME_D12_D13_PAIR) {

</span><del>-        m_registers.append(RegisterAtOffset(ARM64Registers::d12, offset -= 8));

-        m_registers.append(RegisterAtOffset(ARM64Registers::d13, offset -= 8));

</del><ins>+        m_registers.append(RegisterAtOffset(ARM64Registers::q12, offset -= 8));

+        m_registers.append(RegisterAtOffset(ARM64Registers::q13, offset -= 8));

</ins><span class="cx">     }

</span><span class="cx">     if (encoding &amp; UNWIND_ARM64_FRAME_D14_D15_PAIR) {

</span><del>-        m_registers.append(RegisterAtOffset(ARM64Registers::d14, offset -= 8));

-        m_registers.append(RegisterAtOffset(ARM64Registers::d15, offset -= 8));

</del><ins>+        m_registers.append(RegisterAtOffset(ARM64Registers::q14, offset -= 8));

+        m_registers.append(RegisterAtOffset(ARM64Registers::q15, offset -= 8));

</ins><span class="cx">     }

</span><span class="cx"> #else

</span><span class="cx"> #error &quot;Unrecognized architecture&quot;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCorejitGPRInfoh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/GPRInfo.h (164332 => 164333)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/jit/GPRInfo.h        2014-02-19 00:45:07 UTC (rev 164332)

+++ trunk/Source/JavaScriptCore/jit/GPRInfo.h        2014-02-19 01:07:29 UTC (rev 164333)

</span><span class="lines">@@ -533,6 +533,7 @@

</span><span class="cx"> public:

</span><span class="cx">     typedef GPRReg RegisterType;

</span><span class="cx">     static const unsigned numberOfRegisters = 16;

</span><ins>+    static const unsigned numberOfArgumentRegisters = 8;

</ins><span class="cx"> 

</span><span class="cx">     // Note: regT3 is required to be callee-preserved.

</span><span class="cx"> 

</span><span class="lines">@@ -603,6 +604,12 @@

</span><span class="cx">         return (unsigned)reg;

</span><span class="cx">     }

</span><span class="cx"> 

</span><ins>+    static GPRReg toArgumentRegister(unsigned index)

+    {

+        ASSERT(index &lt; numberOfArgumentRegisters);

+        return toRegister(index);

+    }

+

</ins><span class="cx">     static const char* debugName(GPRReg reg)

</span><span class="cx">     {

</span><span class="cx">         ASSERT(static_cast&lt;unsigned&gt;(reg) != InvalidGPRReg);

</span></span></pre>

</div>

</div>

</body>

</html>