Changed the disassembler formatting
Changed the formatting of the comment in the disassembler output to contain more information on code targets. Review URL: http://codereview.chromium.org/3099 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@327 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
cd50f9f865
commit
390b5cb185
@ -197,55 +197,72 @@ static int DecodeIt(FILE* f,
|
||||
out.AddPadding(' ', kRelocInfoPosition);
|
||||
}
|
||||
|
||||
if (is_position(relocinfo.rmode())) {
|
||||
out.AddFormatted(" ;; debug: statement %d", relocinfo.data());
|
||||
} else if (relocinfo.rmode() == embedded_object) {
|
||||
RelocMode rmode = relocinfo.rmode();
|
||||
if (is_position(rmode)) {
|
||||
if (is_statement_position(rmode)) {
|
||||
out.AddFormatted(" ;; debug: statement %d", relocinfo.data());
|
||||
} else {
|
||||
out.AddFormatted(" ;; debug: position %d", relocinfo.data());
|
||||
}
|
||||
} else if (rmode == embedded_object) {
|
||||
HeapStringAllocator allocator;
|
||||
StringStream accumulator(&allocator);
|
||||
relocinfo.target_object()->ShortPrint(&accumulator);
|
||||
SmartPointer<char> obj_name = accumulator.ToCString();
|
||||
out.AddFormatted(" ;; object: %s", *obj_name);
|
||||
} else if (relocinfo.rmode() == external_reference) {
|
||||
} else if (rmode == external_reference) {
|
||||
const char* reference_name =
|
||||
ref_encoder.NameOfAddress(*relocinfo.target_reference_address());
|
||||
out.AddFormatted(" ;; external reference (%s)", reference_name);
|
||||
} else {
|
||||
out.AddFormatted(" ;; %s",
|
||||
RelocInfo::RelocModeName(relocinfo.rmode()));
|
||||
if (is_code_target(relocinfo.rmode())) {
|
||||
Code* code = Debug::GetCodeTarget(relocinfo.target_address());
|
||||
Code::Kind kind = code->kind();
|
||||
if (kind == Code::STUB) {
|
||||
// Reverse lookup required as the minor key cannot be retrieved
|
||||
// from the code object.
|
||||
Object* obj = Heap::code_stubs()->SlowReverseLookup(code);
|
||||
if (obj != Heap::undefined_value()) {
|
||||
ASSERT(obj->IsSmi());
|
||||
// Get the STUB key and extract major and minor key.
|
||||
uint32_t key = Smi::cast(obj)->value();
|
||||
uint32_t minor_key = CodeStub::MinorKeyFromKey(key);
|
||||
ASSERT(code->major_key() == CodeStub::MajorKeyFromKey(key));
|
||||
out.AddFormatted(" (%s, %s, ",
|
||||
Code::Kind2String(kind),
|
||||
CodeStub::MajorName(code->major_key()));
|
||||
switch (code->major_key()) {
|
||||
case CodeStub::CallFunction:
|
||||
out.AddFormatted("argc = %d)", minor_key);
|
||||
break;
|
||||
case CodeStub::Runtime: {
|
||||
const char* name =
|
||||
RuntimeStub::GetNameFromMinorKey(minor_key);
|
||||
out.AddFormatted("%s)", name);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
out.AddFormatted("minor: %d)", minor_key);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
out.AddFormatted(" (%s)", Code::Kind2String(kind));
|
||||
}
|
||||
} else if (is_code_target(rmode)) {
|
||||
out.AddFormatted(" ;; code:");
|
||||
if (rmode == js_construct_call) {
|
||||
out.AddFormatted(" constructor,");
|
||||
}
|
||||
Code* code = Debug::GetCodeTarget(relocinfo.target_address());
|
||||
Code::Kind kind = code->kind();
|
||||
if (code->is_inline_cache_stub()) {
|
||||
if (rmode == code_target_context) {
|
||||
out.AddFormatted(" contextual,");
|
||||
}
|
||||
InlineCacheState ic_state = code->ic_state();
|
||||
out.AddFormatted(" %s, %s", Code::Kind2String(kind),
|
||||
Code::ICState2String(ic_state));
|
||||
if (kind == Code::CALL_IC) {
|
||||
out.AddFormatted(", argc = %d", code->arguments_count());
|
||||
}
|
||||
} else if (kind == Code::STUB) {
|
||||
// Reverse lookup required as the minor key cannot be retrieved
|
||||
// from the code object.
|
||||
Object* obj = Heap::code_stubs()->SlowReverseLookup(code);
|
||||
if (obj != Heap::undefined_value()) {
|
||||
ASSERT(obj->IsSmi());
|
||||
// Get the STUB key and extract major and minor key.
|
||||
uint32_t key = Smi::cast(obj)->value();
|
||||
uint32_t minor_key = CodeStub::MinorKeyFromKey(key);
|
||||
ASSERT(code->major_key() == CodeStub::MajorKeyFromKey(key));
|
||||
out.AddFormatted(" %s, %s, ",
|
||||
Code::Kind2String(kind),
|
||||
CodeStub::MajorName(code->major_key()));
|
||||
switch (code->major_key()) {
|
||||
case CodeStub::CallFunction:
|
||||
out.AddFormatted("argc = %d", minor_key);
|
||||
break;
|
||||
case CodeStub::Runtime: {
|
||||
const char* name =
|
||||
RuntimeStub::GetNameFromMinorKey(minor_key);
|
||||
out.AddFormatted("%s", name);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
out.AddFormatted("minor: %d", minor_key);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
out.AddFormatted(" %s", Code::Kind2String(kind));
|
||||
}
|
||||
} else {
|
||||
out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode));
|
||||
}
|
||||
}
|
||||
out.AddString("\n");
|
||||
|
@ -4197,6 +4197,21 @@ const char* Code::Kind2String(Kind kind) {
|
||||
}
|
||||
|
||||
|
||||
const char* Code::ICState2String(InlineCacheState state) {
|
||||
switch (state) {
|
||||
case UNINITIALIZED: return "UNINITIALIZED";
|
||||
case PREMONOMORPHIC: return "PREMONOMORPHIC";
|
||||
case MONOMORPHIC: return "MONOMORPHIC";
|
||||
case MONOMORPHIC_PROTOTYPE_FAILURE: return "MONOMORPHIC_PROTOTYPE_FAILURE";
|
||||
case MEGAMORPHIC: return "MEGAMORPHIC";
|
||||
case DEBUG_BREAK: return "DEBUG_BREAK";
|
||||
case DEBUG_PREPARE_STEP_IN: return "DEBUG_PREPARE_STEP_IN";
|
||||
}
|
||||
UNREACHABLE();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
void Code::Disassemble() {
|
||||
PrintF("kind = %s", Kind2String(kind()));
|
||||
|
||||
|
@ -2063,6 +2063,7 @@ class Code: public HeapObject {
|
||||
#ifdef ENABLE_DISASSEMBLER
|
||||
// Printing
|
||||
static const char* Kind2String(Kind kind);
|
||||
static const char* ICState2String(InlineCacheState state);
|
||||
void Disassemble();
|
||||
#endif // ENABLE_DISASSEMBLER
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user