Skip to content

Read all DWARF abbreviations tables in a single pass #15515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
straight-shoota merged 1 commit into from
Feb 26, 2025
Merged

Read all DWARF abbreviations tables in a single pass #15515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/crystal/dwarf/abbrev.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,9 @@ module Crystal
@children
end

def self.read(io : IO::FileDescriptor, offset)
def self.read(io : IO) : Array(Abbrev)
abbreviations = [] of Abbrev

io.seek(io.tell + offset)
loop do
code = DWARF.read_unsigned_leb128(io)
break if code == 0
Expand Down
6 changes: 1 addition & 5 deletions src/crystal/dwarf/info.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ module Crystal

alias Value = Bool | Int32 | Int64 | Slice(UInt8) | String | UInt16 | UInt32 | UInt64 | UInt8 | UInt128

def read_abbreviations(io)
@abbreviations = Abbrev.read(io, debug_abbrev_offset)
end

def each(&)
end_offset = @offset + @unit_length
attributes = [] of {AT, FORM, Value}
Expand All @@ -62,7 +58,7 @@ module Crystal
code = DWARF.read_unsigned_leb128(@io)
attributes.clear

if abbrev = abbreviations[code &- 1]? # abbreviations.find { |a| a.code == abbrev }
if abbrev = @abbreviations.try &.[code &- 1]? # @abbreviations.try &.find { |a| a.code == abbrev }
abbrev.attributes.each do |attr|
value = read_attribute_value(attr.form, attr)
attributes << {attr.at, attr.form, value}
Expand Down
14 changes: 12 additions & 2 deletions src/exception/call_stack/elf.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,24 @@ struct Exception::CallStack
@@dwarf_line_numbers = Crystal::DWARF::LineNumbers.new(io, sh.size, base_address, strings, line_strings)
end

abbrevs_tables = image.read_section?(".debug_abbrev") do |sh, io|
all = {} of Int64 => Array(Crystal::DWARF::Abbrev)
while (offset = io.pos - sh.offset) < sh.size
all[offset] = Crystal::DWARF::Abbrev.read(io)
end
all
end

image.read_section?(".debug_info") do |sh, io|
names = [] of {LibC::SizeT, LibC::SizeT, String}

while (offset = io.pos - sh.offset) < sh.size
info = Crystal::DWARF::Info.new(io, offset)

image.read_section?(".debug_abbrev") do |sh, io|
info.read_abbreviations(io)
if abbrevs_tables
if abbreviations = abbrevs_tables[info.debug_abbrev_offset]?
info.abbreviations = abbreviations
end
end

parse_function_names_from_dwarf(info, strings, line_strings) do |low_pc, high_pc, name|
Expand Down
14 changes: 12 additions & 2 deletions src/exception/call_stack/mach_o.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,24 @@ struct Exception::CallStack
@@dwarf_line_numbers = Crystal::DWARF::LineNumbers.new(io, sh.size, strings: strings, line_strings: line_strings)
end

abbrevs_tables = mach_o.read_section?("__debug_abbrev") do |sh, io|
all = {} of Int64 => Array(Crystal::DWARF::Abbrev)
while (offset = io.pos - sh.offset) < sh.size
all[offset] = Crystal::DWARF::Abbrev.read(io)
end
all
end

mach_o.read_section?("__debug_info") do |sh, io|
names = [] of {LibC::SizeT, LibC::SizeT, String}

while (offset = io.pos - sh.offset) < sh.size
info = Crystal::DWARF::Info.new(io, offset)

mach_o.read_section?("__debug_abbrev") do |sh, io|
info.read_abbreviations(io)
if abbrevs_tables
if abbreviations = abbrevs_tables[info.debug_abbrev_offset]?
info.abbreviations = abbreviations
end
end

parse_function_names_from_dwarf(info, strings, line_strings) do |low_pc, high_pc, name|
Expand Down