<!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>[184782] tags/Safari-601.1.32.2.81/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/184782">184782</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 11:54:51 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184581">r184581</a>. rdar://problem/20968297</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari601132281SourceJavaScriptCoreChangeLog">tags/Safari-601.1.32.2.81/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari601132281SourceJavaScriptCorellintLLIntOfflineAsmConfigh">tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h</a></li>
<li><a href="#tagsSafari601132281SourceJavaScriptCorellintLowLevelInterpreterasm">tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari601132281SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.32.2.81/Source/JavaScriptCore/ChangeLog (184781 => 184782)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.32.2.81/Source/JavaScriptCore/ChangeLog 2015-05-22 18:48:03 UTC (rev 184781)
+++ tags/Safari-601.1.32.2.81/Source/JavaScriptCore/ChangeLog 2015-05-22 18:54:51 UTC (rev 184782)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2015-05-22 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r184581.
+
+ 2015-05-19 Mark Lam <mark.lam@apple.com>
+
+ Fix the build of a universal binary with ARMv7k of JavaScriptCore.
+ https://bugs.webkit.org/show_bug.cgi?id=145143
+
+ Reviewed by Geoffrey Garen.
+
+ The offlineasm works in 3 phases:
+
+ Phase 1:
+ Parse the llint asm files for config options and desired offsets.
+ Let's say the offlineasm discovers C unique options and O unique offsets.
+ The offlineasm will then generate a LLIntDesiredOffsets.h file with
+ C x C build configurations, each with a set of O offsets.
+
+ Each of these build configurations is given a unique configuration index number.
+
+ Phase 2:
+ Compile the LLIntDesiredOffsets.h file into a JSCLLIntOffsetsExtractor binary.
+
+ If we're building a fat binary with 2 configurations: armv7, and armv7k,
+ then the fat binary will contain 2 blobs of offsets, one for each of these
+ build configurations.
+
+ Phase 3:
+ Parse the llint asm files and emit asm code using the offsets that are
+ extracted from the JSCLLIntOffsetsExtractor binary for the corresponding
+ configuration index number.
+
+ In the pre-existing code, there are no "if ARMv7k" statements in the llint asm
+ source. As a result, OFFLINE_ASM_ARMv7k is not one of the config options in
+ the set of C unique options.
+
+ For armv7k builds, OFFLINE_ASM_ARMv7 is also true. As a result, for an armv7k
+ target, we will end up building armv7 source. In general, this is fine except:
+
+ 1. armv7k has different alignment requirements from armv7. Hence, their offset
+ values (in JSCLLIntOffsetsExtractor) will be different.
+
+ 2. The offlineasm was never told that it needed to make a different configuration
+ for armv7k builds. Hence, the armv7k build of LLIntDesiredOffsets.h will
+ build the armv7 configuration, and consequently, the armv7k blob of offsets in
+ JSCLLIntOffsetsExtractor will have the same configuration index number as
+ the armv7 blob of offsets.
+
+ In phase 3, when the offlineasm parses the JSCLLIntOffsetsExtractor fat binary
+ looking for the armv7 build's configuration index number, it discovers the
+ armv7k blob which has the same configuration number. As a result, it
+ erroneously thinks the armv7k offsets are appropriate for emitting armv7 code.
+ Needless to say, armv7 code using armv7k offsets will lead to incorrect behavior
+ and all round badness.
+
+ The fix is to add a simple "if ARMv7k" statement to the llint asm files. While
+ the if statement has no body, it does make the offlineasm aware of the need for
+ ARMv7k as a configuration option. As a result, it will generate an armv7k
+ variant configuration in the LLIntDesiredOffsets.h file with its own unique
+ configuration index number. With that, the JSCLLIntOffsetsExtractor fat binary
+ will no longer have duplicate configuration index numbers for the armv7 and
+ armv7k blobs of offsets, and the issue is resolved.
+
+ * llint/LLIntOfflineAsmConfig.h:
+ * llint/LowLevelInterpreter.asm:
+
</ins><span class="cx"> 2015-05-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184652. rdar://problem/21002666
</span></span></pre></div>
<a id="tagsSafari601132281SourceJavaScriptCorellintLLIntOfflineAsmConfigh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h (184781 => 184782)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2015-05-22 18:48:03 UTC (rev 184781)
+++ tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2015-05-22 18:54:51 UTC (rev 184782)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #define OFFLINE_ASM_ARM64 0
</span><span class="cx"> #define OFFLINE_ASM_X86_64 0
</span><span class="cx"> #define OFFLINE_ASM_X86_64_WIN 0
</span><ins>+#define OFFLINE_ASM_ARMv7k 0
</ins><span class="cx"> #define OFFLINE_ASM_ARMv7s 0
</span><span class="cx"> #define OFFLINE_ASM_MIPS 0
</span><span class="cx"> #define OFFLINE_ASM_SH4 0
</span><span class="lines">@@ -60,6 +61,12 @@
</span><span class="cx"> #define OFFLINE_ASM_X86_WIN 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifdef __ARM_ARCH_7K__
+#define OFFLINE_ASM_ARMv7k 1
+#else
+#define OFFLINE_ASM_ARMv7k 0
+#endif
+
</ins><span class="cx"> #ifdef __ARM_ARCH_7S__
</span><span class="cx"> #define OFFLINE_ASM_ARMv7s 1
</span><span class="cx"> #else
</span></span></pre></div>
<a id="tagsSafari601132281SourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (184781 => 184782)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-05-22 18:48:03 UTC (rev 184781)
+++ tags/Safari-601.1.32.2.81/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-05-22 18:54:51 UTC (rev 184782)
</span><span class="lines">@@ -24,9 +24,11 @@
</span><span class="cx"> # First come the common protocols that both interpreters use. Note that each
</span><span class="cx"> # of these must have an ASSERT() in LLIntData.cpp
</span><span class="cx">
</span><del>-# Work-around for the fact that the toolchain's awareness of armv7s results in
-# a separate slab in the fat binary, yet the offlineasm doesn't know to expect
-# it.
</del><ins>+# Work-around for the fact that the toolchain's awareness of armv7k / armv7s
+# results in a separate slab in the fat binary, yet the offlineasm doesn't know
+# to expect it.
+if ARMv7k
+end
</ins><span class="cx"> if ARMv7s
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>