Changeset 163027 in webkit for trunk/Source/JavaScriptCore/jit/JITCode.h

Timestamp:

Jan 29, 2014, 11:18:54 AM (11 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/jit/JITCode.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/jit/JITCode.h

@@ -27 +27 @@
 #define JITCode_h
 
-#if ENABLE(JIT) || ENABLE(LLINT)
+#include "ArityCheckMode.h"
 #include "CallFrame.h"
 #include "Disassembler.h"
@@ -34 +34 @@
 #include "LegacyProfiler.h"
 #include "MacroAssemblerCodeRef.h"
-#endif
+#include "RegisterPreservationMode.h"
 
 namespace JSC {
@@ -55 +55 @@
     typedef MacroAssemblerCodePtr CodePtr;
 
-    enum JITType { None, HostCallThunk, InterpreterThunk, BaselineJIT, DFGJIT, FTLJIT };
+    enum JITType : uint8_t {
+        None,
+        HostCallThunk,
+        InterpreterThunk,
+        BaselineJIT,
+        DFGJIT,
+        FTLJIT
+    };
     
     static JITType bottomTierJIT()
@@ -165 +172 @@
     }
     
-    virtual CodePtr addressForCall() = 0;
+    virtual CodePtr addressForCall(VM&, ExecutableBase*, ArityCheckMode, RegisterPreservationMode) = 0;
     virtual void* executableAddressAtOffset(size_t offset) = 0;
     void* executableAddress() { return executableAddressAtOffset(0); }
@@ -176 +183 @@
     virtual FTL::ForOSREntryJITCode* ftlForOSREntry();
     
-    JSValue execute(VM*, ProtoCallFrame*, Register*);
+    JSValue execute(VM*, ProtoCallFrame*);
     
     void* start() { return dataAddressAtOffset(0); }
@@ -184 +191 @@
     virtual bool contains(void*) = 0;
 
-    static PassRefPtr<JITCode> hostFunction(CodeRef);
-
 private:
     JITType m_jitType;
 };
 
-class DirectJITCode : public JITCode {
-public:
-    DirectJITCode(JITType);
-    DirectJITCode(const CodeRef, JITType);
-    virtual ~DirectJITCode();
-    
-    void initializeCodeRef(CodeRef ref);
-
-    virtual CodePtr addressForCall() override;
+class JITCodeWithCodeRef : public JITCode {
+protected:
+    JITCodeWithCodeRef(JITType);
+    JITCodeWithCodeRef(CodeRef, JITType);
+
+public:
+    virtual ~JITCodeWithCodeRef();
+
     virtual void* executableAddressAtOffset(size_t offset) override;
     virtual void* dataAddressAtOffset(size_t offset) override;
@@ -205 +209 @@
     virtual bool contains(void*) override;
 
+protected:
+    CodeRef m_ref;
+};
+
+class DirectJITCode : public JITCodeWithCodeRef {
+public:
+    DirectJITCode(JITType);
+    DirectJITCode(CodeRef, CodePtr withArityCheck, JITType);
+    virtual ~DirectJITCode();
+    
+    void initializeCodeRef(CodeRef, CodePtr withArityCheck);
+
+    virtual CodePtr addressForCall(VM&, ExecutableBase*, ArityCheckMode, RegisterPreservationMode) override;
+
 private:
-    CodeRef m_ref;
+    struct RegisterPreservationWrappers {
+        CodeRef withoutArityCheck;
+        CodeRef withArityCheck;
+    };
+
+    RegisterPreservationWrappers* ensureWrappers();
+    
+    CodePtr m_withArityCheck;
+    
+    std::unique_ptr<RegisterPreservationWrappers> m_wrappers;
+};
+
+class NativeJITCode : public JITCodeWithCodeRef {
+public:
+    NativeJITCode(JITType);
+    NativeJITCode(CodeRef, JITType);
+    virtual ~NativeJITCode();
+    
+    void initializeCodeRef(CodeRef);
+
+    virtual CodePtr addressForCall(VM&, ExecutableBase*, ArityCheckMode, RegisterPreservationMode) override;
 };