X87: Merge Debugger and Debug.

port r21524 (af88824)

BUG=
R=danno@chromium.org

Review URL: https://codereview.chromium.org/298193004

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21548 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
weiliang.lin@intel.com 2014-05-28 08:17:21 +00:00
parent 2312c8abdf
commit d5c4ad309e

View File

@ -172,7 +172,7 @@ static void Generate_DebugBreakCallHelper(MacroAssembler* masm,
}
void Debug::GenerateCallICStubDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateCallICStubDebugBreak(MacroAssembler* masm) {
// Register state for CallICStub
// ----------- S t a t e -------------
// -- edx : type feedback slot (smi)
@ -183,7 +183,7 @@ void Debug::GenerateCallICStubDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateLoadICDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateLoadICDebugBreak(MacroAssembler* masm) {
// Register state for IC load call (from ic-x87.cc).
// ----------- S t a t e -------------
// -- ecx : name
@ -193,7 +193,7 @@ void Debug::GenerateLoadICDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateStoreICDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateStoreICDebugBreak(MacroAssembler* masm) {
// Register state for IC store call (from ic-x87.cc).
// ----------- S t a t e -------------
// -- eax : value
@ -205,7 +205,7 @@ void Debug::GenerateStoreICDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateKeyedLoadICDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateKeyedLoadICDebugBreak(MacroAssembler* masm) {
// Register state for keyed IC load call (from ic-x87.cc).
// ----------- S t a t e -------------
// -- ecx : key
@ -215,7 +215,7 @@ void Debug::GenerateKeyedLoadICDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateKeyedStoreICDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateKeyedStoreICDebugBreak(MacroAssembler* masm) {
// Register state for keyed IC load call (from ic-x87.cc).
// ----------- S t a t e -------------
// -- eax : value
@ -227,7 +227,7 @@ void Debug::GenerateKeyedStoreICDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateCompareNilICDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateCompareNilICDebugBreak(MacroAssembler* masm) {
// Register state for CompareNil IC
// ----------- S t a t e -------------
// -- eax : value
@ -236,7 +236,7 @@ void Debug::GenerateCompareNilICDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateReturnDebugBreak(MacroAssembler* masm) {
// Register state just before return from JS function (from codegen-x87.cc).
// ----------- S t a t e -------------
// -- eax: return value
@ -245,7 +245,7 @@ void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
// Register state for CallFunctionStub (from code-stubs-x87.cc).
// ----------- S t a t e -------------
// -- edi: function
@ -254,7 +254,7 @@ void Debug::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
// Register state for CallConstructStub (from code-stubs-x87.cc).
// eax is the actual number of arguments not encoded as a smi see comment
// above IC call.
@ -267,7 +267,8 @@ void Debug::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateCallConstructStubRecordDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateCallConstructStubRecordDebugBreak(
MacroAssembler* masm) {
// Register state for CallConstructStub (from code-stubs-x87.cc).
// eax is the actual number of arguments not encoded as a smi see comment
// above IC call.
@ -283,7 +284,7 @@ void Debug::GenerateCallConstructStubRecordDebugBreak(MacroAssembler* masm) {
}
void Debug::GenerateSlot(MacroAssembler* masm) {
void DebugCodegen::GenerateSlot(MacroAssembler* masm) {
// Generate enough nop's to make space for a call instruction.
Label check_codesize;
__ bind(&check_codesize);
@ -294,19 +295,19 @@ void Debug::GenerateSlot(MacroAssembler* masm) {
}
void Debug::GenerateSlotDebugBreak(MacroAssembler* masm) {
void DebugCodegen::GenerateSlotDebugBreak(MacroAssembler* masm) {
// In the places where a debug break slot is inserted no registers can contain
// object pointers.
Generate_DebugBreakCallHelper(masm, 0, 0, true);
}
void Debug::GeneratePlainReturnLiveEdit(MacroAssembler* masm) {
void DebugCodegen::GeneratePlainReturnLiveEdit(MacroAssembler* masm) {
masm->ret(0);
}
void Debug::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
ExternalReference restarter_frame_function_slot =
ExternalReference::debug_restarter_frame_function_pointer_address(
masm->isolate());