diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-02 00:57:50 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-02 00:57:50 +0000 |
| commit | 18c40b16d0d4d7b6bb7e0a60c5309b5d3ab5c4df (patch) | |
| tree | 3200bc35d6dce7cafcbd4967854d69f86b0114b3 | |
| parent | 8bfc46a117b2956e321f12e6e96a3958a60ac6ed (diff) | |
tool/ruby_vm/views/_insn_name_info.erb: Auto-detect the longest insn name
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | iseq.c | 3 | ||||
| -rw-r--r-- | tool/ruby_vm/views/_insn_name_info.erb | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -1831,7 +1831,8 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos, insn_name_buff = insn_name(insn); if (1) { - rb_str_catf(str, "%04"PRIuSIZE" %-28s ", pos, insn_name_buff); + extern const int rb_vm_max_insn_name_size; + rb_str_catf(str, "%04"PRIuSIZE" %-*s ", pos, rb_vm_max_insn_name_size, insn_name_buff); } else { rb_str_catf(str, "%04"PRIuSIZE" %-28.*s ", pos, diff --git a/tool/ruby_vm/views/_insn_name_info.erb b/tool/ruby_vm/views/_insn_name_info.erb index 581869fca8..f690a7b0c7 100644 --- a/tool/ruby_vm/views/_insn_name_info.erb +++ b/tool/ruby_vm/views/_insn_name_info.erb @@ -23,6 +23,7 @@ const unsigned short rb_vm_insn_name_offset[] = { <%= d.map {|i| sprintf("%4d", i) }.join(', ') %>, % end }; +const int rb_vm_max_insn_name_size = <%= RubyVM::Instructions.map {|i| i.name.size }.max %>; ASSERT_VM_INSTRUCTION_SIZE(rb_vm_insn_name_offset); PACKED_STRUCT(struct rb_vm_insn_name_info_tag { |