JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / assembler / RepatchBuffer.h

diff --git a/assembler/RepatchBuffer.h b/assembler/RepatchBuffer.h
index dbb56f9ad5a76c394c5611365dc3a26d43c8623f..241ce14c73c05fa9624bc60b4a08379f70e2c340 100644 (file)
--- a/assembler/RepatchBuffer.h
+++ b/assembler/RepatchBuffer.h
@@ -45,18 +45,25 @@ class RepatchBuffer {
 
 public:
     RepatchBuffer(CodeBlock* codeBlock)
 
 public:
     RepatchBuffer(CodeBlock* codeBlock)

+        : m_codeBlock(codeBlock)

     {
     {

-        JITCode& code = codeBlock->getJITCode();
-        m_start = code.start();
-        m_size = code.size();
+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+        RefPtr<JITCode> code = codeBlock->jitCode();
+        m_start = code->start();
+        m_size = code->size();

 
         ExecutableAllocator::makeWritable(m_start, m_size);
 
         ExecutableAllocator::makeWritable(m_start, m_size);

+#endif

     }
 
     ~RepatchBuffer()
     {
     }
 
     ~RepatchBuffer()
     {

+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)

         ExecutableAllocator::makeExecutable(m_start, m_size);
         ExecutableAllocator::makeExecutable(m_start, m_size);

+#endif

     }
     }

+    
+    CodeBlock* codeBlock() const { return m_codeBlock; }

 
     void relink(CodeLocationJump jump, CodeLocationLabel destination)
     {
 
     void relink(CodeLocationJump jump, CodeLocationLabel destination)
     {


@@ -150,6 +157,11 @@ public:
     {
         return MacroAssembler::startOfPatchableBranchPtrWithPatchOnAddress(label);
     }
     {
         return MacroAssembler::startOfPatchableBranchPtrWithPatchOnAddress(label);
     }

+
+    static CodeLocationLabel startOfPatchableBranch32WithPatchOnAddress(CodeLocationDataLabel32 label)
+    {
+        return MacroAssembler::startOfPatchableBranch32WithPatchOnAddress(label);
+    }

     
     void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination)
     {
     
     void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination)
     {


@@ -169,9 +181,17 @@ public:
         MacroAssembler::revertJumpReplacementToPatchableBranchPtrWithPatch(instructionStart, address, value);
     }
 
         MacroAssembler::revertJumpReplacementToPatchableBranchPtrWithPatch(instructionStart, address, value);
     }
 

+    void revertJumpReplacementToPatchableBranch32WithPatch(CodeLocationLabel instructionStart, MacroAssembler::Address address, int32_t value)
+    {
+        MacroAssembler::revertJumpReplacementToPatchableBranch32WithPatch(instructionStart, address, value);
+    }
+

 private:
 private:

+    CodeBlock* m_codeBlock;
+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)

     void* m_start;
     size_t m_size;
     void* m_start;
     size_t m_size;

+#endif

 };
 
 } // namespace JSC
 };
 
 } // namespace JSC