Changeset 229911 in webkit

Timestamp:

Mar 23, 2018 11:44:17 AM (6 years ago)

Author:

mark.lam@apple.com

Message:

Add more support for pointer profiling.
​https://bugs.webkit.org/show_bug.cgi?id=183943
<rdar://problem/38799068>

Reviewed by JF Bastien.

• assembler/ARM64Assembler.h:

(JSC::ARM64Assembler::linkJumpOrCall):

• assembler/AbstractMacroAssembler.h:

(JSC::AbstractMacroAssembler::repatchNearCall):
(JSC::AbstractMacroAssembler::tagReturnAddress):
(JSC::AbstractMacroAssembler::untagReturnAddress):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARM64Assembler.h (modified) (1 diff)
• assembler/AbstractMacroAssembler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-03-23  Mark Lam  <mark.lam@apple.com>
+
+        Add more support for pointer profiling.
+        https://bugs.webkit.org/show_bug.cgi?id=183943
+        <rdar://problem/38799068>
+
+        Reviewed by JF Bastien.
+
+        * assembler/ARM64Assembler.h:
+        (JSC::ARM64Assembler::linkJumpOrCall):
+        * assembler/AbstractMacroAssembler.h:
+        (JSC::AbstractMacroAssembler::repatchNearCall):
+        (JSC::AbstractMacroAssembler::tagReturnAddress):
+        (JSC::AbstractMacroAssembler::untagReturnAddress):
+
 2018-03-23  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h

@@ -3035 +3035 @@
         ASSERT(!(reinterpret_cast<intptr_t>(from) & 3));
         ASSERT(!(reinterpret_cast<intptr_t>(to) & 3));
-        intptr_t offset = (removeCodePtrTag<intptr_t>(to) - removeCodePtrTag<intptr_t>(fromInstruction)) >> 2;
+        assertIsNotTagged(to);
+        assertIsNotTagged(fromInstruction);
+        intptr_t offset = (reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(fromInstruction)) >> 2;
         ASSERT(static_cast<int>(offset) == offset);
 

trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -896 +896 @@
     static void repatchNearCall(CodeLocationNearCall nearCall, CodeLocationLabel destination)
     {
+        assertIsTaggedWith(destination.executableAddress(), NearCallPtrTag);
         switch (nearCall.callMode()) {
         case NearCallMode::Tail:
@@ -953 +954 @@
         buffer.setCodeSize(targetCodeSize);
     }
+
+    ALWAYS_INLINE void tagReturnAddress() { }
+    ALWAYS_INLINE void untagReturnAddress() { }
 
     ALWAYS_INLINE void tagPtr(RegisterID, PtrTag) { }