<!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>[182098] 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/182098">182098</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-03-27 19:55:12 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>load8Signed() and load16Signed() should be renamed to avoid confusion
https://bugs.webkit.org/show_bug.cgi?id=143168
Reviewed by Benjamin Poulain.
Renamed load8Signed() to load8SignedExtendTo32() and load16Signed() to load16SignedExtendTo32().
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::load8SignedExtendTo32):
(JSC::MacroAssemblerARM::load16SignedExtendTo32):
(JSC::MacroAssemblerARM::load8Signed): Deleted.
(JSC::MacroAssemblerARM::load16Signed): Deleted.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::load16SignedExtendTo32):
(JSC::MacroAssemblerARM64::load8SignedExtendTo32):
(JSC::MacroAssemblerARM64::load16Signed): Deleted.
(JSC::MacroAssemblerARM64::load8Signed): Deleted.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::load16SignedExtendTo32):
(JSC::MacroAssemblerARMv7::load8SignedExtendTo32):
(JSC::MacroAssemblerARMv7::load16Signed): Deleted.
(JSC::MacroAssemblerARMv7::load8Signed): Deleted.
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::load8SignedExtendTo32):
(JSC::MacroAssemblerMIPS::load16SignedExtendTo32):
(JSC::MacroAssemblerMIPS::load8Signed): Deleted.
(JSC::MacroAssemblerMIPS::load16Signed): Deleted.
* assembler/MacroAssemblerSH4.h:
(JSC::MacroAssemblerSH4::load8SignedExtendTo32):
(JSC::MacroAssemblerSH4::load8):
(JSC::MacroAssemblerSH4::load16SignedExtendTo32):
(JSC::MacroAssemblerSH4::load16):
(JSC::MacroAssemblerSH4::load8Signed): Deleted.
(JSC::MacroAssemblerSH4::load16Signed): Deleted.
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::load8SignedExtendTo32):
(JSC::MacroAssemblerX86Common::load16SignedExtendTo32):
(JSC::MacroAssemblerX86Common::load8Signed): Deleted.
(JSC::MacroAssemblerX86Common::load16Signed): Deleted.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileGetByValOnIntTypedArray):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitIntTypedArrayGetByVal):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2015-03-27 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ load8Signed() and load16Signed() should be renamed to avoid confusion
+ https://bugs.webkit.org/show_bug.cgi?id=143168
+
+ Reviewed by Benjamin Poulain.
+
+ Renamed load8Signed() to load8SignedExtendTo32() and load16Signed() to load16SignedExtendTo32().
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::load8SignedExtendTo32):
+ (JSC::MacroAssemblerARM::load16SignedExtendTo32):
+ (JSC::MacroAssemblerARM::load8Signed): Deleted.
+ (JSC::MacroAssemblerARM::load16Signed): Deleted.
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::load16SignedExtendTo32):
+ (JSC::MacroAssemblerARM64::load8SignedExtendTo32):
+ (JSC::MacroAssemblerARM64::load16Signed): Deleted.
+ (JSC::MacroAssemblerARM64::load8Signed): Deleted.
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::load16SignedExtendTo32):
+ (JSC::MacroAssemblerARMv7::load8SignedExtendTo32):
+ (JSC::MacroAssemblerARMv7::load16Signed): Deleted.
+ (JSC::MacroAssemblerARMv7::load8Signed): Deleted.
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::load8SignedExtendTo32):
+ (JSC::MacroAssemblerMIPS::load16SignedExtendTo32):
+ (JSC::MacroAssemblerMIPS::load8Signed): Deleted.
+ (JSC::MacroAssemblerMIPS::load16Signed): Deleted.
+ * assembler/MacroAssemblerSH4.h:
+ (JSC::MacroAssemblerSH4::load8SignedExtendTo32):
+ (JSC::MacroAssemblerSH4::load8):
+ (JSC::MacroAssemblerSH4::load16SignedExtendTo32):
+ (JSC::MacroAssemblerSH4::load16):
+ (JSC::MacroAssemblerSH4::load8Signed): Deleted.
+ (JSC::MacroAssemblerSH4::load16Signed): Deleted.
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::load8SignedExtendTo32):
+ (JSC::MacroAssemblerX86Common::load16SignedExtendTo32):
+ (JSC::MacroAssemblerX86Common::load8Signed): Deleted.
+ (JSC::MacroAssemblerX86Common::load16Signed): Deleted.
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileGetByValOnIntTypedArray):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitIntTypedArrayGetByVal):
+
+2015-03-27 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> Fix flakey dfg-int8array.js and dfg-int16array.js tests for ARM64
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138390
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> m_assembler.dataTransfer32(ARMAssembler::LoadUint8, dest, ARMRegisters::S0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.baseIndexTransfer16(ARMAssembler::LoadInt8, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> m_assembler.baseIndexTransfer16(ARMAssembler::LoadUint16, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.baseIndexTransfer16(ARMAssembler::LoadInt16, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx"> load16(address, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> if (!address.offset && (!address.scale || address.scale == 1)) {
</span><span class="cx"> m_assembler.ldrsh<32>(dest, address.base, address.index, ARM64Assembler::UXTX, address.scale);
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx"> m_cachedMemoryTempRegister.invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> if (!address.offset && !address.scale) {
</span><span class="cx"> m_assembler.ldrsb<32>(dest, address.base, address.index, ARM64Assembler::UXTX, address.scale);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(ArmAddress address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(ArmAddress address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(address.type == ArmAddress::HasIndex);
</span><span class="cx"> m_assembler.ldrsh(dest, address.base, address.u.index, address.u.scale);
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(ArmAddress address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(ArmAddress address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(address.type == ArmAddress::HasIndex);
</span><span class="cx"> m_assembler.ldrsb(dest, address.base, address.u.index, address.u.scale);
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> load8(setupArmAddress(address), dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(ImplicitAddress, RegisterID)
</del><ins>+ void load8SignedExtendTo32(ImplicitAddress, RegisterID)
</ins><span class="cx"> {
</span><span class="cx"> UNREACHABLE_FOR_PLATFORM();
</span><span class="cx"> }
</span><span class="lines">@@ -678,9 +678,9 @@
</span><span class="cx"> load8(setupArmAddress(address), dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><del>- load8Signed(setupArmAddress(address), dest);
</del><ins>+ load8SignedExtendTo32(setupArmAddress(address), dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void load8(const void* address, RegisterID dest)
</span><span class="lines">@@ -714,9 +714,9 @@
</span><span class="cx"> m_assembler.ldrh(dest, makeBaseIndexBase(address), address.index, address.scale);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><del>- load16Signed(setupArmAddress(address), dest);
</del><ins>+ load16SignedExtendTo32(setupArmAddress(address), dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void load16(ImplicitAddress address, RegisterID dest)
</span><span class="lines">@@ -730,7 +730,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(ImplicitAddress, RegisterID)
</del><ins>+ void load16SignedExtendTo32(ImplicitAddress, RegisterID)
</ins><span class="cx"> {
</span><span class="cx"> UNREACHABLE_FOR_PLATFORM();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> m_assembler.lbu(dest, addrTempRegister, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> if (address.offset >= -32768 && address.offset <= 32767
</span><span class="cx"> && !m_fixedWidth) {
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> if (address.offset >= -32768 && address.offset <= 32767
</span><span class="cx"> && !m_fixedWidth) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -718,13 +718,13 @@
</span><span class="cx"> m_assembler.extub(dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> RegisterID scr = claimScratch();
</span><span class="cx"> move(address.index, scr);
</span><span class="cx"> lshift32(TrustedImm32(address.scale), scr);
</span><span class="cx"> add32(address.base, scr);
</span><del>- load8Signed(scr, address.offset, dest);
</del><ins>+ load8SignedExtendTo32(scr, address.offset, dest);
</ins><span class="cx"> releaseScratch(scr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -770,7 +770,7 @@
</span><span class="cx"> releaseScratch(scr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(RegisterID base, int offset, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(RegisterID base, int offset, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> if (!offset) {
</span><span class="cx"> m_assembler.movbMemReg(base, dest);
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx">
</span><span class="cx"> void load8(RegisterID base, int offset, RegisterID dest)
</span><span class="cx"> {
</span><del>- load8Signed(base, offset, dest);
</del><ins>+ load8SignedExtendTo32(base, offset, dest);
</ins><span class="cx"> m_assembler.extub(dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,14 +858,14 @@
</span><span class="cx"> m_assembler.extuw(dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(RegisterID src, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(RegisterID src, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.movwMemReg(src, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void load16(BaseIndex address, RegisterID dest)
</span><span class="cx"> {
</span><del>- load16Signed(address, dest);
</del><ins>+ load16SignedExtendTo32(address, dest);
</ins><span class="cx"> m_assembler.extuw(dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> m_assembler.extuw(dest, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> RegisterID scr = claimScratch();
</span><span class="cx">
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> m_assembler.movwR0mr(scr, dest);
</span><span class="cx"> else {
</span><span class="cx"> add32(address.base, scr);
</span><del>- load16Signed(scr, dest);
</del><ins>+ load16SignedExtendTo32(scr, dest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> releaseScratch(scr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -525,12 +525,12 @@
</span><span class="cx"> m_assembler.movzbl_mr(address.offset, address.base, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.movsbl_mr(address.offset, address.base, address.index, address.scale, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load8Signed(ImplicitAddress address, RegisterID dest)
</del><ins>+ void load8SignedExtendTo32(ImplicitAddress address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.movsbl_mr(address.offset, address.base, dest);
</span><span class="cx"> }
</span><span class="lines">@@ -545,12 +545,12 @@
</span><span class="cx"> m_assembler.movzwl_mr(address.offset, address.base, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(BaseIndex address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.movswl_mr(address.offset, address.base, address.index, address.scale, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void load16Signed(Address address, RegisterID dest)
</del><ins>+ void load16SignedExtendTo32(Address address, RegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> m_assembler.movswl_mr(address.offset, address.base, dest);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -2310,13 +2310,13 @@
</span><span class="cx"> switch (elementSize(type)) {
</span><span class="cx"> case 1:
</span><span class="cx"> if (isSigned(type))
</span><del>- m_jit.load8Signed(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
</del><ins>+ m_jit.load8SignedExtendTo32(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
</ins><span class="cx"> else
</span><span class="cx"> m_jit.load8(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="cx"> if (isSigned(type))
</span><del>- m_jit.load16Signed(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
</del><ins>+ m_jit.load16SignedExtendTo32(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
</ins><span class="cx"> else
</span><span class="cx"> m_jit.load16(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (182097 => 182098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-03-28 02:55:12 UTC (rev 182098)
</span><span class="lines">@@ -1177,13 +1177,13 @@
</span><span class="cx"> switch (elementSize(type)) {
</span><span class="cx"> case 1:
</span><span class="cx"> if (isSigned(type))
</span><del>- load8Signed(BaseIndex(base, property, TimesOne), resultPayload);
</del><ins>+ load8SignedExtendTo32(BaseIndex(base, property, TimesOne), resultPayload);
</ins><span class="cx"> else
</span><span class="cx"> load8(BaseIndex(base, property, TimesOne), resultPayload);
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="cx"> if (isSigned(type))
</span><del>- load16Signed(BaseIndex(base, property, TimesTwo), resultPayload);
</del><ins>+ load16SignedExtendTo32(BaseIndex(base, property, TimesTwo), resultPayload);
</ins><span class="cx"> else
</span><span class="cx"> load16(BaseIndex(base, property, TimesTwo), resultPayload);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>