dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm/bytecode] Improve bytecode disassembler.

Browse Source 
Fix decoding of some A_E bytecodes that were not displaying the second operand.
Support pc relative bytecode disassembly.
Display local variables info in disassembly along with variable descriptors.

Change-Id: I75eabba0d40ee026d35c0db3d515a8436f468a8d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107523
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Régis Crelier <regis@google.com>
This commit is contained in:
Régis Crelier
2019-06-27 17:19:37 +00:00
committed by commit-bot@chromium.org
parent 654f42d427
commit a6cd110577
2 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/compiler/assembler/disassembler_kbc.cc
+42 -10
View File
@@ -337,7 +337,8 @@ void KernelBytecodeDisassembler::Disassemble(uword start,
sizeof(human_buffer), &instruction_length, bytecode,
&object, pc);
formatter->ConsumeInstruction(hex_buffer, sizeof(hex_buffer), human_buffer,
sizeof(human_buffer), object, pc);
sizeof(human_buffer), object,
FLAG_disassemble_relative ? pc - start : pc);
pc += instruction_length;
}
#else
@@ -352,7 +353,8 @@ void KernelBytecodeDisassembler::Disassemble(const Function& function) {
Zone* zone = Thread::Current()->zone();
const Bytecode& bytecode = Bytecode::Handle(zone, function.bytecode());
THR_Print("Bytecode for function '%s' {\n", function_fullname);
uword start = bytecode.PayloadStart();
const uword start = bytecode.PayloadStart();
const uword base = FLAG_disassemble_relative ? 0 : start;
DisassembleToStdout stdout_formatter;
LogBlock lb;
Disassemble(start, start + bytecode.Size(), &stdout_formatter, bytecode);
@@ -374,22 +376,47 @@ void KernelBytecodeDisassembler::Disassemble(const Function& function) {
const int addr_width = (kBitsPerWord / 4) + 2;
// "*" in a printf format specifier tells it to read the field width from
// the printf argument list.
THR_Print("%-*s\ttok-ix\n", addr_width, "pc");
THR_Print("%-*s\tpos\n", addr_width, "pc");
kernel::BytecodeSourcePositionsIterator iter(zone, bytecode);
while (iter.MoveNext()) {
THR_Print("%#-*" Px "\t%s\n", addr_width,
bytecode.PayloadStart() + iter.PcOffset(),
THR_Print("%#-*" Px "\t%s\n", addr_width, base + iter.PcOffset(),
iter.TokenPos().ToCString());
}
THR_Print("}\n");
}
THR_Print("Exception Handlers for function '%s' {\n", function_fullname);
const ExceptionHandlers& handlers =
ExceptionHandlers::Handle(zone, bytecode.exception_handlers());
THR_Print("%s}\n", handlers.ToCString());
if (FLAG_print_variable_descriptors && bytecode.HasLocalVariablesInfo()) {
THR_Print("Local variables info for function '%s' {\n", function_fullname);
kernel::BytecodeLocalVariablesIterator iter(zone, bytecode);
while (iter.MoveNext()) {
switch (iter.Kind()) {
case kernel::BytecodeLocalVariablesIterator::kScope: {
THR_Print("scope 0x%" Px "-0x%" Px " pos %s-%s\tlev %" Pd "\n",
base + iter.StartPC(), base + iter.EndPC(),
iter.StartTokenPos().ToCString(),
iter.EndTokenPos().ToCString(), iter.ContextLevel());
} break;
case kernel::BytecodeLocalVariablesIterator::kVariableDeclaration: {
THR_Print("var 0x%" Px "-0x%" Px " pos %s-%s\tidx %" Pd
"\tdecl %s\t%s %s %s\n",
base + iter.StartPC(), base + iter.EndPC(),
iter.StartTokenPos().ToCString(),
iter.EndTokenPos().ToCString(), iter.Index(),
iter.DeclarationTokenPos().ToCString(),
String::Handle(
zone, AbstractType::Handle(zone, iter.Type()).Name())
.ToCString(),
String::Handle(zone, iter.Name()).ToCString(),
iter.IsCaptured() ? "captured" : "");
} break;
case kernel::BytecodeLocalVariablesIterator::kContextVariable: {
THR_Print("ctxt 0x%" Px "\tidx %" Pd "\n", base + iter.StartPC(),
iter.Index());
} break;
}
}
THR_Print("}\n");
if (FLAG_print_variable_descriptors) {
THR_Print("Local variable descriptors for function '%s' {\n",
function_fullname);
const auto& var_descriptors =
@@ -397,6 +424,11 @@ void KernelBytecodeDisassembler::Disassemble(const Function& function) {
THR_Print("%s}\n", var_descriptors.ToCString());
}
THR_Print("Exception Handlers for function '%s' {\n", function_fullname);
const ExceptionHandlers& handlers =
ExceptionHandlers::Handle(zone, bytecode.exception_handlers());
THR_Print("%s}\n", handlers.ToCString());
#else
UNREACHABLE();
#endif
runtime/vm/constants_kbc.h
+8 -8
View File
@@ -579,18 +579,18 @@ namespace dart {
V(CreateArrayTOS, 0, ORDN, ___, ___, ___) \
V(AllocateClosure, D, ORDN, lit, ___, ___) \
V(AllocateClosure_Wide, D, WIDE, lit, ___, ___) \
V(AllocateContext, A_E, ORDN, num, ___, ___) \
V(AllocateContext_Wide, A_E, WIDE, num, ___, ___) \
V(CloneContext, A_E, ORDN, num, ___, ___) \
V(CloneContext_Wide, A_E, WIDE, num, ___, ___) \
V(AllocateContext, A_E, ORDN, num, num, ___) \
V(AllocateContext_Wide, A_E, WIDE, num, num, ___) \
V(CloneContext, A_E, ORDN, num, num, ___) \
V(CloneContext_Wide, A_E, WIDE, num, num, ___) \
V(LoadContextParent, 0, ORDN, ___, ___, ___) \
V(StoreContextParent, 0, ORDN, ___, ___, ___) \
V(LoadContextVar, A_E, ORDN, num, ___, ___) \
V(LoadContextVar_Wide, A_E, WIDE, num, ___, ___) \
V(LoadContextVar, A_E, ORDN, num, num, ___) \
V(LoadContextVar_Wide, A_E, WIDE, num, num, ___) \
V(Unused04, 0, RESV, ___, ___, ___) \
V(Unused05, 0, RESV, ___, ___, ___) \
V(StoreContextVar, A_E, ORDN, num, ___, ___) \
V(StoreContextVar_Wide, A_E, WIDE, num, ___, ___) \
V(StoreContextVar, A_E, ORDN, num, num, ___) \
V(StoreContextVar_Wide, A_E, WIDE, num, num, ___) \
V(PushConstant, D, ORDN, lit, ___, ___) \
V(PushConstant_Wide, D, WIDE, lit, ___, ___) \
V(Unused06, 0, RESV, ___, ___, ___) \