1 files changed, 16 insertions, 58 deletions

diff --git a/Source/JavaScriptCore/jit/JITCode.h b/Source/JavaScriptCore/jit/JITCode.h
index 1d83cb59d..52c78111a 100644
--- a/Source/JavaScriptCore/jit/JITCode.h
+++ b/Source/JavaScriptCore/jit/JITCode.h
@@ -26,13 +26,14 @@
 #ifndef JITCode_h
 #define JITCode_h
 
-#include "ArityCheckMode.h"
+#if ENABLE(JIT) || ENABLE(LLINT)
 #include "CallFrame.h"
 #include "Disassembler.h"
 #include "JITStubs.h"
 #include "JSCJSValue.h"
+#include "LegacyProfiler.h"
 #include "MacroAssemblerCodeRef.h"
-#include "RegisterPreservationMode.h"
+#endif
 
 namespace JSC {
 
@@ -46,7 +47,6 @@ class JITCode;
 }
 
 struct ProtoCallFrame;
-class TrackedReferences;
 class VM;
 
 class JITCode : public ThreadSafeRefCounted<JITCode> {
@@ -54,17 +54,8 @@ public:
     typedef MacroAssemblerCodeRef CodeRef;
     typedef MacroAssemblerCodePtr CodePtr;
 
-    enum JITType : uint8_t {
-        None,
-        HostCallThunk,
-        InterpreterThunk,
-        BaselineJIT,
-        DFGJIT,
-        FTLJIT
-    };
+    enum JITType { None, HostCallThunk, InterpreterThunk, BaselineJIT, DFGJIT, FTLJIT };
     
-    static const char* typeName(JITType);
-
     static JITType bottomTierJIT()
     {
         return BaselineJIT;
@@ -173,7 +164,7 @@ public:
         return jitCode->jitType();
     }
     
-    virtual CodePtr addressForCall(VM&, ExecutableBase*, ArityCheckMode, RegisterPreservationMode) = 0;
+    virtual CodePtr addressForCall() = 0;
     virtual void* executableAddressAtOffset(size_t offset) = 0;
     void* executableAddress() { return executableAddressAtOffset(0); }
     virtual void* dataAddressAtOffset(size_t offset) = 0;
@@ -184,9 +175,7 @@ public:
     virtual FTL::JITCode* ftl();
     virtual FTL::ForOSREntryJITCode* ftlForOSREntry();
     
-    virtual void validateReferences(const TrackedReferences&);
-    
-    JSValue execute(VM*, ProtoCallFrame*);
+    JSValue execute(VM*, ProtoCallFrame*, Register*);
     
     void* start() { return dataAddressAtOffset(0); }
     virtual size_t size() = 0;
@@ -194,60 +183,29 @@ public:
     
     virtual bool contains(void*) = 0;
 
+    static PassRefPtr<JITCode> hostFunction(CodeRef);
+
 private:
     JITType m_jitType;
 };
 
-class JITCodeWithCodeRef : public JITCode {
-protected:
-    JITCodeWithCodeRef(JITType);
-    JITCodeWithCodeRef(CodeRef, JITType);
-
+class DirectJITCode : public JITCode {
 public:
-    virtual ~JITCodeWithCodeRef();
+    DirectJITCode(JITType);
+    DirectJITCode(const CodeRef, JITType);
+    virtual ~DirectJITCode();
+    
+    void initializeCodeRef(CodeRef ref);
 
+    virtual CodePtr addressForCall() override;
     virtual void* executableAddressAtOffset(size_t offset) override;
     virtual void* dataAddressAtOffset(size_t offset) override;
     virtual unsigned offsetOf(void* pointerIntoCode) override;
     virtual size_t size() override;
     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:
-    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;
+    CodeRef m_ref;
 };
 
 } // namespace JSC