[Isolates] Moved more compilation-related globals (builtins, runtime, &c.)...

src/assembler.h

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 371 matching lines @@
 // External function
 
 //----------------------------------------------------------------------------
 class IC_Utility;
 class SCTableReference;
 #ifdef ENABLE_DEBUGGER_SUPPORT
 class Debug_Address;
 #endif
 
 
-typedef void* ExternalReferenceRedirector(void* original, bool fp_return);
-
-
 // An ExternalReference represents a C++ address used in the generated
 // code. All references to C++ functions and variables must be encapsulated in
 // an ExternalReference instance. This is done in order to track the origin of
 // all external references in the code so that they can be bound to the correct
 // addresses when deserializing a heap.
 class ExternalReference BASE_EMBEDDED {
  public:
   explicit ExternalReference(Builtins::CFunctionId id);
 
   explicit ExternalReference(ApiFunction* ptr);
 
   explicit ExternalReference(Builtins::Name name);
 
   explicit ExternalReference(Runtime::FunctionId id);
 
-  explicit ExternalReference(Runtime::Function* f);
+  explicit ExternalReference(const Runtime::Function* f);
 
   explicit ExternalReference(const IC_Utility& ic_utility);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   explicit ExternalReference(const Debug_Address& debug_address);
 #endif
 
   explicit ExternalReference(StatsCounter* counter);
 
   explicit ExternalReference(Isolate::AddressId id);
@@ skipping 74 matching lines @@
   static ExternalReference re_grow_stack();
 
   // byte NativeRegExpMacroAssembler::word_character_bitmap
   static ExternalReference re_word_character_map();
 
 #endif
 
   // This lets you register a function that rewrites all external references.
   // Used by the ARM simulator to catch calls to external references.
   static void set_redirector(ExternalReferenceRedirector* redirector) {
-    ASSERT(redirector_ == NULL);  // We can't stack them.
-    redirector_ = redirector;
+    // We can't stack them.
+    ASSERT(Isolate::Current()->external_reference_redirector() == NULL);
+    Isolate::Current()->set_external_reference_redirector(redirector);
   }
 
  private:
   explicit ExternalReference(void* address)
       : address_(address) {}
 
-  static ExternalReferenceRedirector* redirector_;
-
   static void* Redirect(void* address, bool fp_return = false) {
-    if (redirector_ == NULL) return address;
-    void* answer = (*redirector_)(address, fp_return);
+    ExternalReferenceRedirector* redirector =
+        Isolate::Current()->external_reference_redirector();
+    if (redirector == NULL) return address;
+    void* answer = (*redirector)(address, fp_return);
     return answer;
   }
 
   static void* Redirect(Address address_arg, bool fp_return = false) {
+    ExternalReferenceRedirector* redirector =
+        Isolate::Current()->external_reference_redirector();
     void* address = reinterpret_cast<void*>(address_arg);
-    void* answer = (redirector_ == NULL) ?
+    void* answer = (redirector == NULL) ?
                    address :
-                   (*redirector_)(address, fp_return);
+                   (*redirector)(address, fp_return);
     return answer;
   }
 
   void* address_;
 };
 
 
 // -----------------------------------------------------------------------------
 // Utility functions
 
@@ skipping 27 matching lines @@
   unsigned int num_bits_set;
   for (num_bits_set = 0; x; x >>= 1) {
     num_bits_set += x & 1;
   }
   return num_bits_set;
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_ASSEMBLER_H_