Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (182097 => 182098)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-28 02:55:12 UTC (rev 182098)
@@ -1,5 +1,51 @@
2015-03-27 Michael Saboff <msab...@apple.com>
+ 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 <msab...@apple.com>
+
Fix flakey dfg-int8array.js and dfg-int16array.js tests for ARM64
https://bugs.webkit.org/show_bug.cgi?id=138390
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -370,7 +370,7 @@
m_assembler.dataTransfer32(ARMAssembler::LoadUint8, dest, ARMRegisters::S0, 0);
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
m_assembler.baseIndexTransfer16(ARMAssembler::LoadInt8, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
}
@@ -385,7 +385,7 @@
m_assembler.baseIndexTransfer16(ARMAssembler::LoadUint16, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
m_assembler.baseIndexTransfer16(ARMAssembler::LoadInt16, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
}
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -918,7 +918,7 @@
load16(address, dest);
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
if (!address.offset && (!address.scale || address.scale == 1)) {
m_assembler.ldrsh<32>(dest, address.base, address.index, ARM64Assembler::UXTX, address.scale);
@@ -959,7 +959,7 @@
m_cachedMemoryTempRegister.invalidate();
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
if (!address.offset && !address.scale) {
m_assembler.ldrsb<32>(dest, address.base, address.index, ARM64Assembler::UXTX, address.scale);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -546,7 +546,7 @@
}
}
- void load16Signed(ArmAddress address, RegisterID dest)
+ void load16SignedExtendTo32(ArmAddress address, RegisterID dest)
{
ASSERT(address.type == ArmAddress::HasIndex);
m_assembler.ldrsh(dest, address.base, address.u.index, address.u.scale);
@@ -566,7 +566,7 @@
}
}
- void load8Signed(ArmAddress address, RegisterID dest)
+ void load8SignedExtendTo32(ArmAddress address, RegisterID dest)
{
ASSERT(address.type == ArmAddress::HasIndex);
m_assembler.ldrsb(dest, address.base, address.u.index, address.u.scale);
@@ -668,7 +668,7 @@
load8(setupArmAddress(address), dest);
}
- void load8Signed(ImplicitAddress, RegisterID)
+ void load8SignedExtendTo32(ImplicitAddress, RegisterID)
{
UNREACHABLE_FOR_PLATFORM();
}
@@ -678,9 +678,9 @@
load8(setupArmAddress(address), dest);
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
- load8Signed(setupArmAddress(address), dest);
+ load8SignedExtendTo32(setupArmAddress(address), dest);
}
void load8(const void* address, RegisterID dest)
@@ -714,9 +714,9 @@
m_assembler.ldrh(dest, makeBaseIndexBase(address), address.index, address.scale);
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
- load16Signed(setupArmAddress(address), dest);
+ load16SignedExtendTo32(setupArmAddress(address), dest);
}
void load16(ImplicitAddress address, RegisterID dest)
@@ -730,7 +730,7 @@
}
}
- void load16Signed(ImplicitAddress, RegisterID)
+ void load16SignedExtendTo32(ImplicitAddress, RegisterID)
{
UNREACHABLE_FOR_PLATFORM();
}
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -707,7 +707,7 @@
m_assembler.lbu(dest, addrTempRegister, 0);
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
if (address.offset >= -32768 && address.offset <= 32767
&& !m_fixedWidth) {
@@ -919,7 +919,7 @@
}
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
if (address.offset >= -32768 && address.offset <= 32767
&& !m_fixedWidth) {
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerSH4.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerSH4.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerSH4.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -718,13 +718,13 @@
m_assembler.extub(dest, dest);
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
RegisterID scr = claimScratch();
move(address.index, scr);
lshift32(TrustedImm32(address.scale), scr);
add32(address.base, scr);
- load8Signed(scr, address.offset, dest);
+ load8SignedExtendTo32(scr, address.offset, dest);
releaseScratch(scr);
}
@@ -770,7 +770,7 @@
releaseScratch(scr);
}
- void load8Signed(RegisterID base, int offset, RegisterID dest)
+ void load8SignedExtendTo32(RegisterID base, int offset, RegisterID dest)
{
if (!offset) {
m_assembler.movbMemReg(base, dest);
@@ -798,7 +798,7 @@
void load8(RegisterID base, int offset, RegisterID dest)
{
- load8Signed(base, offset, dest);
+ load8SignedExtendTo32(base, offset, dest);
m_assembler.extub(dest, dest);
}
@@ -858,14 +858,14 @@
m_assembler.extuw(dest, dest);
}
- void load16Signed(RegisterID src, RegisterID dest)
+ void load16SignedExtendTo32(RegisterID src, RegisterID dest)
{
m_assembler.movwMemReg(src, dest);
}
void load16(BaseIndex address, RegisterID dest)
{
- load16Signed(address, dest);
+ load16SignedExtendTo32(address, dest);
m_assembler.extuw(dest, dest);
}
@@ -875,7 +875,7 @@
m_assembler.extuw(dest, dest);
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
RegisterID scr = claimScratch();
@@ -887,7 +887,7 @@
m_assembler.movwR0mr(scr, dest);
else {
add32(address.base, scr);
- load16Signed(scr, dest);
+ load16SignedExtendTo32(scr, dest);
}
releaseScratch(scr);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (182097 => 182098)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2015-03-28 02:55:12 UTC (rev 182098)
@@ -525,12 +525,12 @@
m_assembler.movzbl_mr(address.offset, address.base, dest);
}
- void load8Signed(BaseIndex address, RegisterID dest)
+ void load8SignedExtendTo32(BaseIndex address, RegisterID dest)
{
m_assembler.movsbl_mr(address.offset, address.base, address.index, address.scale, dest);
}
- void load8Signed(ImplicitAddress address, RegisterID dest)
+ void load8SignedExtendTo32(ImplicitAddress address, RegisterID dest)
{
m_assembler.movsbl_mr(address.offset, address.base, dest);
}
@@ -545,12 +545,12 @@
m_assembler.movzwl_mr(address.offset, address.base, dest);
}
- void load16Signed(BaseIndex address, RegisterID dest)
+ void load16SignedExtendTo32(BaseIndex address, RegisterID dest)
{
m_assembler.movswl_mr(address.offset, address.base, address.index, address.scale, dest);
}
- void load16Signed(Address address, RegisterID dest)
+ void load16SignedExtendTo32(Address address, RegisterID dest)
{
m_assembler.movswl_mr(address.offset, address.base, dest);
}
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (182097 => 182098)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp 2015-03-28 02:55:12 UTC (rev 182098)
@@ -2310,13 +2310,13 @@
switch (elementSize(type)) {
case 1:
if (isSigned(type))
- m_jit.load8Signed(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
+ m_jit.load8SignedExtendTo32(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
else
m_jit.load8(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesOne), resultReg);
break;
case 2:
if (isSigned(type))
- m_jit.load16Signed(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
+ m_jit.load16SignedExtendTo32(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
else
m_jit.load16(MacroAssembler::BaseIndex(storageReg, propertyReg, MacroAssembler::TimesTwo), resultReg);
break;
Modified: trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp (182097 => 182098)
--- trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-03-28 01:57:22 UTC (rev 182097)
+++ trunk/Source/_javascript_Core/jit/JITPropertyAccess.cpp 2015-03-28 02:55:12 UTC (rev 182098)
@@ -1177,13 +1177,13 @@
switch (elementSize(type)) {
case 1:
if (isSigned(type))
- load8Signed(BaseIndex(base, property, TimesOne), resultPayload);
+ load8SignedExtendTo32(BaseIndex(base, property, TimesOne), resultPayload);
else
load8(BaseIndex(base, property, TimesOne), resultPayload);
break;
case 2:
if (isSigned(type))
- load16Signed(BaseIndex(base, property, TimesTwo), resultPayload);
+ load16SignedExtendTo32(BaseIndex(base, property, TimesTwo), resultPayload);
else
load16(BaseIndex(base, property, TimesTwo), resultPayload);
break;
