Patch for allowing several V8 instances in process:...

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 345 matching lines @@
 //----------------------------------------------------------------------------
 class IC_Utility;
 class SCTableReference;
 #ifdef ENABLE_DEBUGGER_SUPPORT
 class Debug_Address;
 #endif
 
 
 typedef void* ExternalReferenceRedirector(void* original, bool fp_return);
 
+class BasicAssemblerData {
+ public:
+  ExternalReferenceRedirector* redirector_;
+ protected:
+  BasicAssemblerData()
+    :redirector_(NULL) {}
+};
 
 // 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);
 
@@ skipping 76 matching lines @@
   // Function RegExpMacroAssembler*::CheckStackGuardState()
   static ExternalReference re_check_stack_guard_state();
 
   // Function NativeRegExpMacroAssembler::GrowStack()
   static ExternalReference re_grow_stack();
 #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;
+    ExternalReferenceRedirector* & current_redirector =
+      reinterpret_cast<BasicAssemblerData*>(v8_context()->assembler_data_)->
+      redirector_;
+    ASSERT(current_redirector == NULL);  // We can't stack them.
+    current_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);
-    return answer;
+    ExternalReferenceRedirector* redirector =
+      reinterpret_cast<BasicAssemblerData*>(v8_context()->assembler_data_)->
+      redirector_;
+    if (redirector == NULL) return address;
+    return (*redirector)(address, fp_return);
   }
 
   static void* Redirect(Address address_arg, bool fp_return = false) {
     void* address = reinterpret_cast<void*>(address_arg);
-    void* answer = (redirector_ == NULL) ?
-                   address :
-                   (*redirector_)(address, fp_return);
-    return answer;
+    ExternalReferenceRedirector* redirector =
+      reinterpret_cast<BasicAssemblerData*>(v8_context()->assembler_data_)->
+      redirector_;
+    return redirector == NULL ? address : (*redirector)(address, fp_return);
   }
 
   void* address_;
 };
 
 
 // -----------------------------------------------------------------------------
 // Utility functions
 
 static inline bool is_intn(int x, int n)  {
@@ skipping 13 matching lines @@
 static inline bool is_uint5(int x)  { return is_uintn(x, 5); }
 static inline bool is_uint6(int x)  { return is_uintn(x, 6); }
 static inline bool is_uint8(int x)  { return is_uintn(x, 8); }
 static inline bool is_uint12(int x)  { return is_uintn(x, 12); }
 static inline bool is_uint16(int x)  { return is_uintn(x, 16); }
 static inline bool is_uint24(int x)  { return is_uintn(x, 24); }
 
 } }  // namespace v8::internal
 
 #endif  // V8_ASSEMBLER_H_