<!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>[189891] 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/189891">189891</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-16 18:16:09 -0700 (Wed, 16 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix 32-bit build issues in WebAssembly
https://bugs.webkit.org/show_bug.cgi?id=149240
Patch by Sukolsak Sakshuwong <sukolsak@gmail.com> on 2015-09-16
Reviewed by Geoffrey Garen.
Fix the syntax error and replace the instructions that are not available on
64-bit platforms.
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::startFunction):
(JSC::WASMFunctionCompiler::endFunction):
(JSC::WASMFunctionCompiler::buildReturn):
(JSC::WASMFunctionCompiler::callAndUnboxResult):
(JSC::WASMFunctionCompiler::loadValueAndConvertToDouble):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWASMFunctionCompilerh">trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189890 => 189891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-17 01:15:27 UTC (rev 189890)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-17 01:16:09 UTC (rev 189891)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-16 Sukolsak Sakshuwong <sukolsak@gmail.com>
+
+ Fix 32-bit build issues in WebAssembly
+ https://bugs.webkit.org/show_bug.cgi?id=149240
+
+ Reviewed by Geoffrey Garen.
+
+ Fix the syntax error and replace the instructions that are not available on
+ 64-bit platforms.
+
+ * wasm/WASMFunctionCompiler.h:
+ (JSC::WASMFunctionCompiler::startFunction):
+ (JSC::WASMFunctionCompiler::endFunction):
+ (JSC::WASMFunctionCompiler::buildReturn):
+ (JSC::WASMFunctionCompiler::callAndUnboxResult):
+ (JSC::WASMFunctionCompiler::loadValueAndConvertToDouble):
+
</ins><span class="cx"> 2015-09-16 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore should discard baseline code after some time
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWASMFunctionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h (189890 => 189891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-17 01:15:27 UTC (rev 189890)
+++ trunk/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h 2015-09-17 01:16:09 UTC (rev 189891)
</span><span class="lines">@@ -135,8 +135,15 @@
</span><span class="cx"> store32(TrustedImm32(0), localAddress(localIndex++));
</span><span class="cx"> for (uint32_t i = 0; i < numberOfF32LocalVariables; ++i)
</span><span class="cx"> store32(TrustedImm32(0), localAddress(localIndex++));
</span><del>- for (uint32_t i = 0; i < numberOfF64LocalVariables; ++i)
</del><ins>+ for (uint32_t i = 0; i < numberOfF64LocalVariables; ++i) {
+#if USE(JSVALUE64)
</ins><span class="cx"> store64(TrustedImm64(0), localAddress(localIndex++));
</span><ins>+#else
+ store32(TrustedImm32(0), localAddress(localIndex));
+ store32(TrustedImm32(0), localAddress(localIndex).withOffset(4));
+ localIndex++;
+#endif
+ }
</ins><span class="cx">
</span><span class="cx"> m_codeBlock->setNumParameters(1 + arguments.size());
</span><span class="cx"> }
</span><span class="lines">@@ -146,7 +153,12 @@
</span><span class="cx"> ASSERT(!m_tempStackTop);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove these if the last statement is a return statement.
</span><del>- move(TrustedImm64(JSValue::encode(jsUndefined())), GPRInfo::returnValueGPR);
</del><ins>+#if USE(JSVALUE64)
+ JSValueRegs returnValueRegs(GPRInfo::returnValueGPR);
+#else
+ JSValueRegs returnValueRegs(GPRInfo::returnValueGPR2, GPRInfo::returnValueGPR);
+#endif
+ moveTrustedValue(jsUndefined(), returnValueRegs);
</ins><span class="cx"> emitFunctionEpilogue();
</span><span class="cx"> ret();
</span><span class="cx">
</span><span class="lines">@@ -244,6 +256,11 @@
</span><span class="cx">
</span><span class="cx"> void buildReturn(int, WASMExpressionType returnType)
</span><span class="cx"> {
</span><ins>+#if USE(JSVALUE64)
+ JSValueRegs returnValueRegs(GPRInfo::returnValueGPR);
+#else
+ JSValueRegs returnValueRegs(GPRInfo::returnValueGPR2, GPRInfo::returnValueGPR);
+#endif
</ins><span class="cx"> switch (returnType) {
</span><span class="cx"> case WASMExpressionType::I32:
</span><span class="cx"> load32(temporaryAddress(m_tempStackTop - 1), GPRInfo::returnValueGPR);
</span><span class="lines">@@ -267,7 +284,7 @@
</span><span class="cx"> m_tempStackTop--;
</span><span class="cx"> break;
</span><span class="cx"> case WASMExpressionType::Void:
</span><del>- move(TrustedImm64(JSValue::encode(jsUndefined())), GPRInfo::returnValueGPR);
</del><ins>+ moveTrustedValue(jsUndefined(), returnValueRegs);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -839,6 +856,14 @@
</span><span class="cx"> appendCallSetResult(operation, dst);
</span><span class="cx"> }
</span><span class="cx"> #else
</span><ins>+ // EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned even-numbered register (r0, r2 or [sp]).
+ // To avoid assemblies from using wrong registers, let's occupy r1 or r3 with a dummy argument when necessary.
+#if (COMPILER_SUPPORTS(EABI) && CPU(ARM)) || CPU(MIPS)
+#define EABI_32BIT_DUMMY_ARG TrustedImm32(0),
+#else
+#define EABI_32BIT_DUMMY_ARG
+#endif
+
</ins><span class="cx"> void callOperation(Z_JITOperation_EJ operation, GPRReg srcTag, GPRReg srcPayload, GPRReg dst)
</span><span class="cx"> {
</span><span class="cx"> setupArgumentsWithExecState(EABI_32BIT_DUMMY_ARG srcPayload, srcTag);
</span><span class="lines">@@ -906,8 +931,8 @@
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> store64(GPRInfo::regT0, Address(stackPointerRegister, JSStack::Callee * static_cast<int>(sizeof(Register)) - sizeof(CallerFrameAndPC)));
</span><span class="cx"> #else
</span><del>- store32(regT0, Address(stackPointerRegister, JSStack::Callee * static_cast<int>(sizeof(Register)) + PayloadOffset - sizeof(CallerFrameAndPC)));
- store32(TrustedImm32(CellTag), Address(stackPointerRegister, JSStack::Callee * static_cast<int>(sizeof(Register)) + TagOffset - sizeof(CallerFrameAndPC)));
</del><ins>+ store32(GPRInfo::regT0, Address(stackPointerRegister, JSStack::Callee * static_cast<int>(sizeof(Register)) + PayloadOffset - sizeof(CallerFrameAndPC)));
+ store32(TrustedImm32(JSValue::CellTag), Address(stackPointerRegister, JSStack::Callee * static_cast<int>(sizeof(Register)) + TagOffset - sizeof(CallerFrameAndPC)));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> DataLabelPtr addressOfLinkedFunctionCheck;
</span><span class="lines">@@ -999,7 +1024,7 @@
</span><span class="cx"> end.append(jump());
</span><span class="cx">
</span><span class="cx"> checkJSNumber.link(this);
</span><del>- unboxDouble(tempRegs.tagGPR(), tempRegs.payloadGPR(), dst, fpScratch)
</del><ins>+ unboxDouble(tempRegs.tagGPR(), tempRegs.payloadGPR(), dst, fpScratch);
</ins><span class="cx"> end.link(this);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>