JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / heap / MachineStackMarker.h

diff --git a/heap/MachineStackMarker.h b/heap/MachineStackMarker.h
index 22b1d222ead4863223e7ac3fc11de1f60a065cc7..9b6b7327b62e8bbb0e3baf64841104b41e4d42fc 100644 (file)
--- a/heap/MachineStackMarker.h
+++ b/heap/MachineStackMarker.h
@@ -42,20 +42,22 @@ namespace JSC {
         MachineThreads(Heap*);
         ~MachineThreads();
 
         MachineThreads(Heap*);
         ~MachineThreads();
 

-        void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackCurrent, RegisterState& registers);
+        void gatherConservativeRoots(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackOrigin, void* stackTop, RegisterState& calleeSavedRegisters);

 
 

-        JS_EXPORT_PRIVATE void makeUsableFromMultipleThreads();

         JS_EXPORT_PRIVATE void addCurrentThread(); // Only needs to be called by clients that can use the same heap from multiple threads.
 
     private:
         JS_EXPORT_PRIVATE void addCurrentThread(); // Only needs to be called by clients that can use the same heap from multiple threads.
 
     private:

-        void gatherFromCurrentThread(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackCurrent, RegisterState& registers);
-

         class Thread;
 
         class Thread;
 

+        void gatherFromCurrentThread(ConservativeRoots&, JITStubRoutineSet&, CodeBlockSet&, void* stackOrigin, void* stackTop, RegisterState& calleeSavedRegisters);
+
+        void tryCopyOtherThreadStack(Thread*, void*, size_t capacity, size_t*);
+        bool tryCopyOtherThreadStacks(MutexLocker&, void*, size_t capacity, size_t*);
+

         static void removeThread(void*);
         static void removeThread(void*);

-        void removeCurrentThread();

 
 

-        void gatherFromOtherThread(ConservativeRoots&, Thread*, JITStubRoutineSet&, CodeBlockSet&);
+        template<typename PlatformThread>
+        void removeThreadIfFound(PlatformThread);

 
         Mutex m_registeredThreadsMutex;
         Thread* m_registeredThreads;
 
         Mutex m_registeredThreadsMutex;
         Thread* m_registeredThreads;