[Isolates] Move contents of Top into Isolate....

src/v8threads.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 141 matching lines @@
   }
   ThreadState* state =
       reinterpret_cast<ThreadState*>(Thread::GetThreadLocal(thread_state_key));
   if (state == NULL) {
     // This is a new thread.
     isolate->stack_guard()->InitThread(access);
     return false;
   }
   char* from = state->data();
   from = isolate->handle_scope_implementer()->RestoreThread(from);
-  from = Top::RestoreThread(from);
+  from = isolate->RestoreThread(from);
   from = Relocatable::RestoreState(from);
 #ifdef ENABLE_DEBUGGER_SUPPORT
   from = Debug::RestoreDebug(from);
 #endif
   from = isolate->stack_guard()->RestoreStackGuard(from);
   from = RegExpStack::RestoreStack(from);
   from = isolate->bootstrapper()->RestoreState(from);
   Thread::SetThreadLocal(thread_state_key, NULL);
   if (state->terminate_on_restore()) {
     isolate->stack_guard()->TerminateExecution();
@@ skipping 14 matching lines @@
 
 
 void ThreadManager::Unlock() {
   mutex_owner_.Initialize(ThreadHandle::INVALID);
   mutex_->Unlock();
 }
 
 
 static int ArchiveSpacePerThread() {
   return HandleScopeImplementer::ArchiveSpacePerThread() +
-                            Top::ArchiveSpacePerThread() +
+                        Isolate::ArchiveSpacePerThread() +
 #ifdef ENABLE_DEBUGGER_SUPPORT
                           Debug::ArchiveSpacePerThread() +
 #endif
                      StackGuard::ArchiveSpacePerThread() +
                     RegExpStack::ArchiveSpacePerThread() +
                    Bootstrapper::ArchiveSpacePerThread() +
                     Relocatable::ArchiveSpacePerThread();
 }
 
 
@@ skipping 76 matching lines @@
 
 
 void ThreadManager::EagerlyArchiveThread() {
   Isolate* isolate = Isolate::Current();
   ThreadState* state = lazily_archived_thread_state_;
   state->LinkInto(ThreadState::IN_USE_LIST);
   char* to = state->data();
   // Ensure that data containing GC roots are archived first, and handle them
   // in ThreadManager::Iterate(ObjectVisitor*).
   to = isolate->handle_scope_implementer()->ArchiveThread(to);
-  to = Top::ArchiveThread(to);
+  to = isolate->ArchiveThread(to);
   to = Relocatable::ArchiveState(to);
 #ifdef ENABLE_DEBUGGER_SUPPORT
   to = Debug::ArchiveDebug(to);
 #endif
   to = isolate->stack_guard()->ArchiveStackGuard(to);
   to = RegExpStack::ArchiveStack(to);
   to = isolate->bootstrapper()->ArchiveState(to);
   lazily_archived_thread_.Initialize(ThreadHandle::INVALID);
   lazily_archived_thread_state_ = NULL;
 }
 
 
 void ThreadManager::FreeThreadResources() {
   Isolate* isolate = Isolate::Current();
   isolate->handle_scope_implementer()->FreeThreadResources();
-  Top::FreeThreadResources();
+  isolate->FreeThreadResources();
 #ifdef ENABLE_DEBUGGER_SUPPORT
   Debug::FreeThreadResources();
 #endif
   isolate->stack_guard()->FreeThreadResources();
   RegExpStack::FreeThreadResources();
   isolate->bootstrapper()->FreeThreadResources();
 }
 
 
 bool ThreadManager::IsArchived() {
   return Thread::HasThreadLocal(thread_state_key);
 }
 
 
 void ThreadManager::Iterate(ObjectVisitor* v) {
   // Expecting no threads during serialization/deserialization
   for (ThreadState* state = ThreadState::FirstInUse();
        state != NULL;
        state = state->Next()) {
     char* data = state->data();
     data = HandleScopeImplementer::Iterate(v, data);
-    data = Top::Iterate(v, data);
+    data = Isolate::Current()->Iterate(v, data);
     data = Relocatable::Iterate(v, data);
   }
 }
 
 
 void ThreadManager::IterateArchivedThreads(ThreadVisitor* v) {
   for (ThreadState* state = ThreadState::FirstInUse();
        state != NULL;
        state = state->Next()) {
     char* data = state->data();
     data += HandleScopeImplementer::ArchiveSpacePerThread();
-    Top::IterateThread(v, data);
+    Isolate::Current()->IterateThread(v, data);
   }
 }
 
 
 void ThreadManager::MarkCompactPrologue(bool is_compacting) {
   for (ThreadState* state = ThreadState::FirstInUse();
        state != NULL;
        state = state->Next()) {
     char* data = state->data();
     data += HandleScopeImplementer::ArchiveSpacePerThread();
-    Top::MarkCompactPrologue(is_compacting, data);
+    Isolate::Current()->MarkCompactPrologue(is_compacting, data);
   }
 }
 
 
 void ThreadManager::MarkCompactEpilogue(bool is_compacting) {
   for (ThreadState* state = ThreadState::FirstInUse();
        state != NULL;
        state = state->Next()) {
     char* data = state->data();
     data += HandleScopeImplementer::ArchiveSpacePerThread();
-    Top::MarkCompactEpilogue(is_compacting, data);
+    Isolate::Current()->MarkCompactEpilogue(is_compacting, data);
   }
 }
 
 
 int ThreadManager::CurrentId() {
   return Thread::GetThreadLocalInt(thread_id_key);
 }
 
 
 void ThreadManager::AssignId() {
   if (!HasId()) {
     ASSERT(Locker::IsLocked());
     int thread_id = ++last_id_;
     ASSERT(thread_id > 0);  // see the comment near last_id_ definition.
     Thread::SetThreadLocalInt(thread_id_key, thread_id);
-    Top::set_thread_id(thread_id);
+    Isolate::Current()->set_thread_id(thread_id);
   }
 }
 
 
 bool ThreadManager::HasId() {
   return Thread::HasThreadLocal(thread_id_key);
 }
 
 
 void ThreadManager::TerminateExecution(int thread_id) {
@@ skipping 63 matching lines @@
 // Acknowledge the preemption by the receiving thread.
 void ContextSwitcher::PreemptionReceived() {
   ASSERT(Locker::IsLocked());
   // There is currently no accounting being done for this. But could be in the
   // future, which is why we leave this in.
 }
 
 
 }  // namespace internal
 }  // namespace v8