Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (286154 => 286155)
--- trunk/Source/_javascript_Core/ChangeLog 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-11-25 00:32:30 UTC (rev 286155)
@@ -1,5 +1,36 @@
2021-11-24 Zan Dobersek <[email protected]>
+ MacroAssembler: remove unused load/store methods for addresses with patchable offsets
+ https://bugs.webkit.org/show_bug.cgi?id=233251
+
+ Reviewed by Yusuke Suzuki.
+
+ Remove MacroAssembler methods for load and store operations on addresses
+ with patchable offset values as they're not used in any place anymore.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::loadPtrWithAddressOffsetPatch): Deleted.
+ (JSC::MacroAssembler::loadPtrWithCompactAddressOffsetPatch): Deleted.
+ (JSC::MacroAssembler::storePtrWithAddressOffsetPatch): Deleted.
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::load32WithAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerARM64::load32WithCompactAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerARM64::store32WithAddressOffsetPatch): Deleted.
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::load32WithAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerARMv7::load32WithCompactAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerARMv7::store32WithAddressOffsetPatch): Deleted.
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::load32WithAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerMIPS::load32WithCompactAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerMIPS::store32WithAddressOffsetPatch): Deleted.
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::load32WithAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerX86Common::load32WithCompactAddressOffsetPatch): Deleted.
+ (JSC::MacroAssemblerX86Common::store32WithAddressOffsetPatch): Deleted.
+
+2021-11-24 Zan Dobersek <[email protected]>
+
[RISCV64] Fix floating-point register listings in FPRInfo.h
https://bugs.webkit.org/show_bug.cgi?id=233243
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (286154 => 286155)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2021-11-25 00:32:30 UTC (rev 286155)
@@ -735,16 +735,6 @@
}
#endif
- DataLabel32 loadPtrWithAddressOffsetPatch(Address address, RegisterID dest)
- {
- return load32WithAddressOffsetPatch(address, dest);
- }
-
- DataLabelCompact loadPtrWithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- return load32WithCompactAddressOffsetPatch(address, dest);
- }
-
void comparePtr(RelationalCondition cond, RegisterID left, TrustedImm32 right, RegisterID dest)
{
compare32(cond, left, right, dest);
@@ -795,11 +785,6 @@
store32(TrustedImm32(imm), address);
}
- DataLabel32 storePtrWithAddressOffsetPatch(RegisterID src, Address address)
- {
- return store32WithAddressOffsetPatch(src, address);
- }
-
Jump branchPtr(RelationalCondition cond, RegisterID left, RegisterID right)
{
return branch32(cond, left, right);
@@ -1088,16 +1073,6 @@
}
#endif
- DataLabel32 loadPtrWithAddressOffsetPatch(Address address, RegisterID dest)
- {
- return load64WithAddressOffsetPatch(address, dest);
- }
-
- DataLabelCompact loadPtrWithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- return load64WithCompactAddressOffsetPatch(address, dest);
- }
-
void storePtr(RegisterID src, Address address)
{
store64(src, address);
@@ -1128,11 +1103,6 @@
store64(TrustedImm64(imm), address);
}
- DataLabel32 storePtrWithAddressOffsetPatch(RegisterID src, Address address)
- {
- return store64WithAddressOffsetPatch(src, address);
- }
-
void comparePtr(RelationalCondition cond, RegisterID left, TrustedImm32 right, RegisterID dest)
{
compare64(cond, left, right, dest);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (286154 => 286155)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2021-11-25 00:32:30 UTC (rev 286155)
@@ -1715,22 +1715,6 @@
m_assembler.ldr<32>(dest, src.base, PostIndex(src.index));
}
- DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest)
- {
- DataLabel32 label(this);
- signExtend32ToPtrWithFixedWidth(address.offset, getCachedMemoryTempRegisterIDAndInvalidate());
- m_assembler.ldr<32>(dest, address.base, memoryTempRegister, Assembler::SXTW, 0);
- return label;
- }
-
- DataLabelCompact load32WithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- ASSERT(isCompactPtrAlignedAddressOffset(address.offset));
- DataLabelCompact label(this);
- m_assembler.ldr<32>(dest, address.base, address.offset);
- return label;
- }
-
void load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest)
{
load32(address, dest);
@@ -2115,14 +2099,6 @@
m_assembler.str<32>(src, dest.base, PostIndex(dest.index));
}
- DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)
- {
- DataLabel32 label(this);
- signExtend32ToPtrWithFixedWidth(address.offset, getCachedMemoryTempRegisterIDAndInvalidate());
- m_assembler.str<32>(src, address.base, memoryTempRegister, Assembler::SXTW, 0);
- return label;
- }
-
void store16(RegisterID src, Address address)
{
if (tryStoreWithOffset<16>(src, address.base, address.offset))
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (286154 => 286155)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2021-11-25 00:32:30 UTC (rev 286155)
@@ -803,26 +803,6 @@
load8(Address(dest), dest);
}
- DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest)
- {
- DataLabel32 label = moveWithPatch(TrustedImm32(address.offset), dataTempRegister);
- load32(ArmAddress(address.base, dataTempRegister), dest);
- return label;
- }
-
- DataLabelCompact load32WithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- padBeforePatch();
-
- RegisterID base = address.base;
-
- DataLabelCompact label(this);
- ASSERT(isCompactPtrAlignedAddressOffset(address.offset));
-
- m_assembler.ldr(dest, base, address.offset, true, false);
- return label;
- }
-
void load16(const void* address, RegisterID dest)
{
move(TrustedImmPtr(address), addressTempRegister);
@@ -873,13 +853,6 @@
}
}
- DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)
- {
- DataLabel32 label = moveWithPatch(TrustedImm32(address.offset), dataTempRegister);
- store32(src, ArmAddress(address.base, dataTempRegister));
- return label;
- }
-
void store32(RegisterID src, Address address)
{
store32(src, setupArmAddress(address));
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (286154 => 286155)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2021-11-25 00:32:30 UTC (rev 286155)
@@ -1192,30 +1192,6 @@
}
}
- DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest)
- {
- m_fixedWidth = true;
- /*
- lui addrTemp, address.offset >> 16
- ori addrTemp, addrTemp, address.offset & 0xffff
- addu addrTemp, addrTemp, address.base
- lw dest, 0(addrTemp)
- */
- DataLabel32 dataLabel(this);
- move(TrustedImm32(address.offset), addrTempRegister);
- m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
- m_assembler.lw(dest, addrTempRegister, 0);
- m_fixedWidth = false;
- return dataLabel;
- }
-
- DataLabelCompact load32WithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- DataLabelCompact dataLabel(this);
- load32WithAddressOffsetPatch(address, dest);
- return dataLabel;
- }
-
void load16(const void* address, RegisterID dest)
{
if (m_fixedWidth) {
@@ -1355,23 +1331,6 @@
}
}
- DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)
- {
- m_fixedWidth = true;
- /*
- lui addrTemp, address.offset >> 16
- ori addrTemp, addrTemp, address.offset & 0xffff
- addu addrTemp, addrTemp, address.base
- sw src, 0(addrTemp)
- */
- DataLabel32 dataLabel(this);
- move(TrustedImm32(address.offset), addrTempRegister);
- m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
- m_assembler.sw(src, addrTempRegister, 0);
- m_fixedWidth = false;
- return dataLabel;
- }
-
void store8(RegisterID src, Address address)
{
if (address.offset >= -32768 && address.offset <= 32767
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (286154 => 286155)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2021-11-24 23:50:00 UTC (rev 286154)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2021-11-25 00:32:30 UTC (rev 286155)
@@ -1235,20 +1235,6 @@
load16(address, dest);
}
- DataLabel32 load32WithAddressOffsetPatch(Address address, RegisterID dest)
- {
- padBeforePatch();
- m_assembler.movl_mr_disp32(address.offset, address.base, dest);
- return DataLabel32(this);
- }
-
- DataLabelCompact load32WithCompactAddressOffsetPatch(Address address, RegisterID dest)
- {
- padBeforePatch();
- m_assembler.movl_mr_disp8(address.offset, address.base, dest);
- return DataLabelCompact(this);
- }
-
template<PtrTag tag>
static void repatchCompact(CodeLocationDataLabelCompact<tag> dataLabelCompact, int32_t value)
{
@@ -1340,13 +1326,6 @@
m_assembler.movswl_rr(src, dest);
}
- DataLabel32 store32WithAddressOffsetPatch(RegisterID src, Address address)
- {
- padBeforePatch();
- m_assembler.movl_rm_disp32(src, address.offset, address.base);
- return DataLabel32(this);
- }
-
void store32(RegisterID src, Address address)
{
m_assembler.movl_rm(src, address.offset, address.base);
