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

Timestamp:

Mar 28, 2018, 1:05:43 PM (7 years ago)

Author:

[email protected]

Message:

Enhance ARM64 probe to support pointer profiling.
​https://bugs.webkit.org/show_bug.cgi?id=184069
<rdar://problem/38939879>

Reviewed by JF Bastien.

• assembler/MacroAssemblerARM64.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerX86Common.h:

(JSC::MacroAssemblerX86Common::popPair):
(JSC::MacroAssemblerX86Common::pushPair):

• assembler/testmasm.cpp:

(JSC::testProbeReadsArgumentRegisters):
(JSC::testProbeWritesArgumentRegisters):

• runtime/PtrTag.h:

(JSC::tagForPtr):

File:

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

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -372 +372 @@
     // the caller of the probe (which is what we want in order to play nice with debuggers e.g. lldb).
     "mov       x0, sp" "\n" // Set the Probe::State* arg.
-    "blr       x28" "\n" // Call the probe handler.
+    CALL_WITH_PTRTAG("blr", "x28", CFunctionPtrTag) // Call the probe handler.
 
     // Make sure the Probe::State is entirely below the result stack pointer so
@@ -408 +408 @@
 
     "mov       x0, x27" "\n" // Set the Probe::State* arg.
-    "blr       x2" "\n" // Call the initializeStackFunction (loaded into x2 above).
+    CALL_WITH_PTRTAG("blr", "x2", CFunctionPtrTag) // Call the initializeStackFunction (loaded into x2 above).
 
     LOCAL_LABEL_STRING(ctiMasmProbeTrampolineRestoreRegisters) ":" "\n"
@@ -518 +518 @@
     move(TrustedImmPtr(reinterpret_cast<void*>(function)), x24);
     move(TrustedImmPtr(arg), x25);
-    m_assembler.blr(x26);
+    call(x26, CFunctionPtrTag);
 
     // ctiMasmProbeTrampoline should have restored every register except for lr and the sp.