Merge revisions 3777-3813 from bleding_edge to partial snapshots ...

src/codegen.h

Index: src/codegen.h
===================================================================
--- src/codegen.h	(revision 3890)
+++ src/codegen.h	(working copy)
@@ -86,6 +86,8 @@
 #include "x64/codegen-x64.h"
 #elif V8_TARGET_ARCH_ARM
 #include "arm/codegen-arm.h"
+#elif V8_TARGET_ARCH_MIPS
+#include "mips/codegen-mips.h"
 #else
 #error Unsupported target architecture.
 #endif
@@ -96,6 +98,29 @@
 namespace internal {
 
 
+// Support for "structured" code comments.
+#ifdef DEBUG
+
+class Comment BASE_EMBEDDED {
+ public:
+  Comment(MacroAssembler* masm, const char* msg);
+  ~Comment();
+
+ private:
+  MacroAssembler* masm_;
+  const char* msg_;
+};
+
+#else
+
+class Comment BASE_EMBEDDED {
+ public:
+  Comment(MacroAssembler*, const char*)  {}
+};
+
+#endif  // DEBUG
+
+
 // Code generation can be nested.  Code generation scopes form a stack
 // of active code generators.
 class CodeGeneratorScope BASE_EMBEDDED {
@@ -348,8 +373,8 @@
                                 UncatchableExceptionType type);
 
   // Number of pointers/values returned.
-  int const result_size_;
-  ExitFrame::Mode const mode_;
+  const int result_size_;
+  const ExitFrame::Mode mode_;
 
   // Minor key encoding
   class ExitFrameModeBits: public BitField<ExitFrame::Mode, 0, 1> {};
@@ -390,10 +415,10 @@
 };
 
 
-// Mark the debugger statemet to be recognized by debugger (by the MajorKey)
-class DebugerStatementStub : public CodeStub {
+// Mark the debugger statement to be recognized by debugger (by the MajorKey)
+class DebuggerStatementStub : public CodeStub {
  public:
-  DebugerStatementStub() { }
+  DebuggerStatementStub() { }
 
   void Generate(MacroAssembler* masm);
 
@@ -401,7 +426,7 @@
   Major MajorKey() { return DebuggerStatement; }
   int MinorKey() { return 0; }
 
-  const char* GetName() { return "DebugerStatementStub"; }
+  const char* GetName() { return "DebuggerStatementStub"; }
 };