Skip to content
This repository has been archived by the owner on Jan 1, 2023. It is now read-only.

Commit

Permalink
[ObjectYAML] Remove DWARF from class names
Browse files Browse the repository at this point in the history 
Since all the DWARF classes are in a DWARFYAML namespace having every class start with DWARF seems like a bit of overkill.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@289080 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Chris Bieneman committed Dec 8, 2016
1 parent b071d36 commit 1ba1a8b
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 36 deletions.
32 changes: 16 additions & 16 deletions include/llvm/ObjectYAML/DWARFYAML.h
View file
Expand Up @@ -23,48 +23,48 @@
namespace llvm {
namespace DWARFYAML {

struct DWARFAttributeAbbrev {
struct AttributeAbbrev {
llvm::dwarf::Attribute Attribute;
llvm::dwarf::Form Form;
};

struct DWARFAbbrev {
struct Abbrev {
llvm::yaml::Hex32 Code;
llvm::dwarf::Tag Tag;
llvm::dwarf::Constants Children;
std::vector<DWARFAttributeAbbrev> Attributes;
std::vector<AttributeAbbrev> Attributes;
};

struct DWARFData {
std::vector<DWARFAbbrev> AbbrevDecls;
struct Data {
std::vector<Abbrev> AbbrevDecls;
std::vector<StringRef> DebugStrings;

bool isEmpty() const;
};
};

} // namespace llvm::DWARFYAML
} // namespace llvm

LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::StringRef)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::DWARFAttributeAbbrev)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::DWARFAbbrev)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::AttributeAbbrev)
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::DWARFYAML::Abbrev)

namespace llvm {
namespace yaml {

template <> struct MappingTraits<DWARFYAML::DWARFData> {
static void mapping(IO &IO, DWARFYAML::DWARFData &DWARF);
template <> struct MappingTraits<DWARFYAML::Data> {
static void mapping(IO &IO, DWARFYAML::Data &DWARF);
};

template <> struct MappingTraits<DWARFYAML::DWARFAbbrev> {
static void mapping(IO &IO, DWARFYAML::DWARFAbbrev &Abbrev);
template <> struct MappingTraits<DWARFYAML::Abbrev> {
static void mapping(IO &IO, DWARFYAML::Abbrev &Abbrev);
};

template <> struct MappingTraits<DWARFYAML::DWARFAttributeAbbrev> {
static void mapping(IO &IO, DWARFYAML::DWARFAttributeAbbrev &AttAbbrev);
template <> struct MappingTraits<DWARFYAML::AttributeAbbrev> {
static void mapping(IO &IO, DWARFYAML::AttributeAbbrev &AttAbbrev);
};

#define HANDLE_DW_TAG(unused, name) \
#define HANDLE_DW_TAG(unused, name) \
io.enumCase(value, "DW_TAG_" #name, dwarf::DW_TAG_##name);

template <> struct ScalarEnumerationTraits<dwarf::Tag> {
Expand All @@ -84,7 +84,7 @@ template <> struct ScalarEnumerationTraits<dwarf::Attribute> {
}
};

#define HANDLE_DW_FORM(unused, name) \
#define HANDLE_DW_FORM(unused, name) \
io.enumCase(value, "DW_FORM_" #name, dwarf::DW_FORM_##name);

template <> struct ScalarEnumerationTraits<dwarf::Form> {
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/ObjectYAML/MachOYAML.h
View file
Expand Up @@ -110,7 +110,7 @@ struct Object {
std::vector<LoadCommand> LoadCommands;
std::vector<Section> Sections;
LinkEditData LinkEdit;
DWARFYAML::DWARFData DWARF;
DWARFYAML::Data DWARF;
};

struct FatHeader {
Expand Down
14 changes: 7 additions & 7 deletions lib/ObjectYAML/DWARFYAML.cpp
View file
Expand Up @@ -16,28 +16,28 @@

namespace llvm {

bool DWARFYAML::DWARFData::isEmpty() const {
bool DWARFYAML::Data::isEmpty() const {
return 0 == DebugStrings.size() + AbbrevDecls.size();
}

namespace yaml {

void MappingTraits<DWARFYAML::DWARFData>::mapping(
IO &IO, DWARFYAML::DWARFData &DWARF) {
void MappingTraits<DWARFYAML::Data>::mapping(
IO &IO, DWARFYAML::Data &DWARF) {
IO.mapOptional("debug_str", DWARF.DebugStrings);
IO.mapOptional("debug_abbrev", DWARF.AbbrevDecls);
}

void MappingTraits<DWARFYAML::DWARFAbbrev>::mapping(
IO &IO, DWARFYAML::DWARFAbbrev &Abbrev) {
void MappingTraits<DWARFYAML::Abbrev>::mapping(
IO &IO, DWARFYAML::Abbrev &Abbrev) {
IO.mapRequired("Code", Abbrev.Code);
IO.mapRequired("Tag", Abbrev.Tag);
IO.mapRequired("Children", Abbrev.Children);
IO.mapRequired("Attributes", Abbrev.Attributes);
}

void MappingTraits<DWARFYAML::DWARFAttributeAbbrev>::mapping(
IO &IO, DWARFYAML::DWARFAttributeAbbrev &AttAbbrev) {
void MappingTraits<DWARFYAML::AttributeAbbrev>::mapping(
IO &IO, DWARFYAML::AttributeAbbrev &AttAbbrev) {
IO.mapRequired("Attribute", AttAbbrev.Attribute);
IO.mapRequired("Form", AttAbbrev.Form);
}
Expand Down
10 changes: 5 additions & 5 deletions tools/obj2yaml/dwarf2yaml.cpp
View file
Expand Up @@ -13,18 +13,18 @@

using namespace llvm;

void dumpDebugAbbrev(DWARFContextInMemory &DCtx, DWARFYAML::DWARFData &Y) {
void dumpDebugAbbrev(DWARFContextInMemory &DCtx, DWARFYAML::Data &Y) {
auto AbbrevSetPtr = DCtx.getDebugAbbrev();
if (AbbrevSetPtr) {
for (auto AbbrvDeclSet : *AbbrevSetPtr) {
for (auto AbbrvDecl : AbbrvDeclSet.second) {
DWARFYAML::DWARFAbbrev Abbrv;
DWARFYAML::Abbrev Abbrv;
Abbrv.Code = AbbrvDecl.getCode();
Abbrv.Tag = AbbrvDecl.getTag();
Abbrv.Children = AbbrvDecl.hasChildren() ? dwarf::DW_CHILDREN_yes
: dwarf::DW_CHILDREN_no;
for (auto Attribute : AbbrvDecl.attributes()) {
DWARFYAML::DWARFAttributeAbbrev AttAbrv;
DWARFYAML::AttributeAbbrev AttAbrv;
AttAbrv.Attribute = Attribute.Attr;
AttAbrv.Form = Attribute.Form;
Abbrv.Attributes.push_back(AttAbrv);
Expand All @@ -35,7 +35,7 @@ void dumpDebugAbbrev(DWARFContextInMemory &DCtx, DWARFYAML::DWARFData &Y) {
}
}

void dumpDebugStrings(DWARFContextInMemory &DCtx, DWARFYAML::DWARFData &Y) {
void dumpDebugStrings(DWARFContextInMemory &DCtx, DWARFYAML::Data &Y) {
StringRef RemainingTable = DCtx.getStringSection();
while (RemainingTable.size() > 0) {
auto SymbolPair = RemainingTable.split('\0');
Expand All @@ -45,7 +45,7 @@ void dumpDebugStrings(DWARFContextInMemory &DCtx, DWARFYAML::DWARFData &Y) {
}

std::error_code dwarf2yaml(DWARFContextInMemory &DCtx,
DWARFYAML::DWARFData &Y) {
DWARFYAML::Data &Y) {
dumpDebugAbbrev(DCtx, Y);
dumpDebugStrings(DCtx, Y);

Expand Down
4 changes: 2 additions & 2 deletions tools/obj2yaml/obj2yaml.h
View file
Expand Up @@ -28,11 +28,11 @@ std::error_code macho2yaml(llvm::raw_ostream &Out,
namespace llvm {
class DWARFContextInMemory;
namespace DWARFYAML {
struct DWARFData;
struct Data;
}
}

std::error_code dwarf2yaml(llvm::DWARFContextInMemory &DCtx,
llvm::DWARFYAML::DWARFData &Y);
llvm::DWARFYAML::Data &Y);

#endif
4 changes: 2 additions & 2 deletions tools/yaml2obj/yaml2dwarf.cpp
View file
Expand Up @@ -19,14 +19,14 @@

using namespace llvm;

void yaml2debug_str(raw_ostream &OS, const DWARFYAML::DWARFData &DI) {
void yaml2debug_str(raw_ostream &OS, const DWARFYAML::Data &DI) {
for (auto Str : DI.DebugStrings) {
OS.write(Str.data(), Str.size());
OS.write('\0');
}
}

void yaml2debug_abbrev(raw_ostream &OS, const DWARFYAML::DWARFData &DI) {
void yaml2debug_abbrev(raw_ostream &OS, const DWARFYAML::Data &DI) {
for (auto AbbrevDecl : DI.AbbrevDecls) {
encodeULEB128(AbbrevDecl.Code, OS);
encodeULEB128(AbbrevDecl.Tag, OS);
Expand Down
6 changes: 3 additions & 3 deletions tools/yaml2obj/yaml2obj.h
View file
Expand Up @@ -24,7 +24,7 @@ struct Object;
}

namespace DWARFYAML {
struct DWARFData;
struct Data;
}

namespace yaml {
Expand All @@ -38,8 +38,8 @@ int yaml2elf(llvm::ELFYAML::Object &Doc, llvm::raw_ostream &Out);
int yaml2macho(llvm::yaml::YamlObjectFile &Doc, llvm::raw_ostream &Out);

void yaml2debug_abbrev(llvm::raw_ostream &OS,
const llvm::DWARFYAML::DWARFData &DI);
const llvm::DWARFYAML::Data &DI);
void yaml2debug_str(llvm::raw_ostream &OS,
const llvm::DWARFYAML::DWARFData &DI);
const llvm::DWARFYAML::Data &DI);

#endif

0 comments on commit 1ba1a8b

Please sign in to comment.