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

src/ia32/assembler-ia32.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 330 matching lines @@
  private:
   int data_;
 
   class TypeField: public BitField<Type, 0, 2> {};
   class NextField: public BitField<int,  2, 32-2> {};
 
   void init(Label* L, Type type);
 };
 
 
+class AssemblerData:public BasicAssemblerData {
+ public:
+  // A previously allocated buffer of kMinimalBufferSize bytes, or NULL.
+  byte* spare_buffer_;
+  // CPU features
+  uint64_t supported_;
+  uint64_t enabled_;
+  uint64_t found_by_runtime_probing_;
+ private:
+  AssemblerData()
+    :BasicAssemblerData(),
+    spare_buffer_(NULL),
+    // Safe default is no features.
+    supported_(0),
+    enabled_(0),
+    found_by_runtime_probing_(0) {
+  }
+  ~AssemblerData() { delete spare_buffer_; }
+  friend class Assembler;
+  DISALLOW_COPY_AND_ASSIGN(AssemblerData);
+};
 
 // CpuFeatures keeps track of which features are supported by the target CPU.
 // Supported features must be enabled by a Scope before use.
 // Example:
 //   if (CpuFeatures::IsSupported(SSE2)) {
 //     CpuFeatures::Scope fscope(SSE2);
 //     // Generate SSE2 floating point code.
 //   } else {
 //     // Generate standard x87 floating point code.
 //   }
 class CpuFeatures : public AllStatic {
  public:
   // Detect features of the target CPU. Set safe defaults if the serializer
   // is enabled (snapshots must be portable).
   static void Probe();
   // Check whether a feature is supported by the target CPU.
   static bool IsSupported(CpuFeature f) {
     if (f == SSE2 && !FLAG_enable_sse2) return false;
     if (f == SSE3 && !FLAG_enable_sse3) return false;
     if (f == CMOV && !FLAG_enable_cmov) return false;
     if (f == RDTSC && !FLAG_enable_rdtsc) return false;
-    return (supported_ & (static_cast<uint64_t>(1) << f)) != 0;
+    return (v8_context()->assembler_data_->supported_ &
+            (static_cast<uint64_t>(1) << f)) != 0;
   }
   // Check whether a feature is currently enabled.
   static bool IsEnabled(CpuFeature f) {
-    return (enabled_ & (static_cast<uint64_t>(1) << f)) != 0;
+    return (v8_context()->assembler_data_->enabled_ &
+      (static_cast<uint64_t>(1) << f)) != 0;
   }
   // Enable a specified feature within a scope.
   class Scope BASE_EMBEDDED {
 #ifdef DEBUG
    public:
     explicit Scope(CpuFeature f) {
       uint64_t mask = static_cast<uint64_t>(1) << f;
       ASSERT(CpuFeatures::IsSupported(f));
-      ASSERT(!Serializer::enabled() || (found_by_runtime_probing_ & mask) == 0);
-      old_enabled_ = CpuFeatures::enabled_;
-      CpuFeatures::enabled_ |= mask;
+      AssemblerData* const data = v8_context()->assembler_data_;
+      ASSERT(!Serializer::enabled() ||
+        (data->found_by_runtime_probing_ & mask) == 0);
+      old_enabled_ = data->enabled_;
+      data->enabled_ |= mask;
     }
-    ~Scope() { CpuFeatures::enabled_ = old_enabled_; }
+    ~Scope() { v8_context()->assembler_data_->enabled_ = old_enabled_; }
    private:
     uint64_t old_enabled_;
 #else
    public:
     explicit Scope(CpuFeature f) {}
 #endif
   };
- private:
-  static uint64_t supported_;
-  static uint64_t enabled_;
-  static uint64_t found_by_runtime_probing_;
 };
 
 
 class Assembler : public Malloced {
  private:
   // We check before assembling an instruction that there is sufficient
   // space to write an instruction and its relocation information.
   // The relocation writer's position must be kGap bytes above the end of
   // the generated instructions. This leaves enough space for the
   // longest possible ia32 instruction, 15 bytes, and the longest possible
@@ skipping 435 matching lines @@
 
   friend class CodePatcher;
   friend class EnsureSpace;
 
   // Code buffer:
   // The buffer into which code and relocation info are generated.
   byte* buffer_;
   int buffer_size_;
   // True if the assembler owns the buffer, false if buffer is external.
   bool own_buffer_;
-  // A previously allocated buffer of kMinimalBufferSize bytes, or NULL.
-  static byte* spare_buffer_;
 
   // code generation
   byte* pc_;  // the program counter; moves forward
   RelocInfoWriter reloc_info_writer;
 
   // push-pop elimination
   byte* last_pc_;
 
   // source position information
   int current_statement_position_;
   int current_position_;
   int written_statement_position_;
   int written_position_;
+
+  static void PostConstruct();
+  static void PreDestroy();
+  friend class V8Context;
 };
 
 
 // Helper class that ensures that there is enough space for generating
 // instructions and relocation information.  The constructor makes
 // sure that there is enough space and (in debug mode) the destructor
 // checks that we did not generate too much.
 class EnsureSpace BASE_EMBEDDED {
  public:
   explicit EnsureSpace(Assembler* assembler) : assembler_(assembler) {
@@ skipping 13 matching lines @@
  private:
   Assembler* assembler_;
 #ifdef DEBUG
   int space_before_;
 #endif
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_IA32_ASSEMBLER_IA32_H_