Merge regexp2000 back into bleeding_edge

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 32 matching lines @@
 
 
 // -----------------------------------------------------------------------------
 // Labels represent pc locations; they are typically jump or call targets.
 // After declaration, a label can be freely used to denote known or (yet)
 // unknown pc location. Assembler::bind() is used to bind a label to the
 // current pc. A label can be bound only once.
 
 class Label : public ZoneObject {  // LabelShadows are dynamically allocated.
  public:
-  INLINE(Label())                 { Unuse(); }
+  INLINE(Label())
+  { Unuse(); }

[Mads Ager (chromium), 2008/11/25 21:09:41]

This looks like an accidental edit?

[Erik Corry, 2008/11/26 12:18:36]

Indeed it does.  Fixed.

   INLINE(~Label())                { ASSERT(!is_linked()); }
 
   INLINE(void Unuse())            { pos_ = 0; }
 
   INLINE(bool is_bound()  const)  { return pos_ <  0; }
   INLINE(bool is_unused() const)  { return pos_ == 0; }
   INLINE(bool is_linked() const)  { return pos_ >  0; }
 
   // Returns the position of bound or linked labels. Cannot be used
   // for unused labels.
@@ skipping 11 matching lines @@
   void bind_to(int pos)  {
     pos_ = -pos - 1;
     ASSERT(is_bound());
   }
   void link_to(int pos)  {
     pos_ =  pos + 1;
     ASSERT(is_linked());
   }
 
   friend class Assembler;
+  friend class RegexpAssembler;
   friend class Displacement;
   friend class LabelShadow;
+  friend class IrregexpAssembler;
 };
 
 
 // A LabelShadow represents a label that is temporarily shadowed by another
 // label (represented by the original label during shadowing). They are used
 // to catch jumps to labels in certain contexts, e.g. try blocks.  After
 // shadowing ends, the formerly shadowed label is again represented by the
 // original label and the LabelShadow can be used as a label in its own
 // right, representing the formerly shadowing label.
 class LabelShadow : public Label {
@@ skipping 371 matching lines @@
 static inline bool is_uint4(int x)  { return is_uintn(x, 4); }
 static inline bool is_uint5(int x)  { return is_uintn(x, 5); }
 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_