Revision: 3778
Author: [email protected]
Date: Wed Feb 3 00:33:19 2010
Log: Fix build error on Win32, fix spelling of DebugerStatementStub.
Review URL: http://codereview.chromium.org/570001
http://code.google.com/p/v8/source/detail?r=3778
Modified:
/branches/bleeding_edge/src/arm/codegen-arm.cc
/branches/bleeding_edge/src/codegen.cc
/branches/bleeding_edge/src/codegen.h
/branches/bleeding_edge/src/full-codegen.cc
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Tue Feb 2 23:58:47 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Wed Feb 3 00:33:19 2010
@@ -2302,7 +2302,7 @@
Comment cmnt(masm_, "[ DebuggerStatament");
CodeForStatementPosition(node);
#ifdef ENABLE_DEBUGGER_SUPPORT
- DebugerStatementStub ces;
+ DebuggerStatementStub ces;
frame_->CallStub(&ces, 0);
#endif
// Ignore the return value.
=======================================
--- /branches/bleeding_edge/src/codegen.cc Tue Feb 2 23:58:47 2010
+++ /branches/bleeding_edge/src/codegen.cc Wed Feb 3 00:33:19 2010
@@ -482,13 +482,11 @@
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 DebugerStatementStub::Generate(MacroAssembler* masm) {
+void DebuggerStatementStub::Generate(MacroAssembler* masm) {
Runtime::Function* f = Runtime::FunctionForId(Runtime::kDebugBreak);
masm->TailCallRuntime(ExternalReference(f), 0, f->result_size);
}
=======================================
--- /branches/bleeding_edge/src/codegen.h Tue Feb 2 23:58:47 2010
+++ /branches/bleeding_edge/src/codegen.h Wed Feb 3 00:33:19 2010
@@ -348,8 +348,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 +390,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 +401,7 @@
Major MajorKey() { return DebuggerStatement; }
int MinorKey() { return 0; }
- const char* GetName() { return "DebugerStatementStub"; }
+ const char* GetName() { return "DebuggerStatementStub"; }
};
=======================================
--- /branches/bleeding_edge/src/full-codegen.cc Mon Feb 1 23:58:09 2010
+++ /branches/bleeding_edge/src/full-codegen.cc Wed Feb 3 00:33:19 2010
@@ -987,7 +987,7 @@
Comment cmnt(masm_, "[ DebuggerStatement");
SetStatementPosition(stmt);
- DebugerStatementStub ces;
+ DebuggerStatementStub ces;
__ CallStub(&ces);
// Ignore the return value.
#endif
=======================================
--- /branches/bleeding_edge/src/heap.cc Tue Feb 2 10:35:53 2010
+++ /branches/bleeding_edge/src/heap.cc Wed Feb 3 00:33:19 2010
@@ -1499,7 +1499,7 @@
void Heap::CreateCEntryDebugBreakStub() {
- DebugerStatementStub stub;
+ DebuggerStatementStub stub;
set_debugger_statement_code(*stub.GetCode());
}
@@ -1526,7 +1526,7 @@
// { 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.
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Tue Feb 2 23:58:47
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Wed Feb 3 00:33:19
2010
@@ -3914,7 +3914,7 @@
// Spill everything, even constants, to the frame.
frame_->SpillAll();
- DebugerStatementStub ces;
+ DebuggerStatementStub ces;
frame_->CallStub(&ces, 0);
// Ignore the return value.
#endif
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Tue Feb 2 23:58:47 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Wed Feb 3 00:33:19 2010
@@ -2225,7 +2225,7 @@
// Spill everything, even constants, to the frame.
frame_->SpillAll();
- DebugerStatementStub ces;
+ DebuggerStatementStub ces;
frame_->CallStub(&ces, 0);
// Ignore the return value.
#endif
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
