Reverting 3159, 3151 and 3150

src/assembler.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 355 matching lines @@
 
 // An ExternalReference represents a C++ address used in the generated
 // code. All references to C++ functions and variables must be encapsulated in
 // an ExternalReference instance. This is done in order to track the origin of
 // all external references in the code so that they can be bound to the correct
 // addresses when deserializing a heap.
 class ExternalReference BASE_EMBEDDED {
  public:
   explicit ExternalReference(Builtins::CFunctionId id);
 
-  explicit ExternalReference(ApiFunction* ptr);
-
   explicit ExternalReference(Builtins::Name name);
 
   explicit ExternalReference(Runtime::FunctionId id);
 
   explicit ExternalReference(Runtime::Function* f);
 
   explicit ExternalReference(const IC_Utility& ic_utility);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   explicit ExternalReference(const Debug_Address& debug_address);
@@ skipping 29 matching lines @@
   static ExternalReference new_space_start();
   static ExternalReference heap_always_allocate_scope_depth();
 
   // Used for fast allocation in generated code.
   static ExternalReference new_space_allocation_top_address();
   static ExternalReference new_space_allocation_limit_address();
 
   static ExternalReference double_fp_operation(Token::Value operation);
   static ExternalReference compare_doubles();
 
-  static ExternalReference handle_scope_extensions_address();
-  static ExternalReference handle_scope_next_address();
-  static ExternalReference handle_scope_limit_address();
-
-  static ExternalReference scheduled_exception_address();
-
   Address address() const {return reinterpret_cast<Address>(address_);}
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Function Debug::Break()
   static ExternalReference debug_break();
 
   // Used to check if single stepping is enabled in generated code.
   static ExternalReference debug_step_in_fp_address();
 #endif
 
@@ skipping 57 matching lines @@
 static inline bool is_uint5(int x)  { return is_uintn(x, 5); }
 static inline bool is_uint6(int x)  { return is_uintn(x, 6); }
 static inline bool is_uint8(int x)  { return is_uintn(x, 8); }
 static inline bool is_uint12(int x)  { return is_uintn(x, 12); }
 static inline bool is_uint16(int x)  { return is_uintn(x, 16); }
 static inline bool is_uint24(int x)  { return is_uintn(x, 24); }
 
 } }  // namespace v8::internal
 
 #endif  // V8_ASSEMBLER_H_