[Isolates] Merge r 6300:6500 from bleeding_edge to isolates.

src/isolate.h

 // Copyright 2010 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 27 matching lines @@
 #include "frames.h"
 #include "global-handles.h"
 #include "handles.h"
 #include "heap.h"
 #include "regexp-stack.h"
 #include "runtime-profiler.h"
 #include "runtime.h"
 #include "zone.h"
 
 
-#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
-namespace assembler {
-namespace arm {
-class Redirection;
-class Simulator;
-}
-}
-#endif
-
-
 namespace v8 {
 namespace internal {
 
 class AstSentinels;
 class Bootstrapper;
 class CodeGenerator;
 class CodeRange;
 class CompilationCache;
 class ContextSlotCache;
 class ContextSwitcher;
@@ skipping 26 matching lines @@
 
 typedef void* ExternalReferenceRedirector(void* original, bool fp_return);
 
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
 class Debug;
 class Debugger;
 class DebuggerAgent;
 #endif
 
+#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
+class Redirection;
+class Simulator;
+#endif
 
 // Static indirection table for handles to constants.  If a frame
 // element represents a constant, the data contains an index into
 // this table of handles to the actual constants.
 // Static indirection table for handles to constants.  If a Result
 // represents a constant, the data contains an index into this table
 // of handles to the actual constants.
 typedef ZoneList<Handle<Object> > ZoneObjectList;
 
 #define RETURN_IF_SCHEDULED_EXCEPTION(isolate)    \
@@ skipping 70 matching lines @@
   bool external_caught_exception_;
   SaveContext* save_context_;
   v8::TryCatch* catcher_;
 
   // Stack.
   Address c_entry_fp_;  // the frame pointer of the top c entry frame
   Address handler_;   // try-blocks are chained through the stack
 
 #ifdef USE_SIMULATOR
 #ifdef V8_TARGET_ARCH_ARM
-  assembler::arm::Simulator* simulator_;
+  Simulator* simulator_;
 #elif V8_TARGET_ARCH_MIPS
   assembler::mips::Simulator* simulator_;
 #endif
 #endif  // USE_SIMULATOR
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
   Address js_entry_sp_;  // the stack pointer of the bottom js entry frame
   Address external_callback_;  // the external callback we're currently in
 #endif
 
@@ skipping 137 matching lines @@
           next_(NULL),
           prev_(NULL) { }
     Isolate* isolate() const { return isolate_; }
     ThreadId thread_id() const { return thread_id_; }
     void set_stack_limit(uintptr_t value) { stack_limit_ = value; }
     uintptr_t stack_limit() const { return stack_limit_; }
     ThreadState* thread_state() const { return thread_state_; }
     void set_thread_state(ThreadState* value) { thread_state_ = value; }
 
 #if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
-    assembler::arm::Simulator* simulator() const { return simulator_; }
-    void set_simulator(assembler::arm::Simulator* simulator) {
+    Simulator* simulator() const { return simulator_; }
+    void set_simulator(Simulator* simulator) {
       simulator_ = simulator;
     }
 #endif
 
     bool Matches(Isolate* isolate, ThreadId thread_id) const {
       return isolate_ == isolate && thread_id_ == thread_id;
     }
 
    private:
     Isolate* isolate_;
     ThreadId thread_id_;
     uintptr_t stack_limit_;
     ThreadState* thread_state_;
 
 #if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM)
-    assembler::arm::Simulator* simulator_;
+    Simulator* simulator_;
 #endif
 
     PerIsolateThreadData* next_;
     PerIsolateThreadData* prev_;
 
     friend class Isolate;
     friend class ThreadDataTable;
     friend class EntryStackItem;
 
     DISALLOW_COPY_AND_ASSIGN(PerIsolateThreadData);
@@ skipping 453 matching lines @@
   bool simulator_initialized() { return simulator_initialized_; }
   void set_simulator_initialized(bool initialized) {
     simulator_initialized_ = initialized;
   }
 
   HashMap* simulator_i_cache() { return simulator_i_cache_; }
   void set_simulator_i_cache(HashMap* hash_map) {
     simulator_i_cache_ = hash_map;
   }
 
-  assembler::arm::Redirection* simulator_redirection() {
+  Redirection* simulator_redirection() {
     return simulator_redirection_;
   }
-  void set_simulator_redirection(assembler::arm::Redirection* redirection) {
+  void set_simulator_redirection(Redirection* redirection) {
     simulator_redirection_ = redirection;
   }
 #endif
 
   Factory* factory() { return reinterpret_cast<Factory*>(this); }
 
   // SerializerDeserializer state.
   static const int kPartialSnapshotCacheCapacity = 1400;
 
   static const int kJSRegexpStaticOffsetsVectorSize = 50;
@@ skipping 190 matching lines @@
   unibrow::Mapping<unibrow::Ecma262Canonicalize>
       regexp_macro_assembler_canonicalize_;
   RegExpStack* regexp_stack_;
   unibrow::Mapping<unibrow::Ecma262Canonicalize> interp_canonicalize_mapping_;
   ZoneObjectList frame_element_constant_list_;
   ZoneObjectList result_constant_list_;
 
 #if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__)
   bool simulator_initialized_;
   HashMap* simulator_i_cache_;
-  assembler::arm::Redirection* simulator_redirection_;
+  Redirection* simulator_redirection_;
 #endif
 
 #ifdef DEBUG
   // A static array of histogram info for each type.
   HistogramInfo heap_histograms_[LAST_TYPE + 1];
   JSObject::SpillInformation js_spill_information_;
   int code_kind_statistics_[Code::NUMBER_OF_KINDS];
 #endif
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
@@ skipping 191 matching lines @@
 
 } }  // namespace v8::internal
 
 // TODO(isolates): Get rid of these -inl.h includes and place them only where
 //                 they're needed.
 #include "allocation-inl.h"
 #include "zone-inl.h"
 #include "frames-inl.h"
 
 #endif  // V8_ISOLATE_H_