Changeset 236589 in webkit for trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

Timestamp:

Sep 27, 2018, 10:34:38 PM (7 years ago)

Author:

[email protected]

Message:

Verify the contents of AssemblerBuffer on arm64e
​https://bugs.webkit.org/show_bug.cgi?id=190057
<rdar://problem/38916630>

Reviewed by Mark Lam.

JSTests:

• stress/regress-189132.js:

Source/JavaScriptCore:

• assembler/ARM64Assembler.h:

(JSC::ARM64Assembler::ARM64Assembler):
(JSC::ARM64Assembler::fillNops):
(JSC::ARM64Assembler::link):
(JSC::ARM64Assembler::linkJumpOrCall):
(JSC::ARM64Assembler::linkCompareAndBranch):
(JSC::ARM64Assembler::linkConditionalBranch):
(JSC::ARM64Assembler::linkTestAndBranch):
(JSC::ARM64Assembler::unlinkedCode): Deleted.

• assembler/ARMAssembler.h:

(JSC::ARMAssembler::fillNops):

• assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::unlinkedCode): Deleted.

• assembler/AbstractMacroAssembler.h:

(JSC::AbstractMacroAssembler::emitNops):
(JSC::AbstractMacroAssembler::AbstractMacroAssembler):

• assembler/AssemblerBuffer.h:

(JSC::ARM64EHash::ARM64EHash):
(JSC::ARM64EHash::update):
(JSC::ARM64EHash::hash const):
(JSC::ARM64EHash::randomSeed const):
(JSC::AssemblerBuffer::AssemblerBuffer):
(JSC::AssemblerBuffer::putShort):
(JSC::AssemblerBuffer::putIntUnchecked):
(JSC::AssemblerBuffer::putInt):
(JSC::AssemblerBuffer::hash const):
(JSC::AssemblerBuffer::data const):
(JSC::AssemblerBuffer::putIntegralUnchecked):
(JSC::AssemblerBuffer::append): Deleted.

• assembler/LinkBuffer.cpp:

(JSC::LinkBuffer::copyCompactAndLinkCode):

• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::fillNops):

• assembler/MacroAssemblerARM64.h:

(JSC::MacroAssemblerARM64::jumpsToLink):
(JSC::MacroAssemblerARM64::link):
(JSC::MacroAssemblerARM64::unlinkedCode): Deleted.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::jumpsToLink):
(JSC::MacroAssemblerARMv7::unlinkedCode): Deleted.

• assembler/X86Assembler.h:

(JSC::X86Assembler::fillNops):

Source/WTF:

• wtf/PtrTag.h:

(WTF::tagInt):

File:

• trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h

@@ -2058 +2058 @@
     }
 
-    static void fillNops(void* base, size_t size, bool isCopyingToExecutableMemory)
+    template <typename CopyFunction>
+    static void fillNops(void* base, size_t size, CopyFunction copy)
     {
         RELEASE_ASSERT(!(size % sizeof(int16_t)));
@@ -2066 +2067 @@
         for (size_t i = 0; i < num32s; i++) {
             const int32_t insn = nopPseudo32();
-            if (isCopyingToExecutableMemory)
-                performJITMemcpy(ptr, &insn, sizeof(int32_t));
-            else
-                memcpy(ptr, &insn, sizeof(int32_t));
+            copy(ptr, &insn, sizeof(int32_t));
             ptr += sizeof(int32_t);
         }
@@ -2078 +2076 @@
         if (num16s) {
             const int16_t insn = nopPseudo16();
-            if (isCopyingToExecutableMemory)
-                performJITMemcpy(ptr, &insn, sizeof(int16_t));
-            else
-                memcpy(ptr, &insn, sizeof(int16_t));
+            copy(ptr, &insn, sizeof(int16_t));
         }
     }
@@ -2248 +2243 @@
     }
 
-    void* unlinkedCode() { return m_formatter.data(); }
     size_t codeSize() const { return m_formatter.codeSize(); }