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

src/serialize.cc

 // Copyright 2006-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 20 matching lines @@
 #include "api.h"
 #include "execution.h"
 #include "global-handles.h"
 #include "ic-inl.h"
 #include "natives.h"
 #include "platform.h"
 #include "runtime.h"
 #include "serialize.h"
 #include "stub-cache.h"
 #include "v8threads.h"
-#include "top.h"
 #include "bootstrapper.h"
 
 namespace v8 {
 namespace internal {
 
 
 // -----------------------------------------------------------------------------
 // Coding of external references.
 
 // The encoding of an external reference. The type is in the high word.
@@ skipping 217 matching lines @@
 
   for (size_t i = 0; i < ARRAY_SIZE(stats_ref_table); ++i) {
     Add(reinterpret_cast<Address>(
             GetInternalPointer(stats_ref_table[i].counter)),
         STATS_COUNTER,
         stats_ref_table[i].id,
         stats_ref_table[i].name);
   }
 
   // Top addresses
-  const char* top_address_format = "Top::%s";
+  const char* top_address_format = "Isolate::%s";
 
   const char* AddressNames[] = {
 #define C(name) #name,
-    TOP_ADDRESS_LIST(C)
-    TOP_ADDRESS_LIST_PROF(C)
+    ISOLATE_ADDRESS_LIST(C)
+    ISOLATE_ADDRESS_LIST_PROF(C)
     NULL
 #undef C
   };
 
   int top_format_length = StrLength(top_address_format) - 2;
-  for (uint16_t i = 0; i < Top::k_top_address_count; ++i) {
+  for (uint16_t i = 0; i < Isolate::k_isolate_address_count; ++i) {
     const char* address_name = AddressNames[i];
     Vector<char> name =
         Vector<char>::New(top_format_length + StrLength(address_name) + 1);
     const char* chars = name.start();
     OS::SNPrintF(name, top_address_format, address_name);
-    Add(Top::get_address_from_id((Top::AddressId)i), TOP_ADDRESS, i, chars);
+    Add(Isolate::Current()->get_address_from_id((Isolate::AddressId)i),
+        TOP_ADDRESS, i, chars);
   }
 
   // Extensions
   Add(FUNCTION_ADDR(GCExtension::GC), EXTENSION, 1,
       "GCExtension::GC");
 
   // Accessors
 #define ACCESSOR_DESCRIPTOR_DECLARATION(name) \
   Add((Address)&Accessors::name, \
       ACCESSOR, \
@@ skipping 1149 matching lines @@
       fullness_[space] = RoundUp(fullness_[space], Page::kPageSize);
     }
   }
   int allocation_address = fullness_[space];
   fullness_[space] = allocation_address + size;
   return allocation_address;
 }
 
 
 } }  // namespace v8::internal