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

src/builtins.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 118 matching lines @@
 }
 BUILTIN_END
 
 
 BUILTIN(EmptyFunction) {
 }
 BUILTIN_END
 
 
 BUILTIN(ArrayCodeGeneric) {
-  Counters::array_function_runtime.Increment();
+  INC_COUNTER(array_function_runtime);
 
   JSArray* array;
   if (CalledAsConstructor()) {
     array = JSArray::cast(*receiver);
   } else {
     // Allocate the JS Array
     JSFunction* constructor =
         Top::context()->global_context()->array_function();
     Object* obj = Heap::AllocateJSObject(constructor);
     if (obj->IsFailure()) return obj;
@@ skipping 169 matching lines @@
   return holder;
 }
 
 
 BUILTIN(HandleApiCall) {
   HandleScope scope;
   bool is_construct = CalledAsConstructor();
 
   // TODO(428): Remove use of static variable, handle API callbacks directly.
   Handle<JSFunction> function =
-      Handle<JSFunction>(JSFunction::cast(Builtins::builtin_passed_function));
+      Handle<JSFunction>(JSFunction::cast(
+        v8_context()->builtins_data_.builtin_passed_function_));
 
   if (is_construct) {
     Handle<FunctionTemplateInfo> desc =
         Handle<FunctionTemplateInfo>(
             FunctionTemplateInfo::cast(function->shared()->function_data()));
     bool pending_exception = false;
     Factory::ConfigureInstance(desc, Handle<JSObject>::cast(receiver),
                                &pending_exception);
     ASSERT(Top::has_pending_exception() == pending_exception);
     if (pending_exception) return Failure::Exception();
@@ skipping 135 matching lines @@
 
 
 // Handle calls to non-function objects created through the API. This delegate
 // function is used when the call is a construct call.
 BUILTIN(HandleApiCallAsConstructor) {
   return HandleApiCallAsFunctionOrConstructor(true, args);
 }
 BUILTIN_END
 
 
-// TODO(1238487): This is a nasty hack. We need to improve the way we
-// call builtins considerable to get rid of this and the hairy macros
-// in builtins.cc.
-Object* Builtins::builtin_passed_function;
-
-
 
 static void Generate_LoadIC_ArrayLength(MacroAssembler* masm) {
   LoadIC::GenerateArrayLength(masm);
 }
 
 
 static void Generate_LoadIC_StringLength(MacroAssembler* masm) {
   LoadIC::GenerateStringLength(masm);
 }
 
@@ skipping 192 matching lines @@
 static void Generate_Return_DebugBreak(MacroAssembler* masm) {
   Debug::GenerateReturnDebugBreak(masm);
 }
 
 
 static void Generate_StubNoRegisters_DebugBreak(MacroAssembler* masm) {
   Debug::GenerateStubNoRegistersDebugBreak(masm);
 }
 #endif
 
-Object* Builtins::builtins_[builtin_count] = { NULL, };
-const char* Builtins::names_[builtin_count] = { NULL, };
+BuiltinsData::BuiltinsData()
+  :is_initialized_(false), builtin_passed_function_(NULL) {
+  for (int i = 0; i < builtin_count; ++i) {
+    builtins_[i] = NULL;
+    names_[i] = NULL;
+  }
+}
 
 #define DEF_ENUM_C(name) FUNCTION_ADDR(Builtin_##name),
   Address Builtins::c_functions_[cfunction_count] = {
     BUILTIN_LIST_C(DEF_ENUM_C)
   };
 #undef DEF_ENUM_C
 
 #define DEF_JS_NAME(name, ignore) #name,
 #define DEF_JS_ARGC(ignore, argc) argc,
 const char* Builtins::javascript_names_[id_count] = {
   BUILTINS_LIST_JS(DEF_JS_NAME)
 };
 
 int Builtins::javascript_argc_[id_count] = {
   BUILTINS_LIST_JS(DEF_JS_ARGC)
 };
 #undef DEF_JS_NAME
 #undef DEF_JS_ARGC
 
-static bool is_initialized = false;
 void Builtins::Setup(bool create_heap_objects) {
-  ASSERT(!is_initialized);
+  BuiltinsData& data = v8_context()->builtins_data_;
+  ASSERT(!data.is_initialized_);
 
   // Create a scope for the handles in the builtins.
   HandleScope scope;
 
   struct BuiltinDesc {
     byte* generator;
     byte* c_code;
     const char* s_name;  // name is only used for generating log information.
     int name;
     Code::Flags flags;
@@ skipping 56 matching lines @@
         if (code->IsFailure()) {
           v8::internal::V8::FatalProcessOutOfMemory("CreateCode");
         }
       }
       // Add any unresolved jumps or calls to the fixup list in the
       // bootstrapper.
       Bootstrapper::AddFixup(Code::cast(code), &masm);
       // Log the event and add the code to the builtins array.
       LOG(CodeCreateEvent(Logger::BUILTIN_TAG,
                           Code::cast(code), functions[i].s_name));
-      builtins_[i] = code;
+      data.builtins_[i] = code;
 #ifdef ENABLE_DISASSEMBLER
       if (FLAG_print_builtin_code) {
         PrintF("Builtin: %s\n", functions[i].s_name);
         Code::cast(code)->Disassemble(functions[i].s_name);
         PrintF("\n");
       }
 #endif
     } else {
       // Deserializing. The values will be filled in during IterateBuiltins.
-      builtins_[i] = NULL;
+      data.builtins_[i] = NULL;
     }
-    names_[i] = functions[i].s_name;
+    data.names_[i] = functions[i].s_name;
   }
 
   // Mark as initialized.
-  is_initialized = true;
+  data.is_initialized_ = true;
 }
 
 
 void Builtins::TearDown() {
-  is_initialized = false;
+  v8_context()->builtins_data_.is_initialized_ = false;
 }
 
 
 void Builtins::IterateBuiltins(ObjectVisitor* v) {
-  v->VisitPointers(&builtins_[0], &builtins_[0] + builtin_count);
+  BuiltinsData& data = v8_context()->builtins_data_;
+  v->VisitPointers(&data.builtins_[0], &data.builtins_[0] + builtin_count);
 }
 
 
 const char* Builtins::Lookup(byte* pc) {
-  if (is_initialized) {  // may be called during initialization (disassembler!)
+  BuiltinsData& data = v8_context()->builtins_data_;
+  if (data.is_initialized_) {
+    // may be called during initialization (disassembler!)
     for (int i = 0; i < builtin_count; i++) {
-      Code* entry = Code::cast(builtins_[i]);
+      Code* entry = Code::cast(data.builtins_[i]);
       if (entry->contains(pc)) {
-        return names_[i];
+        return data.names_[i];
       }
     }
   }
   return NULL;
 }
 
 
 } }  // namespace v8::internal