Fix build error on Win32, fix spelling of DebugerStatementStub.

Review URL: http://codereview.chromium.org/570001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3778 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index 8854140d0aacf138c1f522c1c329d0dccca8c742..ea4b165fd3c5451ce921297ae525d02fc8a93237 100644 (file)
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -2302,7 +2302,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
   Comment cmnt(masm_, "[ DebuggerStatament");
   CodeForStatementPosition(node);
 #ifdef ENABLE_DEBUGGER_SUPPORT
-  DebugerStatementStub ces;
+  DebuggerStatementStub ces;
   frame_->CallStub(&ces, 0);
 #endif
   // Ignore the return value.

diff --git a/src/codegen.cc b/src/codegen.cc
index 1db07e48afabda545843cd04472ea341c369ff78..cb6089b8b72cbff8603980f9b89d954568a8fd9c 100644 (file)
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -482,13 +482,11 @@ void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
 int CEntryStub::MinorKey() {
   ASSERT(result_size_ <= 2);
 #ifdef _WIN64
-  const indirect_result = result_size_ > 1;
+  return ExitFrameModeBits::encode(mode_)
+         | IndirectResultBits::encode(result_size_ > 1);
 #else
-  const bool indirect_result = false;
+  return ExitFrameModeBits::encode(mode_);
 #endif
-
-  return ExitFrameModeBits::encode(mode_)
-         | IndirectResultBits::encode(indirect_result > 1);
 }
 
 
@@ -508,7 +506,7 @@ void ApiGetterEntryStub::SetCustomCache(Code* value) {
 }
 
 
-void DebugerStatementStub::Generate(MacroAssembler* masm) {
+void DebuggerStatementStub::Generate(MacroAssembler* masm) {
   Runtime::Function* f = Runtime::FunctionForId(Runtime::kDebugBreak);
   masm->TailCallRuntime(ExternalReference(f), 0, f->result_size);
 }

diff --git a/src/codegen.h b/src/codegen.h
index 3f4256a070ae2e66660533a29adc8e4c4c7fcf59..d0be5f1b1cb378ad636ba815d586503e6054e157 100644 (file)
--- a/src/codegen.h
+++ b/src/codegen.h
@@ -348,8 +348,8 @@ class CEntryStub : public CodeStub {
                                 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 +390,10 @@ class ApiGetterEntryStub : public CodeStub {
 };
 
 
-// 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 +401,7 @@ class DebugerStatementStub : public CodeStub {
   Major MajorKey() { return DebuggerStatement; }
   int MinorKey() { return 0; }
 
-  const char* GetName() { return "DebugerStatementStub"; }
+  const char* GetName() { return "DebuggerStatementStub"; }
 };
 
 

diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index 29a445256cb36431c50e75f1a166232d5a2cbf1f..01714cbb1098f8bdf6fdfd62ec85ee750b80970f 100644 (file)
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -987,7 +987,7 @@ void FullCodeGenerator::VisitDebuggerStatement(DebuggerStatement* stmt) {
   Comment cmnt(masm_, "[ DebuggerStatement");
   SetStatementPosition(stmt);
 
-  DebugerStatementStub ces;
+  DebuggerStatementStub ces;
   __ CallStub(&ces);
   // Ignore the return value.
 #endif

diff --git a/src/heap.cc b/src/heap.cc
index 882900163843aea9859c82c9dc31f6b209b89dec..5f4d81501b17e7131286674948fdddb716db7bd4 100644 (file)
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -1499,7 +1499,7 @@ void Heap::CreateRegExpCEntryStub() {
 
 
 void Heap::CreateCEntryDebugBreakStub() {
-  DebugerStatementStub stub;
+  DebuggerStatementStub stub;
   set_debugger_statement_code(*stub.GetCode());
 }
 
@@ -1526,7 +1526,7 @@ void Heap::CreateFixedStubs() {
   // {  CEntryStub stub;
   //    c_entry_code_ = *stub.GetCode();
   // }
-  // {  DebugerStatementStub stub;
+  // {  DebuggerStatementStub stub;
   //    debugger_statement_code_ = *stub.GetCode();
   // }
   // To workaround the problem, make separate functions without inlining.

diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc
index 815427ad46d7c0024f8ddf05e160652780de4c3b..fe91903e5b27a6d927e5b65f76ada76702305863 100644 (file)
--- a/src/ia32/codegen-ia32.cc
+++ b/src/ia32/codegen-ia32.cc
@@ -3914,7 +3914,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
   // Spill everything, even constants, to the frame.
   frame_->SpillAll();
 
-  DebugerStatementStub ces;
+  DebuggerStatementStub ces;
   frame_->CallStub(&ces, 0);
   // Ignore the return value.
 #endif

diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
index 6094f22e4963560cf4ffd5ce15e6efdca6272939..685c9286dfc85a4f72a6cc206637eca907a4d4de 100644 (file)
--- a/src/x64/codegen-x64.cc
+++ b/src/x64/codegen-x64.cc
@@ -2225,7 +2225,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
   // Spill everything, even constants, to the frame.
   frame_->SpillAll();
 
-  DebugerStatementStub ces;
+  DebuggerStatementStub ces;
   frame_->CallStub(&ces, 0);
   // Ignore the return value.
 #endif