Experimental: periodic merge of the bleeding_edge branch to the...

src/bootstrapper.h

Index: src/bootstrapper.h
===================================================================
--- src/bootstrapper.h	(revision 1168)
+++ src/bootstrapper.h	(working copy)
@@ -49,7 +49,7 @@
   // Detach the environment from its outer global object.
   static void DetachGlobal(Handle<Context> env);
 
-  // Traverses the pointers for memory manangment.
+  // Traverses the pointers for memory management.
   static void Iterate(ObjectVisitor* v);
 
   // Accessors for the native scripts cache. Used in lazy loading.
@@ -61,13 +61,18 @@
   // Append code that needs fixup at the end of boot strapping.
   static void AddFixup(Code* code, MacroAssembler* masm);
 
-  // Tells whether boostrapping is active.
+  // Tells whether bootstrapping is active.
   static bool IsActive();
 
   // Encoding/decoding support for fixup flags.
   class FixupFlagsIsPCRelative: public BitField<bool, 0, 1> {};
   class FixupFlagsUseCodeObject: public BitField<bool, 1, 1> {};
   class FixupFlagsArgumentsCount: public BitField<uint32_t, 2, 32-2> {};
+
+  // Support for thread preemption.
+  static int ArchiveSpacePerThread();
+  static char* ArchiveState(char* to);
+  static char* RestoreState(char* from);
 };
 
 }}  // namespace v8::internal