OpenJDK / portola / portola
changeset 55363:03af124751f5
8225429: Regression in disassembly quality
Reviewed-by: never
| author | aph |
|---|---|
| date | Mon, 10 Jun 2019 10:11:42 +0100 |
| parents | d9a157f6fd71 |
| children | 1fef7d9309a9 |
| files | src/hotspot/share/asm/codeBuffer.hpp src/hotspot/share/compiler/abstractDisassembler.cpp src/hotspot/share/compiler/disassembler.cpp |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/asm/codeBuffer.hpp Tue Jun 11 07:31:47 2019 -0400 +++ b/src/hotspot/share/asm/codeBuffer.hpp Mon Jun 10 10:11:42 2019 +0100 @@ -413,6 +413,7 @@ || PrintMethodHandleStubs || PrintInterpreter || PrintSignatureHandlers + || UnlockDiagnosticVMOptions ); }
--- a/src/hotspot/share/compiler/abstractDisassembler.cpp Tue Jun 11 07:31:47 2019 -0400 +++ b/src/hotspot/share/compiler/abstractDisassembler.cpp Mon Jun 10 10:11:42 2019 +0100 @@ -38,12 +38,12 @@ bool AbstractDisassembler::_show_data_hex = true; bool AbstractDisassembler::_show_data_int = false; bool AbstractDisassembler::_show_data_float = false; -bool AbstractDisassembler::_align_instr = false; +bool AbstractDisassembler::_align_instr = true; bool AbstractDisassembler::_show_pc = true; bool AbstractDisassembler::_show_offset = false; -bool AbstractDisassembler::_show_structs = false; -bool AbstractDisassembler::_show_comment = false; -bool AbstractDisassembler::_show_block_comment = false; +bool AbstractDisassembler::_show_structs = true; +bool AbstractDisassembler::_show_comment = true; +bool AbstractDisassembler::_show_block_comment = true; // set "true" to see what's in memory bit by bit // might prove cumbersome on platforms where instr_len is hard to find out
--- a/src/hotspot/share/compiler/disassembler.cpp Tue Jun 11 07:31:47 2019 -0400 +++ b/src/hotspot/share/compiler/disassembler.cpp Mon Jun 10 10:11:42 2019 +0100 @@ -147,7 +147,10 @@ if (AbstractDisassembler::show_comment()) { if ((_nm != NULL) && _nm->has_code_comment(pc0, pc)) { - _nm->print_code_comment_on(st, _post_decode_alignment, pc0, pc); + _nm->print_code_comment_on + (st, + _post_decode_alignment ? _post_decode_alignment : COMMENT_COLUMN, + pc0, pc); // this calls reloc_string_for which calls oop::print_value_on } print_hook_comments(pc0, _nm != NULL);