Changeset 267867 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp

Timestamp:

Oct 1, 2020, 11:14:25 PM (5 years ago)

Author:

[email protected]

Message:

[JSC] Masm probe should invoke JIT operation function
​https://bugs.webkit.org/show_bug.cgi?id=217199

Reviewed by Mark Lam.

Masm probe function should be invoked via OperationPtrTag since it is invoked from JIT code, and it is native code.
And we should register probe trampoline as JIT operation.

• assembler/MacroAssemblerARM64.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARMv7.cpp:
• assembler/MacroAssemblerMIPS.cpp:
• assembler/MacroAssemblerX86Common.cpp:
• runtime/JSCPtrTag.h:

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp

@@ -42 +42 @@
 #if ENABLE(MASM_PROBE)
 
-extern "C" void ctiMasmProbeTrampoline();
+extern "C" JSC_DECLARE_JIT_OPERATION(ctiMasmProbeTrampoline, void, ());
+JSC_ANNOTATE_JIT_OPERATION(ctiMasmProbeTrampoline, ctiMasmProbeTrampoline);
 
 using namespace ARM64Registers;
@@ -542 +543 @@
     storePair64(x26, x27, sp, TrustedImm32(offsetof(IncomingProbeRecord, x26)));
     storePair64(x28, x30, sp, TrustedImm32(offsetof(IncomingProbeRecord, x28))); // Note: x30 is lr.
-    move(TrustedImmPtr(tagCFunction<JITProbeTrampolinePtrTag>(ctiMasmProbeTrampoline)), x26);
+    move(TrustedImmPtr(tagCFunction<OperationPtrTag>(ctiMasmProbeTrampoline)), x26);
     move(TrustedImmPtr(tagCFunction<JITProbeExecutorPtrTag>(Probe::executeProbe)), x28);
 #if CPU(ARM64E)
@@ -549 +550 @@
     move(TrustedImmPtr(reinterpret_cast<void*>(function)), x24);
     move(TrustedImmPtr(arg), x25);
-    call(x26, JITProbeTrampolinePtrTag);
+    call(x26, OperationPtrTag);
 
     // ctiMasmProbeTrampoline should have restored every register except for lr and the sp.