Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (229862 => 229863)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-22 21:24:15 UTC (rev 229863)
@@ -1,3 +1,35 @@
+2018-03-22 Mark Lam <[email protected]>
+
+ Add placeholder call and jump MacroAssembler emitters that take PtrTag in a register.
+ https://bugs.webkit.org/show_bug.cgi?id=183914
+ <rdar://problem/38763536>
+
+ Reviewed by Saam Barati and JF Bastien.
+
+ This is in preparation for supporting pointer profiling work.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::jump):
+ (JSC::MacroAssemblerARM::call):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::call):
+ (JSC::MacroAssemblerARM64::jump):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::jump):
+ (JSC::MacroAssemblerARMv7::call):
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::jump):
+ (JSC::MacroAssemblerMIPS::call):
+ * assembler/MacroAssemblerX86.h:
+ (JSC::MacroAssemblerX86::call):
+ (JSC::MacroAssemblerX86::jump):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::jump):
+ (JSC::MacroAssemblerX86Common::call):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::call):
+ (JSC::MacroAssemblerX86_64::jump):
+
2018-03-22 Tim Horton <[email protected]>
Improve readability of WebCore's OTHER_LDFLAGS
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -805,6 +805,10 @@
load32(Address(ARMRegisters::S0, 0), ARMRegisters::pc);
}
+ ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
+ ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+
void moveDoubleToInts(FPRegisterID src, RegisterID dest1, RegisterID dest2)
{
m_assembler.vmov(dest1, dest2, src);
@@ -1125,6 +1129,10 @@
return Call(m_assembler.blx(ARMRegisters::S1), Call::Linkable);
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+ ALWAYS_INLINE Call call(RegisterID target, RegisterID callTag) { return UNUSED_PARAM(callTag), call(target, NoPtrTag); }
+ ALWAYS_INLINE void call(Address address, RegisterID callTag) { UNUSED_PARAM(callTag), call(address, NoPtrTag); }
+
Call tailRecursiveCall()
{
return Call::fromTailJump(jump());
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -3108,6 +3108,10 @@
return call(dataTempRegister, tag);
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+ ALWAYS_INLINE Call call(RegisterID target, RegisterID callTag) { return UNUSED_PARAM(callTag), call(target, NoPtrTag); }
+ ALWAYS_INLINE Call call(Address address, RegisterID callTag) { return UNUSED_PARAM(callTag), call(address, NoPtrTag); }
+
ALWAYS_INLINE Jump jump()
{
AssemblerLabel label = m_assembler.label();
@@ -3139,6 +3143,11 @@
m_assembler.br(dataTempRegister);
}
+ ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
+ ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+
ALWAYS_INLINE Call makeTailRecursiveCall(Jump oldJump)
{
oldJump.link(this);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -1625,6 +1625,9 @@
m_assembler.bx(dataTempRegister);
}
+ ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
+ ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
// Arithmetic control flow operations:
//
@@ -1811,6 +1814,10 @@
return Call(m_assembler.blx(dataTempRegister), Call::None);
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+ ALWAYS_INLINE Call call(RegisterID target, RegisterID callTag) { return UNUSED_PARAM(callTag), call(target, NoPtrTag); }
+ ALWAYS_INLINE Call call(Address address, RegisterID callTag) { return UNUSED_PARAM(callTag), call(address, NoPtrTag); }
+
ALWAYS_INLINE void ret()
{
m_assembler.bx(linkRegister);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -1925,6 +1925,10 @@
m_fixedWidth = false;
}
+ ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
+ ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+
void moveDoubleToInts(FPRegisterID src, RegisterID dest1, RegisterID dest2)
{
m_assembler.vmov(dest1, dest2, src);
@@ -2429,6 +2433,10 @@
return Call(m_assembler.label(), Call::None);
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+ ALWAYS_INLINE Call call(RegisterID target, RegisterID callTag) { return UNUSED_PARAM(callTag), call(target, NoPtrTag); }
+ ALWAYS_INLINE Call call(Address address, RegisterID callTag) { return UNUSED_PARAM(callTag), call(address, NoPtrTag); }
+
void ret()
{
m_assembler.jr(MIPSRegisters::ra);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -218,6 +218,8 @@
return Call(m_assembler.call(), Call::Linkable);
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+
// Address is a memory location containing the address to jump to
void jump(AbsoluteAddress address, PtrTag)
{
@@ -224,6 +226,8 @@
m_assembler.jmp_m(address.m_ptr);
}
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+
Call tailRecursiveCall()
{
return Call::fromTailJump(jump());
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -2713,6 +2713,9 @@
m_assembler.jmp_m(address.offset, address.base, address.index, address.scale);
}
+ ALWAYS_INLINE void jump(RegisterID target, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(target, NoPtrTag); }
+ ALWAYS_INLINE void jump(Address address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+ ALWAYS_INLINE void jump(BaseIndex address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
// Arithmetic control flow operations:
//
@@ -2904,6 +2907,9 @@
m_assembler.call_m(address.offset, address.base);
}
+ ALWAYS_INLINE Call call(RegisterID target, RegisterID callTag) { return UNUSED_PARAM(callTag), call(target, NoPtrTag); }
+ ALWAYS_INLINE void call(Address address, RegisterID callTag) { UNUSED_PARAM(callTag), call(address, NoPtrTag); }
+
void ret()
{
m_assembler.ret();
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h (229862 => 229863)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2018-03-22 21:17:47 UTC (rev 229862)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2018-03-22 21:24:15 UTC (rev 229863)
@@ -223,6 +223,8 @@
return result;
}
+ ALWAYS_INLINE Call call(RegisterID callTag) { return UNUSED_PARAM(callTag), call(NoPtrTag); }
+
// Address is a memory location containing the address to jump to
void jump(AbsoluteAddress address, PtrTag tag)
{
@@ -230,6 +232,8 @@
jump(Address(scratchRegister()), tag);
}
+ ALWAYS_INLINE void jump(AbsoluteAddress address, RegisterID jumpTag) { UNUSED_PARAM(jumpTag), jump(address, NoPtrTag); }
+
Call tailRecursiveCall()
{
DataLabelPtr label = moveWithPatch(TrustedImmPtr(nullptr), scratchRegister());