Commit b57ca72b authored by whesse@chromium.org's avatar whesse@chromium.org

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
parent dc49c566
...@@ -2302,7 +2302,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) { ...@@ -2302,7 +2302,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
Comment cmnt(masm_, "[ DebuggerStatament"); Comment cmnt(masm_, "[ DebuggerStatament");
CodeForStatementPosition(node); CodeForStatementPosition(node);
#ifdef ENABLE_DEBUGGER_SUPPORT #ifdef ENABLE_DEBUGGER_SUPPORT
DebugerStatementStub ces; DebuggerStatementStub ces;
frame_->CallStub(&ces, 0); frame_->CallStub(&ces, 0);
#endif #endif
// Ignore the return value. // Ignore the return value.
......
...@@ -482,13 +482,11 @@ void ArgumentsAccessStub::Generate(MacroAssembler* masm) { ...@@ -482,13 +482,11 @@ void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
int CEntryStub::MinorKey() { int CEntryStub::MinorKey() {
ASSERT(result_size_ <= 2); ASSERT(result_size_ <= 2);
#ifdef _WIN64 #ifdef _WIN64
const indirect_result = result_size_ > 1; return ExitFrameModeBits::encode(mode_)
| IndirectResultBits::encode(result_size_ > 1);
#else #else
const bool indirect_result = false; return ExitFrameModeBits::encode(mode_);
#endif #endif
return ExitFrameModeBits::encode(mode_)
| IndirectResultBits::encode(indirect_result > 1);
} }
...@@ -508,7 +506,7 @@ void ApiGetterEntryStub::SetCustomCache(Code* value) { ...@@ -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); Runtime::Function* f = Runtime::FunctionForId(Runtime::kDebugBreak);
masm->TailCallRuntime(ExternalReference(f), 0, f->result_size); masm->TailCallRuntime(ExternalReference(f), 0, f->result_size);
} }
......
...@@ -348,8 +348,8 @@ class CEntryStub : public CodeStub { ...@@ -348,8 +348,8 @@ class CEntryStub : public CodeStub {
UncatchableExceptionType type); UncatchableExceptionType type);
// Number of pointers/values returned. // Number of pointers/values returned.
int const result_size_; const int result_size_;
ExitFrame::Mode const mode_; const ExitFrame::Mode mode_;
// Minor key encoding // Minor key encoding
class ExitFrameModeBits: public BitField<ExitFrame::Mode, 0, 1> {}; class ExitFrameModeBits: public BitField<ExitFrame::Mode, 0, 1> {};
...@@ -390,10 +390,10 @@ class ApiGetterEntryStub : public CodeStub { ...@@ -390,10 +390,10 @@ class ApiGetterEntryStub : public CodeStub {
}; };
// Mark the debugger statemet to be recognized by debugger (by the MajorKey) // Mark the debugger statement to be recognized by debugger (by the MajorKey)
class DebugerStatementStub : public CodeStub { class DebuggerStatementStub : public CodeStub {
public: public:
DebugerStatementStub() { } DebuggerStatementStub() { }
void Generate(MacroAssembler* masm); void Generate(MacroAssembler* masm);
...@@ -401,7 +401,7 @@ class DebugerStatementStub : public CodeStub { ...@@ -401,7 +401,7 @@ class DebugerStatementStub : public CodeStub {
Major MajorKey() { return DebuggerStatement; } Major MajorKey() { return DebuggerStatement; }
int MinorKey() { return 0; } int MinorKey() { return 0; }
const char* GetName() { return "DebugerStatementStub"; } const char* GetName() { return "DebuggerStatementStub"; }
}; };
......
...@@ -987,7 +987,7 @@ void FullCodeGenerator::VisitDebuggerStatement(DebuggerStatement* stmt) { ...@@ -987,7 +987,7 @@ void FullCodeGenerator::VisitDebuggerStatement(DebuggerStatement* stmt) {
Comment cmnt(masm_, "[ DebuggerStatement"); Comment cmnt(masm_, "[ DebuggerStatement");
SetStatementPosition(stmt); SetStatementPosition(stmt);
DebugerStatementStub ces; DebuggerStatementStub ces;
__ CallStub(&ces); __ CallStub(&ces);
// Ignore the return value. // Ignore the return value.
#endif #endif
......
...@@ -1499,7 +1499,7 @@ void Heap::CreateRegExpCEntryStub() { ...@@ -1499,7 +1499,7 @@ void Heap::CreateRegExpCEntryStub() {
void Heap::CreateCEntryDebugBreakStub() { void Heap::CreateCEntryDebugBreakStub() {
DebugerStatementStub stub; DebuggerStatementStub stub;
set_debugger_statement_code(*stub.GetCode()); set_debugger_statement_code(*stub.GetCode());
} }
...@@ -1526,7 +1526,7 @@ void Heap::CreateFixedStubs() { ...@@ -1526,7 +1526,7 @@ void Heap::CreateFixedStubs() {
// { CEntryStub stub; // { CEntryStub stub;
// c_entry_code_ = *stub.GetCode(); // c_entry_code_ = *stub.GetCode();
// } // }
// { DebugerStatementStub stub; // { DebuggerStatementStub stub;
// debugger_statement_code_ = *stub.GetCode(); // debugger_statement_code_ = *stub.GetCode();
// } // }
// To workaround the problem, make separate functions without inlining. // To workaround the problem, make separate functions without inlining.
......
...@@ -3914,7 +3914,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) { ...@@ -3914,7 +3914,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
// Spill everything, even constants, to the frame. // Spill everything, even constants, to the frame.
frame_->SpillAll(); frame_->SpillAll();
DebugerStatementStub ces; DebuggerStatementStub ces;
frame_->CallStub(&ces, 0); frame_->CallStub(&ces, 0);
// Ignore the return value. // Ignore the return value.
#endif #endif
......
...@@ -2225,7 +2225,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) { ...@@ -2225,7 +2225,7 @@ void CodeGenerator::VisitDebuggerStatement(DebuggerStatement* node) {
// Spill everything, even constants, to the frame. // Spill everything, even constants, to the frame.
frame_->SpillAll(); frame_->SpillAll();
DebugerStatementStub ces; DebuggerStatementStub ces;
frame_->CallStub(&ces, 0); frame_->CallStub(&ces, 0);
// Ignore the return value. // Ignore the return value.
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment