kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Minor changes to disasm output. Fix GCC warning.

This commit is contained in:
Maxime Chevalier-Boisvert 2021-01-22 15:24:04 -05:00 committed by Alan Wu
parent 25234f8a1c
commit 8a61e848c0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ujit.rb
View File

@ -1,5 +1,9 @@
module UJIT module UJIT
def self.disasm(iseq) def self.disasm(iseq)
if iseq.is_a? Method
iseq = RubyVM::InstructionSequence.of(iseq)
end
blocks = UJIT.blocks_for(iseq) blocks = UJIT.blocks_for(iseq)
return if blocks.empty? return if blocks.empty?
@ -10,13 +14,14 @@ module UJIT
str << iseq.disasm str << iseq.disasm
str << "\n" str << "\n"
# Sort the blocks by increasing addresses
blocks.sort_by(&:address).reverse.each do |block| blocks.sort_by(&:address).reverse.each do |block|
str << "== ISEQ RANGE: #{block.iseq_start_index} -> #{block.iseq_end_index} ".ljust(80, "=") str << "== ISEQ RANGE: [#{block.iseq_start_index},#{block.iseq_end_index}[ ".ljust(80, "=")
str << "\n" str << "\n"
cs.disasm(block.code, 0).each do |i| cs.disasm(block.code, 0).each do |i|
str << sprintf( str << sprintf(
"\t0x%<address>x:\t%<instruction>s\t%<details>s\n", "\t%<address>04X:\t%<instruction>s\t%<details>s\n",
address: i.address, address: i.address,
instruction: i.mnemonic, instruction: i.mnemonic,
details: i.op_str details: i.op_str

2
ujit_iface.c
View File

@ -397,7 +397,7 @@ ujit_disasm(VALUE self, VALUE code, VALUE from)
cs_insn *insns; cs_insn *insns;
TypedData_Get_Struct(self, csh, &ujit_disasm_type, handle); TypedData_Get_Struct(self, csh, &ujit_disasm_type, handle);
count = cs_disasm(*handle, (uint8_t *)StringValuePtr(code), RSTRING_LEN(code), NUM2INT(from), 0, &insns); count = cs_disasm(*handle, (uint8_t*)StringValuePtr(code), RSTRING_LEN(code), NUM2INT(from), 0, &insns);
VALUE insn_list = rb_ary_new_capa(count); VALUE insn_list = rb_ary_new_capa(count);
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {