Changeset 43839 in webkit for trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

Timestamp:

May 18, 2009, 1:22:52 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-18 Jan Michael Alonzo <​[email protected]>

Reviewed by Xan Lopez.

[Gtk] Various autotools build refactoring and fixes
​https://bugs.webkit.org/show_bug.cgi?id=25286

Add -no-install and -no-fast-install to programs and tests that we
don't install. Also remove -O2 since this is already handled at
configure time.

• GNUmakefile.am:

File:

• trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h (modified) (18 diffs)

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -27 +27 @@
 #define AbstractMacroAssembler_h
 
-#include <wtf/Noncopyable.h>
 #include <wtf/Platform.h>
-#include <wtf/UnusedParam.h>
 
 #if ENABLE(ASSEMBLER)
@@ -46 +44 @@
     class CodeLocationDataLabel32;
     class CodeLocationDataLabelPtr;
-    class ProcessorReturnAddress;
-
-    struct CodeRef;
 
     typedef typename AssemblerType::RegisterID RegisterID;
@@ -200 +195 @@
     // it may be used as a destination for a jump.
     class Label {
-        template<class TemplateAssemblerType>
+        friend class Jump;
+        template<class AssemblerType_T>
         friend class AbstractMacroAssembler;
-        friend class Jump;
-        friend class PatchBuffer;
-
-        friend struct CodeRef;
-
+        friend class PatchBuffer;
     public:
         Label()
@@ -228 +220 @@
     // patched after the code has been generated.
     class DataLabelPtr {
-        template<class TemplateAssemblerType>
+        template<class AssemblerType_T>
         friend class AbstractMacroAssembler;
         friend class PatchBuffer;
@@ -250 +242 @@
     // patched after the code has been generated.
     class DataLabel32 {
-        template<class TemplateAssemblerType>
+        template<class AssemblerType_T>
         friend class AbstractMacroAssembler;
         friend class PatchBuffer;
@@ -274 +266 @@
     // destination.
     class Call {
-        template<class TemplateAssemblerType>
+        friend class PatchBuffer;
+        template<class AssemblerType_T>
         friend class AbstractMacroAssembler;
-        friend class PatchBuffer;
     public:
         enum Flags {
@@ -318 +310 @@
     // destination.
     class Jump {
-        template<class TemplateAssemblerType>
+        friend class PatchBuffer;
+        template<class AssemblerType_T>
         friend class AbstractMacroAssembler;
         friend class Call;
-        friend class PatchBuffer;
     public:
         Jump()
@@ -464 +456 @@
         friend class CodeLocationJump;
         friend class PatchBuffer;
-        friend class ProcessorReturnAddress;
-
     public:
         CodeLocationLabel()
@@ -625 +615 @@
         }
 
-        void relinkCallerToTrampoline(CodeLocationLabel label)
-        {
-            AssemblerType::patchMacroAssemblerCall(reinterpret_cast<intptr_t>(this->m_location), label.getJumpDestination());
-        }
-        
         template<typename FunctionSig>
         void relinkCallerToFunction(FunctionSig* newCalleeFunction)
@@ -652 +637 @@
 
 
-    // Section 4: CodeRef & PatchBuffer - utility to finalize code generation.
-
-    // CodeRef:
-    //
-    // A reference to a section of JIT generated code.  A CodeRef consists of a
-    // pointer to the code, and a ref pointer to the pool from within which it
-    // was allocated.
-    class CodeRef {
-    public:
-        CodeRef()
-            : m_code(0)
-#ifndef NDEBUG
-            , m_size(0)
-#endif
-        {
-        }
-
-        CodeRef(AbstractMacroAssembler<AssemblerType>* masm, PassRefPtr<ExecutablePool> executablePool)
-            : m_executablePool(executablePool)
-#ifndef NDEBUG
-            , m_size(masm->m_assembler.size())
-#endif
-        {
-            m_code = masm->m_assembler.executableCopy(m_executablePool.get());
-        }
-
-        CodeRef(void* code, PassRefPtr<ExecutablePool> executablePool, size_t size)
-            : m_code(code)
-            , m_executablePool(executablePool)
-        {
-#ifndef NDEBUG
-            m_size = size;
-#else
-            UNUSED_PARAM(size);
-#endif
-        }
-
-        void* trampolineAt(Label label)
-        {
-            return AssemblerType::getRelocatedAddress(m_code, label.m_label);
-        }
-        
-        void* m_code;
-        RefPtr<ExecutablePool> m_executablePool;
-#ifndef NDEBUG
-        size_t m_size;
-#endif
-    };
+    // Section 4: The patch buffer - utility to finalize code generation.
+
 
     // PatchBuffer:
@@ -718 +657 @@
     // address of calls, as opposed to a point that can be used to later relink a Jump -
     // possibly wrap the later up in an object that can do just that).
-    class PatchBuffer : public Noncopyable {
-    public:
-        PatchBuffer(AbstractMacroAssembler<AssemblerType>* masm, PassRefPtr<ExecutablePool> executablePool)
-            : m_ref(masm, executablePool)
-#ifndef NDEBUG
-            , m_completed(false)
-#endif
-        {
-        }
-
-#ifndef NDEBUG
-        ~PatchBuffer()
-        {
-            ASSERT(m_completed);
-        }
-#endif
-
+    class PatchBuffer {
+    public:
+        PatchBuffer(void* code)
+            : m_code(code)
+        {
+        }
+
+        CodeLocationLabel entry()
+        {
+            return CodeLocationLabel(m_code);
+        }
+
+        void* trampolineAt(Label label)
+        {
+            return AssemblerType::getRelocatedAddress(m_code, label.m_label);
+        }
+        
         // These methods are used to link or set values at code generation time.
 
@@ -742 +681 @@
             ASSERT(call.isFlagSet(Call::Linkable));
 #if PLATFORM(X86_64)
-            if (call.isFlagSet(Call::Near))
-                AssemblerType::linkCall(code(), call.m_jmp, reinterpret_cast<void*>(function));
-            else {
-                intptr_t callLocation = reinterpret_cast<intptr_t>(AssemblerType::getRelocatedAddress(code(), call.m_jmp));
+            if (call.isFlagSet(Call::Near)) {
+                AssemblerType::linkCall(m_code, call.m_jmp, reinterpret_cast<void*>(function));
+            } else {
+                intptr_t callLocation = reinterpret_cast<intptr_t>(AssemblerType::getRelocatedAddress(m_code, call.m_jmp));
                 AssemblerType::patchMacroAssemblerCall(callLocation, reinterpret_cast<void*>(function));
             }
 #else
-            AssemblerType::linkCall(code(), call.m_jmp, reinterpret_cast<void*>(function));
+            AssemblerType::linkCall(m_code, call.m_jmp, reinterpret_cast<void*>(function));
 #endif
         }
@@ -756 +695 @@
         void linkTailRecursive(Jump jump, FunctionSig* function)
         {
-            AssemblerType::linkJump(code(), jump.m_jmp, reinterpret_cast<void*>(function));
+            AssemblerType::linkJump(m_code, jump.m_jmp, reinterpret_cast<void*>(function));
         }
 
@@ -762 +701 @@
         void linkTailRecursive(JumpList list, FunctionSig* function)
         {
+            for (unsigned i = 0; i < list.m_jumps.size(); ++i) {
+                AssemblerType::linkJump(m_code, list.m_jumps[i].m_jmp, reinterpret_cast<void*>(function));
+            }
+        }
+
+        void link(Jump jump, CodeLocationLabel label)
+        {
+            AssemblerType::linkJump(m_code, jump.m_jmp, label.m_location);
+        }
+
+        void link(JumpList list, CodeLocationLabel label)
+        {
             for (unsigned i = 0; i < list.m_jumps.size(); ++i)
-                AssemblerType::linkJump(code(), list.m_jumps[i].m_jmp, reinterpret_cast<void*>(function));
-        }
-
-        void link(Jump jump, CodeLocationLabel label)
-        {
-            AssemblerType::linkJump(code(), jump.m_jmp, label.m_location);
-        }
-
-        void link(JumpList list, CodeLocationLabel label)
-        {
-            for (unsigned i = 0; i < list.m_jumps.size(); ++i)
-                AssemblerType::linkJump(code(), list.m_jumps[i].m_jmp, label.m_location);
+                AssemblerType::linkJump(m_code, list.m_jumps[i].m_jmp, label.m_location);
         }
 
         void patch(DataLabelPtr label, void* value)
         {
-            AssemblerType::patchAddress(code(), label.m_label, value);
-        }
-
-        void patch(DataLabelPtr label, CodeLocationLabel value)
-        {
-            AssemblerType::patchAddress(code(), label.m_label, value.getJumpDestination());
+            AssemblerType::patchAddress(m_code, label.m_label, value);
         }
 
@@ -793 +728 @@
             ASSERT(call.isFlagSet(Call::Linkable));
             ASSERT(!call.isFlagSet(Call::Near));
-            return CodeLocationCall(AssemblerType::getRelocatedAddress(code(), call.m_jmp));
+            return CodeLocationCall(AssemblerType::getRelocatedAddress(m_code, call.m_jmp));
         }
 
@@ -800 +735 @@
             ASSERT(call.isFlagSet(Call::Linkable));
             ASSERT(call.isFlagSet(Call::Near));
-            return CodeLocationNearCall(AssemblerType::getRelocatedAddress(code(), call.m_jmp));
+            return CodeLocationNearCall(AssemblerType::getRelocatedAddress(m_code, call.m_jmp));
         }
 
         CodeLocationLabel locationOf(Label label)
         {
-            return CodeLocationLabel(AssemblerType::getRelocatedAddress(code(), label.m_label));
+            return CodeLocationLabel(AssemblerType::getRelocatedAddress(m_code, label.m_label));
         }
 
         CodeLocationDataLabelPtr locationOf(DataLabelPtr label)
         {
-            return CodeLocationDataLabelPtr(AssemblerType::getRelocatedAddress(code(), label.m_label));
+            return CodeLocationDataLabelPtr(AssemblerType::getRelocatedAddress(m_code, label.m_label));
         }
 
         CodeLocationDataLabel32 locationOf(DataLabel32 label)
         {
-            return CodeLocationDataLabel32(AssemblerType::getRelocatedAddress(code(), label.m_label));
+            return CodeLocationDataLabel32(AssemblerType::getRelocatedAddress(m_code, label.m_label));
         }
 
@@ -825 +760 @@
         }
 
-        // Upon completion of all patching either 'finalizeCode()' or 'finalizeCodeAddendum()' should be called
-        // once to complete generation of the code.  'finalizeCode()' is suited to situations
-        // where the executable pool must also be retained, the lighter-weight 'finalizeCodeAddendum()' is
-        // suited to adding to an existing allocation.
-        CodeRef finalizeCode()
-        {
-            performFinalization();
-
-            return m_ref;
-        }
-        CodeLocationLabel finalizeCodeAddendum()
-        {
-            performFinalization();
-
-            return CodeLocationLabel(code());
-        }
-
-    private:
-        // Keep this private! - the underlying code should only be obtained externally via 
-        // finalizeCode() or finalizeCodeAddendum().
-        void* code()
-        {
-            return m_ref.m_code;
-        }
-
-        void performFinalization()
-        {
-#ifndef NDEBUG
-            ASSERT(!m_completed);
-            m_completed = true;
-#endif
-        }
-
-        CodeRef m_ref;
-#ifndef NDEBUG
-        bool m_completed;
-#endif
+    private:
+        void* m_code;
     };
 
@@ -870 +770 @@
     {
         return m_assembler.size();
+    }
+
+    void* copyCode(ExecutablePool* allocator)
+    {
+        return m_assembler.executableCopy(allocator);
     }