RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:27:35 +00:00
Code Issues Activity Actions

LibDebug: Move Dwarf::LineProgram into Dwarf::CompilationUnit

Browse source 
Previously, the LineProgram objects were short-lived, and only created
inside DebugInfo::prepare_lines() to create a vector of sorted LineInfo
data.

However, Dwarf::LineProgram also contains other useful data, such as
index-to-string mapping of source directories and filenames.

This commit makes each Dwarf::CompilationUnit own its
Dwarf::LineProgram.
DebugInfo::prepare_lines() then iterates over the compilation units to
prepare its sorted vector of lines.
This commit is contained in:
Itamar 2021-06-18 15:25:27 +03:00 • committed by Andreas Kling
parent e9e4358a93
commit 0d89f70b66
6 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibDebug/Dwarf/CompilationUnit.h
View file

@ -7,6 +7,8 @@
#pragma once
#include "AbbreviationsMap.h"
#include "DIE.h"
#include "LineProgram.h"
#include <AK/Noncopyable.h>
#include <AK/Types.h>
@ -14,13 +16,14 @@ namespace Debug::Dwarf {
class DwarfInfo;
class DIE;
class LineProgram;
class CompilationUnit {
AK_MAKE_NONCOPYABLE(CompilationUnit);
AK_MAKE_NONMOVABLE(CompilationUnit);
public:
CompilationUnit(const DwarfInfo& dwarf_info, u32 offset, const CompilationUnitHeader&);
CompilationUnit(const DwarfInfo& dwarf_info, u32 offset, const CompilationUnitHeader&, NonnullOwnPtr<LineProgram>&& line_program);
u32 offset() const { return m_offset; }
u32 size() const { return m_header.length() + sizeof(u32); }
@ -30,12 +33,14 @@ public:
const DwarfInfo& dwarf_info() const { return m_dwarf_info; }
const AbbreviationsMap& abbreviations_map() const { return m_abbreviations; }
const LineProgram& line_program() const { return *m_line_program; }
private:
const DwarfInfo& m_dwarf_info;
u32 m_offset { 0 };
CompilationUnitHeader m_header;
AbbreviationsMap m_abbreviations;
NonnullOwnPtr<LineProgram> m_line_program;
};
}