Merge isolates to bleeding_edge.

src/assembler.cc

 // 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 199 matching lines @@
   // Signed right shift is arithmetic shift.  Tested in test-utils.cc.
     data_delta = data_delta >> kBitsPerByte;
   }
 }
 
 
 void RelocInfoWriter::Write(const RelocInfo* rinfo) {
 #ifdef DEBUG
   byte* begin_pos = pos_;
 #endif
-  Counters::reloc_info_count.Increment();
+  COUNTERS->reloc_info_count()->Increment();
   ASSERT(rinfo->pc() - last_pc_ >= 0);
   ASSERT(RelocInfo::NUMBER_OF_MODES <= kMaxRelocModes);
   // Use unsigned delta-encoding for pc.
   uint32_t pc_delta = static_cast<uint32_t>(rinfo->pc() - last_pc_);
   RelocInfo::Mode rmode = rinfo->rmode();
 
   // The two most common modes are given small tags, and usually fit in a byte.
   if (rmode == RelocInfo::EMBEDDED_OBJECT) {
     WriteTaggedPC(pc_delta, kEmbeddedObjectTag);
   } else if (rmode == RelocInfo::CODE_TARGET) {
@@ skipping 288 matching lines @@
       break;
 #endif
     case CONSTRUCT_CALL:
     case CODE_TARGET_CONTEXT:
     case CODE_TARGET: {
       // convert inline target address to code object
       Address addr = target_address();
       ASSERT(addr != NULL);
       // Check that we can find the right code object.
       Code* code = Code::GetCodeFromTargetAddress(addr);
-      Object* found = Heap::FindCodeObject(addr);
+      Object* found = HEAP->FindCodeObject(addr);
       ASSERT(found->IsCode());
       ASSERT(code->address() == HeapObject::cast(found)->address());
       break;
     }
     case RUNTIME_ENTRY:
     case JS_RETURN:
     case COMMENT:
     case POSITION:
     case STATEMENT_POSITION:
     case EXTERNAL_REFERENCE:
@@ skipping 15 matching lines @@
 ExternalReference::ExternalReference(Builtins::CFunctionId id)
   : address_(Redirect(Builtins::c_function_address(id))) {}
 
 
 ExternalReference::ExternalReference(
     ApiFunction* fun, Type type = ExternalReference::BUILTIN_CALL)
   : address_(Redirect(fun->address(), type)) {}
 
 
 ExternalReference::ExternalReference(Builtins::Name name)
-  : address_(Builtins::builtin_address(name)) {}
+  : address_(Isolate::Current()->builtins()->builtin_address(name)) {}
 
 
 ExternalReference::ExternalReference(Runtime::FunctionId id)
   : address_(Redirect(Runtime::FunctionForId(id)->entry)) {}
 
 
-ExternalReference::ExternalReference(Runtime::Function* f)
+ExternalReference::ExternalReference(const Runtime::Function* f)
   : address_(Redirect(f->entry)) {}
 
 
+ExternalReference ExternalReference::isolate_address() {
+  return ExternalReference(Isolate::Current());
+}
+
+
 ExternalReference::ExternalReference(const IC_Utility& ic_utility)
   : address_(Redirect(ic_utility.address())) {}
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
 ExternalReference::ExternalReference(const Debug_Address& debug_address)
-  : address_(debug_address.address()) {}
+  : address_(debug_address.address(Isolate::Current())) {}
 #endif
 
 ExternalReference::ExternalReference(StatsCounter* counter)
   : address_(reinterpret_cast<Address>(counter->GetInternalPointer())) {}
 
 
-ExternalReference::ExternalReference(Top::AddressId id)
-  : address_(Top::get_address_from_id(id)) {}
+ExternalReference::ExternalReference(Isolate::AddressId id)
+  : address_(Isolate::Current()->get_address_from_id(id)) {}
 
 
 ExternalReference::ExternalReference(const SCTableReference& table_ref)
   : address_(table_ref.address()) {}
 
 
 ExternalReference ExternalReference::perform_gc_function() {
   return ExternalReference(Redirect(FUNCTION_ADDR(Runtime::PerformGC)));
 }
 
 
 ExternalReference ExternalReference::fill_heap_number_with_random_function() {
   return
       ExternalReference(Redirect(FUNCTION_ADDR(V8::FillHeapNumberWithRandom)));
 }
 
 
 ExternalReference ExternalReference::delete_handle_scope_extensions() {
   return ExternalReference(Redirect(FUNCTION_ADDR(
                            HandleScope::DeleteExtensions)));
 }
 
 
 ExternalReference ExternalReference::random_uint32_function() {
   return ExternalReference(Redirect(FUNCTION_ADDR(V8::Random)));
 }
 
 
 ExternalReference ExternalReference::transcendental_cache_array_address() {
-  return ExternalReference(TranscendentalCache::cache_array_address());
+  return ExternalReference(Isolate::Current()->transcendental_cache()->
+      cache_array_address());
 }
 
 
 ExternalReference ExternalReference::new_deoptimizer_function() {
   return ExternalReference(
       Redirect(FUNCTION_ADDR(Deoptimizer::New)));
 }
 
 
 ExternalReference ExternalReference::compute_output_frames_function() {
   return ExternalReference(
       Redirect(FUNCTION_ADDR(Deoptimizer::ComputeOutputFrames)));
 }
 
 
 ExternalReference ExternalReference::global_contexts_list() {
-  return ExternalReference(Heap::global_contexts_list_address());
+  return ExternalReference(Isolate::Current()->
+      heap()->global_contexts_list_address());
 }
 
 
 ExternalReference ExternalReference::keyed_lookup_cache_keys() {
-  return ExternalReference(KeyedLookupCache::keys_address());
+  return ExternalReference(Isolate::Current()->
+      keyed_lookup_cache()->keys_address());
 }
 
 
 ExternalReference ExternalReference::keyed_lookup_cache_field_offsets() {
-  return ExternalReference(KeyedLookupCache::field_offsets_address());
+  return ExternalReference(Isolate::Current()->
+      keyed_lookup_cache()->field_offsets_address());
 }
 
 
 ExternalReference ExternalReference::the_hole_value_location() {
-  return ExternalReference(Factory::the_hole_value().location());
+  return ExternalReference(FACTORY->the_hole_value().location());
 }
 
 
 ExternalReference ExternalReference::arguments_marker_location() {
-  return ExternalReference(Factory::arguments_marker().location());
+  return ExternalReference(FACTORY->arguments_marker().location());
 }
 
 
 ExternalReference ExternalReference::roots_address() {
-  return ExternalReference(Heap::roots_address());
+  return ExternalReference(HEAP->roots_address());
 }
 
 
 ExternalReference ExternalReference::address_of_stack_limit() {
-  return ExternalReference(StackGuard::address_of_jslimit());
+  return ExternalReference(
+      Isolate::Current()->stack_guard()->address_of_jslimit());
 }
 
 
 ExternalReference ExternalReference::address_of_real_stack_limit() {
-  return ExternalReference(StackGuard::address_of_real_jslimit());
+  return ExternalReference(
+      Isolate::Current()->stack_guard()->address_of_real_jslimit());
 }
 
 
 ExternalReference ExternalReference::address_of_regexp_stack_limit() {
-  return ExternalReference(RegExpStack::limit_address());
+  return ExternalReference(
+      Isolate::Current()->regexp_stack()->limit_address());
 }
 
 
 ExternalReference ExternalReference::new_space_start() {
-  return ExternalReference(Heap::NewSpaceStart());
+  return ExternalReference(HEAP->NewSpaceStart());
 }
 
 
 ExternalReference ExternalReference::new_space_mask() {
-  return ExternalReference(reinterpret_cast<Address>(Heap::NewSpaceMask()));
+  return ExternalReference(reinterpret_cast<Address>(HEAP->NewSpaceMask()));
 }
 
 
 ExternalReference ExternalReference::new_space_allocation_top_address() {
-  return ExternalReference(Heap::NewSpaceAllocationTopAddress());
+  return ExternalReference(HEAP->NewSpaceAllocationTopAddress());
 }
 
 
 ExternalReference ExternalReference::heap_always_allocate_scope_depth() {
-  return ExternalReference(Heap::always_allocate_scope_depth_address());
+  return ExternalReference(HEAP->always_allocate_scope_depth_address());
 }
 
 
 ExternalReference ExternalReference::new_space_allocation_limit_address() {
-  return ExternalReference(Heap::NewSpaceAllocationLimitAddress());
+  return ExternalReference(HEAP->NewSpaceAllocationLimitAddress());
 }
 
 
 ExternalReference ExternalReference::handle_scope_level_address() {
   return ExternalReference(HandleScope::current_level_address());
 }
 
 
 ExternalReference ExternalReference::handle_scope_next_address() {
   return ExternalReference(HandleScope::current_next_address());
 }
 
 
 ExternalReference ExternalReference::handle_scope_limit_address() {
   return ExternalReference(HandleScope::current_limit_address());
 }
 
 
 ExternalReference ExternalReference::scheduled_exception_address() {
-  return ExternalReference(Top::scheduled_exception_address());
+  return ExternalReference(Isolate::Current()->scheduled_exception_address());
 }
 
 
 ExternalReference ExternalReference::address_of_min_int() {
   return ExternalReference(reinterpret_cast<void*>(
       const_cast<double*>(&DoubleConstant::min_int)));
 }
 
 
 ExternalReference ExternalReference::address_of_one_half() {
@@ skipping 45 matching lines @@
   return ExternalReference(Redirect(
       FUNCTION_ADDR(NativeRegExpMacroAssembler::CaseInsensitiveCompareUC16)));
 }
 
 ExternalReference ExternalReference::re_word_character_map() {
   return ExternalReference(
       NativeRegExpMacroAssembler::word_character_map_address());
 }
 
 ExternalReference ExternalReference::address_of_static_offsets_vector() {
-  return ExternalReference(OffsetsVector::static_offsets_vector_address());
+  return ExternalReference(OffsetsVector::static_offsets_vector_address(
+      Isolate::Current()));
 }
 
 ExternalReference ExternalReference::address_of_regexp_stack_memory_address() {
-  return ExternalReference(RegExpStack::memory_address());
+  return ExternalReference(
+      Isolate::Current()->regexp_stack()->memory_address());
 }
 
 ExternalReference ExternalReference::address_of_regexp_stack_memory_size() {
-  return ExternalReference(RegExpStack::memory_size_address());
+  return ExternalReference(
+      Isolate::Current()->regexp_stack()->memory_size_address());
 }
 
 #endif  // V8_INTERPRETED_REGEXP
 
 
 static double add_two_doubles(double x, double y) {
   return x + y;
 }
 
 
@@ skipping 130 matching lines @@
   return ExternalReference(Redirect(FUNCTION_ADDR(function), FP_RETURN_CALL));
 }
 
 
 ExternalReference ExternalReference::compare_doubles() {
   return ExternalReference(Redirect(FUNCTION_ADDR(native_compare_doubles),
                                     BUILTIN_CALL));
 }
 
 
-ExternalReference::ExternalReferenceRedirector*
-    ExternalReference::redirector_ = NULL;
-
-
 #ifdef ENABLE_DEBUGGER_SUPPORT
 ExternalReference ExternalReference::debug_break() {
   return ExternalReference(Redirect(FUNCTION_ADDR(Debug::Break)));
 }
 
 
 ExternalReference ExternalReference::debug_step_in_fp_address() {
-  return ExternalReference(Debug::step_in_fp_addr());
+  return ExternalReference(Isolate::Current()->debug()->step_in_fp_addr());
 }
 #endif
 
 
 void PositionsRecorder::RecordPosition(int pos) {
   ASSERT(pos != RelocInfo::kNoPosition);
   ASSERT(pos >= 0);
   state_.current_position = pos;
 #ifdef ENABLE_GDB_JIT_INTERFACE
   if (gdbjit_lineinfo_ != NULL) {
@@ skipping 36 matching lines @@
     assembler_->RecordRelocInfo(RelocInfo::POSITION, state_.current_position);
     state_.written_position = state_.current_position;
     written = true;
   }
 
   // Return whether something was written.
   return written;
 }
 
 } }  // namespace v8::internal