Revision: 10540
Author: [email protected]
Date: Fri Jan 27 08:09:20 2012
Log: Fix and adapt debugger for new call target caches.
[email protected]
TEST=mjsunit/debug-stepout-scope
Review URL: https://chromiumcodereview.appspot.com/9297019
http://code.google.com/p/v8/source/detail?r=10540
Modified:
/branches/bleeding_edge/src/arm/debug-arm.cc
/branches/bleeding_edge/src/builtins.cc
/branches/bleeding_edge/src/builtins.h
/branches/bleeding_edge/src/code-stubs.h
/branches/bleeding_edge/src/debug.cc
/branches/bleeding_edge/src/debug.h
/branches/bleeding_edge/src/ia32/debug-ia32.cc
/branches/bleeding_edge/src/objects-inl.h
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/x64/debug-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/debug-arm.cc Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/arm/debug-arm.cc Fri Jan 27 08:09:20 2012
@@ -249,15 +249,6 @@
// -----------------------------------
Generate_DebugBreakCallHelper(masm, r2.bit(), 0);
}
-
-
-void Debug::GenerateConstructCallDebugBreak(MacroAssembler* masm) {
- // Calling convention for construct call (from builtins-arm.cc)
- // -- r0 : number of arguments (not smi)
- // -- r1 : constructor function
- // -- r2 : cache cell for call target
- Generate_DebugBreakCallHelper(masm, r1.bit() | r2.bit(), r0.bit());
-}
void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
@@ -275,6 +266,37 @@
// -----------------------------------
Generate_DebugBreakCallHelper(masm, r1.bit(), 0);
}
+
+
+void Debug::GenerateCallFunctionStubRecordDebugBreak(MacroAssembler* masm)
{
+ // Register state for CallFunctionStub (from code-stubs-arm.cc).
+ // ----------- S t a t e -------------
+ // -- r1 : function
+ // -- r2 : cache cell for call target
+ // -----------------------------------
+ Generate_DebugBreakCallHelper(masm, r1.bit() | r2.bit(), 0);
+}
+
+
+void Debug::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
+ // Calling convention for CallConstructStub (from code-stubs-arm.cc)
+ // ----------- S t a t e -------------
+ // -- r0 : number of arguments (not smi)
+ // -- r1 : constructor function
+ // -----------------------------------
+ Generate_DebugBreakCallHelper(masm, r1.bit(), r0.bit());
+}
+
+
+void Debug::GenerateCallConstructStubRecordDebugBreak(MacroAssembler*
masm) {
+ // Calling convention for CallConstructStub (from code-stubs-arm.cc)
+ // ----------- S t a t e -------------
+ // -- r0 : number of arguments (not smi)
+ // -- r1 : constructor function
+ // -- r2 : cache cell for call target
+ // -----------------------------------
+ Generate_DebugBreakCallHelper(masm, r1.bit() | r2.bit(), r0.bit());
+}
void Debug::GenerateSlot(MacroAssembler* masm) {
=======================================
--- /branches/bleeding_edge/src/builtins.cc Thu Jan 26 14:33:54 2012
+++ /branches/bleeding_edge/src/builtins.cc Fri Jan 27 08:09:20 2012
@@ -1506,11 +1506,6 @@
static void Generate_KeyedStoreIC_DebugBreak(MacroAssembler* masm) {
Debug::GenerateKeyedStoreICDebugBreak(masm);
}
-
-
-static void Generate_ConstructCall_DebugBreak(MacroAssembler* masm) {
- Debug::GenerateConstructCallDebugBreak(masm);
-}
static void Generate_Return_DebugBreak(MacroAssembler* masm) {
@@ -1521,6 +1516,23 @@
static void Generate_CallFunctionStub_DebugBreak(MacroAssembler* masm) {
Debug::GenerateCallFunctionStubDebugBreak(masm);
}
+
+
+static void Generate_CallFunctionStub_Recording_DebugBreak(
+ MacroAssembler* masm) {
+ Debug::GenerateCallFunctionStubRecordDebugBreak(masm);
+}
+
+
+static void Generate_CallConstructStub_DebugBreak(MacroAssembler* masm) {
+ Debug::GenerateCallConstructStubDebugBreak(masm);
+}
+
+
+static void Generate_CallConstructStub_Recording_DebugBreak(
+ MacroAssembler* masm) {
+ Debug::GenerateCallConstructStubRecordDebugBreak(masm);
+}
static void Generate_Slot_DebugBreak(MacroAssembler* masm) {
=======================================
--- /branches/bleeding_edge/src/builtins.h Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/builtins.h Fri Jan 27 08:09:20 2012
@@ -194,26 +194,30 @@
#ifdef ENABLE_DEBUGGER_SUPPORT
// Define list of builtins used by the debugger implemented in assembly.
#define BUILTIN_LIST_DEBUG_A(V) \
- V(Return_DebugBreak, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(ConstructCall_DebugBreak, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(CallFunctionStub_DebugBreak, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(LoadIC_DebugBreak, LOAD_IC, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(KeyedLoadIC_DebugBreak, KEYED_LOAD_IC, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(StoreIC_DebugBreak, STORE_IC, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(KeyedStoreIC_DebugBreak, KEYED_STORE_IC, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(Slot_DebugBreak, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(PlainReturn_LiveEdit, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState) \
- V(FrameDropper_LiveEdit, BUILTIN, DEBUG_BREAK, \
- Code::kNoExtraICState)
+ V(Return_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(CallFunctionStub_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(CallFunctionStub_Recording_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(CallConstructStub_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(CallConstructStub_Recording_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(LoadIC_DebugBreak, LOAD_IC,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(KeyedLoadIC_DebugBreak, KEYED_LOAD_IC,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(StoreIC_DebugBreak, STORE_IC,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(KeyedStoreIC_DebugBreak, KEYED_STORE_IC,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(Slot_DebugBreak, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(PlainReturn_LiveEdit, BUILTIN,
DEBUG_BREAK, \
+
Code::kNoExtraICState) \
+ V(FrameDropper_LiveEdit, BUILTIN,
DEBUG_BREAK, \
+ Code::kNoExtraICState)
#else
#define BUILTIN_LIST_DEBUG_A(V)
#endif
=======================================
--- /branches/bleeding_edge/src/code-stubs.h Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/code-stubs.h Fri Jan 27 08:09:20 2012
@@ -739,6 +739,10 @@
void Generate(MacroAssembler* masm);
+ virtual void FinishCode(Handle<Code> code) {
+ code->set_has_function_cache(RecordCallTarget());
+ }
+
static int ExtractArgcFromMinorKey(int minor_key) {
return ArgcBits::decode(minor_key);
}
@@ -775,6 +779,10 @@
void Generate(MacroAssembler* masm);
+ virtual void FinishCode(Handle<Code> code) {
+ code->set_has_function_cache(RecordCallTarget());
+ }
+
private:
CallFunctionFlags flags_;
=======================================
--- /branches/bleeding_edge/src/debug.cc Wed Jan 25 07:11:59 2012
+++ /branches/bleeding_edge/src/debug.cc Fri Jan 27 08:09:20 2012
@@ -83,12 +83,6 @@
s->WriteAscii(data.start());
PrintF("%s\n", data.start());
}
-
-
-static Handle<Code> ComputeCallDebugBreak(int argc, Code::Kind kind) {
- Isolate* isolate = Isolate::Current();
- return isolate->stub_cache()->ComputeCallDebugBreak(argc, kind);
-}
static Handle<Code> ComputeCallDebugPrepareStepIn(int argc, Code::Kind
kind) {
@@ -1538,40 +1532,47 @@
// Find the builtin to use for invoking the debug break
Handle<Code> Debug::FindDebugBreak(Handle<Code> code, RelocInfo::Mode
mode) {
+ Isolate* isolate = Isolate::Current();
+
// Find the builtin debug break function matching the calling convention
// used by the call site.
if (code->is_inline_cache_stub()) {
switch (code->kind()) {
case Code::CALL_IC:
case Code::KEYED_CALL_IC:
- return ComputeCallDebugBreak(code->arguments_count(),
code->kind());
+ return isolate->stub_cache()->ComputeCallDebugBreak(
+ code->arguments_count(), code->kind());
case Code::LOAD_IC:
- return Isolate::Current()->builtins()->LoadIC_DebugBreak();
+ return isolate->builtins()->LoadIC_DebugBreak();
case Code::STORE_IC:
- return Isolate::Current()->builtins()->StoreIC_DebugBreak();
+ return isolate->builtins()->StoreIC_DebugBreak();
case Code::KEYED_LOAD_IC:
- return Isolate::Current()->builtins()->KeyedLoadIC_DebugBreak();
+ return isolate->builtins()->KeyedLoadIC_DebugBreak();
case Code::KEYED_STORE_IC:
- return Isolate::Current()->builtins()->KeyedStoreIC_DebugBreak();
+ return isolate->builtins()->KeyedStoreIC_DebugBreak();
default:
UNREACHABLE();
}
}
if (RelocInfo::IsConstructCall(mode)) {
- Handle<Code> result =
- Isolate::Current()->builtins()->ConstructCall_DebugBreak();
- return result;
+ if (code->has_function_cache()) {
+ return isolate->builtins()->CallConstructStub_Recording_DebugBreak();
+ } else {
+ return isolate->builtins()->CallConstructStub_DebugBreak();
+ }
}
if (code->kind() == Code::STUB) {
ASSERT(code->major_key() == CodeStub::CallFunction);
- Handle<Code> result =
- Isolate::Current()->builtins()->CallFunctionStub_DebugBreak();
- return result;
+ if (code->has_function_cache()) {
+ return isolate->builtins()->CallFunctionStub_Recording_DebugBreak();
+ } else {
+ return isolate->builtins()->CallFunctionStub_DebugBreak();
+ }
}
UNREACHABLE();
=======================================
--- /branches/bleeding_edge/src/debug.h Fri Jan 13 05:09:52 2012
+++ /branches/bleeding_edge/src/debug.h Fri Jan 27 08:09:20 2012
@@ -402,9 +402,11 @@
static void GenerateStoreICDebugBreak(MacroAssembler* masm);
static void GenerateKeyedLoadICDebugBreak(MacroAssembler* masm);
static void GenerateKeyedStoreICDebugBreak(MacroAssembler* masm);
- static void GenerateConstructCallDebugBreak(MacroAssembler* masm);
static void GenerateReturnDebugBreak(MacroAssembler* masm);
static void GenerateCallFunctionStubDebugBreak(MacroAssembler* masm);
+ static void GenerateCallFunctionStubRecordDebugBreak(MacroAssembler*
masm);
+ static void GenerateCallConstructStubDebugBreak(MacroAssembler* masm);
+ static void GenerateCallConstructStubRecordDebugBreak(MacroAssembler*
masm);
static void GenerateSlotDebugBreak(MacroAssembler* masm);
static void GeneratePlainReturnLiveEdit(MacroAssembler* masm);
=======================================
--- /branches/bleeding_edge/src/ia32/debug-ia32.cc Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/ia32/debug-ia32.cc Fri Jan 27 08:09:20 2012
@@ -222,30 +222,25 @@
}
-void Debug::GenerateConstructCallDebugBreak(MacroAssembler* masm) {
+void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
// Register state just before return from JS function (from
codegen-ia32.cc).
- // eax is the actual number of arguments not encoded as a smi see comment
- // above IC call.
// ----------- S t a t e -------------
- // -- eax: number of arguments (not smi)
- // -- ebx: cache cell for call target
- // -- edi: constructor function
+ // -- eax: return value
// -----------------------------------
- // The number of arguments in eax is not smi encoded.
- Generate_DebugBreakCallHelper(masm, ebx.bit() | edi.bit(), eax.bit(),
false);
+ Generate_DebugBreakCallHelper(masm, eax.bit(), 0, true);
}
-void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
- // Register state just before return from JS function (from
codegen-ia32.cc).
+void Debug::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
+ // Register state for CallFunctionStub (from code-stubs-ia32.cc).
// ----------- S t a t e -------------
- // -- eax: return value
+ // -- edi: function
// -----------------------------------
- Generate_DebugBreakCallHelper(masm, eax.bit(), 0, true);
+ Generate_DebugBreakCallHelper(masm, edi.bit(), 0, false);
}
-void Debug::GenerateCallFunctionStubDebugBreak(MacroAssembler* masm) {
+void Debug::GenerateCallFunctionStubRecordDebugBreak(MacroAssembler* masm)
{
// Register state for CallFunctionStub (from code-stubs-ia32.cc).
// ----------- S t a t e -------------
// -- ebx: cache cell for call target
@@ -253,6 +248,33 @@
// -----------------------------------
Generate_DebugBreakCallHelper(masm, ebx.bit() | edi.bit(), 0, false);
}
+
+
+void Debug::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
+ // Register state for CallConstructStub (from code-stubs-ia32.cc).
+ // eax is the actual number of arguments not encoded as a smi see comment
+ // above IC call.
+ // ----------- S t a t e -------------
+ // -- eax: number of arguments (not smi)
+ // -- edi: constructor function
+ // -----------------------------------
+ // The number of arguments in eax is not smi encoded.
+ Generate_DebugBreakCallHelper(masm, edi.bit(), eax.bit(), false);
+}
+
+
+void Debug::GenerateCallConstructStubRecordDebugBreak(MacroAssembler*
masm) {
+ // Register state for CallConstructStub (from code-stubs-ia32.cc).
+ // eax is the actual number of arguments not encoded as a smi see comment
+ // above IC call.
+ // ----------- S t a t e -------------
+ // -- eax: number of arguments (not smi)
+ // -- ebx: cache cell for call target
+ // -- edi: constructor function
+ // -----------------------------------
+ // The number of arguments in eax is not smi encoded.
+ Generate_DebugBreakCallHelper(masm, ebx.bit() | edi.bit(), eax.bit(),
false);
+}
void Debug::GenerateSlot(MacroAssembler* masm) {
=======================================
--- /branches/bleeding_edge/src/objects-inl.h Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/objects-inl.h Fri Jan 27 08:09:20 2012
@@ -3200,6 +3200,18 @@
ASSERT(is_to_boolean_ic_stub());
WRITE_BYTE_FIELD(this, kToBooleanTypeOffset, value);
}
+
+
+bool Code::has_function_cache() {
+ ASSERT(kind() == STUB);
+ return READ_BYTE_FIELD(this, kHasFunctionCacheOffset) != 0;
+}
+
+
+void Code::set_has_function_cache(bool flag) {
+ ASSERT(kind() == STUB);
+ WRITE_BYTE_FIELD(this, kHasFunctionCacheOffset, flag);
+}
bool Code::is_inline_cache_stub() {
=======================================
--- /branches/bleeding_edge/src/objects.h Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/objects.h Fri Jan 27 08:09:20 2012
@@ -4201,6 +4201,11 @@
inline byte to_boolean_state();
inline void set_to_boolean_state(byte value);
+ // [has_function_cache]: For kind STUB tells whether there is a function
+ // cache is passed to the stub.
+ inline bool has_function_cache();
+ inline void set_has_function_cache(bool flag);
+
// Get the safepoint entry for the given pc.
SafepointEntry GetSafepointEntry(Address pc);
@@ -4341,6 +4346,7 @@
static const int kBinaryOpTypeOffset = kStubMajorKeyOffset + 1;
static const int kCompareStateOffset = kStubMajorKeyOffset + 1;
static const int kToBooleanTypeOffset = kStubMajorKeyOffset + 1;
+ static const int kHasFunctionCacheOffset = kStubMajorKeyOffset + 1;
static const int kFullCodeFlags = kOptimizableOffset + 1;
class FullCodeFlagsHasDeoptimizationSupportField:
=======================================
--- /branches/bleeding_edge/src/x64/debug-x64.cc Fri Jan 27 05:03:19 2012
+++ /branches/bleeding_edge/src/x64/debug-x64.cc Fri Jan 27 08:09:20 2012
@@ -227,19 +227,6 @@
// -----------------------------------
Generate_DebugBreakCallHelper(masm, rcx.bit(), 0, false);
}
-
-
-void Debug::GenerateConstructCallDebugBreak(MacroAssembler* masm) {
- // Register state just before return from JS function (from
codegen-x64.cc).
- // rax is the actual number of arguments not encoded as a smi, see
comment
- // above IC call.
- // ----------- S t a t e -------------
- // -- rax: number of arguments
- // -- rbx: cache cell for call target
- // -----------------------------------
- // The number of arguments in rax is not smi encoded.
- Generate_DebugBreakCallHelper(masm, rbx.bit() | rdi.bit(), rax.bit(),
false);
-}
void Debug::GenerateReturnDebugBreak(MacroAssembler* masm) {
@@ -258,6 +245,41 @@
// -----------------------------------
Generate_DebugBreakCallHelper(masm, rdi.bit(), 0, false);
}
+
+
+void Debug::GenerateCallFunctionStubRecordDebugBreak(MacroAssembler* masm)
{
+ // Register state for CallFunctionStub (from code-stubs-x64.cc).
+ // ----------- S t a t e -------------
+ // -- rdi : function
+ // -- rbx: cache cell for call target
+ // -----------------------------------
+ Generate_DebugBreakCallHelper(masm, rbx.bit() | rdi.bit(), 0, false);
+}
+
+
+void Debug::GenerateCallConstructStubDebugBreak(MacroAssembler* masm) {
+ // Register state for CallConstructStub (from code-stubs-x64.cc).
+ // rax is the actual number of arguments not encoded as a smi, see
comment
+ // above IC call.
+ // ----------- S t a t e -------------
+ // -- rax: number of arguments
+ // -----------------------------------
+ // The number of arguments in rax is not smi encoded.
+ Generate_DebugBreakCallHelper(masm, rdi.bit(), rax.bit(), false);
+}
+
+
+void Debug::GenerateCallConstructStubRecordDebugBreak(MacroAssembler*
masm) {
+ // Register state for CallConstructStub (from code-stubs-x64.cc).
+ // rax is the actual number of arguments not encoded as a smi, see
comment
+ // above IC call.
+ // ----------- S t a t e -------------
+ // -- rax: number of arguments
+ // -- rbx: cache cell for call target
+ // -----------------------------------
+ // The number of arguments in rax is not smi encoded.
+ Generate_DebugBreakCallHelper(masm, rbx.bit() | rdi.bit(), rax.bit(),
false);
+}
void Debug::GenerateSlot(MacroAssembler* masm) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
