RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-08 13:00:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dsymutil] Apply clang-format. NFC

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239186 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Frederic Riss 2015-06-05 20:27:07 +00:00
parent 527bb619d1
commit 0f58c38ebd
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/dsymutil/DebugMap.cpp
View File

@ -47,8 +47,8 @@ void DebugMapObject::print(raw_ostream &OS) const {
for (const auto &Sym : Entries) {
OS << format("\t%016" PRIx64 " => %016" PRIx64 "+0x%x\t%s\n",
uint64_t(Sym.second.ObjectAddress),
uint64_t(Sym.second.BinaryAddress),
uint32_t(Sym.second.Size), Sym.first.data());
uint64_t(Sym.second.BinaryAddress), uint32_t(Sym.second.Size),
Sym.first.data());
}
OS << '\n';
}
@ -80,7 +80,7 @@ DebugMapObject::lookupObjectAddress(uint64_t Address) const {
void DebugMap::print(raw_ostream &OS) const {
yaml::Output yout(OS, /* Ctxt = */ nullptr, /* WrapColumn = */ 0);
yout << const_cast<DebugMap&>(*this);
yout << const_cast<DebugMap &>(*this);
}
#ifndef NDEBUG

3
tools/dsymutil/DebugMap.h
View File

@ -163,7 +163,8 @@ private:
friend yaml::SequenceTraits<std::vector<std::unique_ptr<DebugMapObject>>>;
friend yaml::SequenceTraits<std::vector<YAMLSymbolMapping>>;
DebugMapObject() = default;
public:
public:
DebugMapObject &operator=(DebugMapObject RHS) {
std::swap(Filename, RHS.Filename);
std::swap(Symbols, RHS.Symbols);

22
tools/dsymutil/DwarfLinker.cpp
View File

@ -186,8 +186,8 @@ public:
void addTypeAccelerator(const DIE *Die, const char *Name, uint32_t Offset);
struct AccelInfo {
StringRef Name; ///< Name of the entry.
const DIE *Die; ///< DIE this entry describes.
StringRef Name; ///< Name of the entry.
const DIE *Die; ///< DIE this entry describes.
uint32_t NameOffset; ///< Offset of Name in the string pool.
bool SkipPubSection; ///< Emit this entry only in the apple_* sections.
@ -965,7 +965,7 @@ void DwarfStreamer::emitPubSectionForUnit(
Asm->EmitLabelDifference(EndLabel, BeginLabel, 4); // Length
Asm->OutStreamer->EmitLabel(BeginLabel);
Asm->EmitInt16(dwarf::DW_PUBNAMES_VERSION); // Version
Asm->EmitInt32(Unit.getStartOffset()); // Unit offset
Asm->EmitInt32(Unit.getStartOffset()); // Unit offset
Asm->EmitInt32(Unit.getNextUnitOffset() - Unit.getStartOffset()); // Size
HeaderEmitted = true;
}
@ -1515,8 +1515,8 @@ bool DwarfLinker::hasValidRelocation(uint32_t StartOffset, uint32_t EndOffset,
uint64_t(Mapping.ObjectAddress),
uint64_t(Mapping.BinaryAddress));
Info.AddrAdjust = int64_t(Mapping.BinaryAddress) +
ValidReloc.Addend - Mapping.ObjectAddress;
Info.AddrAdjust = int64_t(Mapping.BinaryAddress) + ValidReloc.Addend -
Mapping.ObjectAddress;
Info.InDebugMap = true;
return true;
}
@ -2322,8 +2322,7 @@ static void insertLineSequence(std::vector<DWARFDebugLine::Row> &Seq,
/// are present in the binary.
void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit,
DWARFContext &OrigDwarf) {
const DWARFDebugInfoEntryMinimal *CUDie =
Unit.getOrigUnit().getUnitDIE();
const DWARFDebugInfoEntryMinimal *CUDie = Unit.getOrigUnit().getUnitDIE();
uint64_t StmtList = CUDie->getAttributeValueAsSectionOffset(
&Unit.getOrigUnit(), dwarf::DW_AT_stmt_list, -1ULL);
if (StmtList == -1ULL)
@ -2331,10 +2330,11 @@ void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit,
// Update the cloned DW_AT_stmt_list with the correct debug_line offset.
if (auto *OutputDIE = Unit.getOutputUnitDIE()) {
auto Stmt = std::find_if(OutputDIE->values_begin(), OutputDIE->values_end(),
[](const DIEValue &Value) {
return Value.getAttribute() == dwarf::DW_AT_stmt_list;
});
auto Stmt =
std::find_if(OutputDIE->values_begin(), OutputDIE->values_end(),
[](const DIEValue &Value) {
return Value.getAttribute() == dwarf::DW_AT_stmt_list;
});
assert(Stmt != OutputDIE->values_end() &&
"Didn't find DW_AT_stmt_list in cloned DIE!");
OutputDIE->setValue(Stmt - OutputDIE->values_begin(),

1
tools/dsymutil/MachODebugMapParser.cpp
View File

@ -244,7 +244,6 @@ void MachODebugMapParser::loadMainBinarySymbols() {
namespace llvm {
namespace dsymutil {
llvm::ErrorOr<std::unique_ptr<DebugMap>> parseDebugMap(StringRef InputFile,
StringRef PrependPath,
bool Verbose,

7
tools/dsymutil/dsymutil.h
View File

@ -33,9 +33,10 @@ struct LinkOptions {
/// \brief Extract the DebugMap from the given file.
/// The file has to be a MachO object file.
llvm::ErrorOr<std::unique_ptr<DebugMap>>
parseDebugMap(StringRef InputFile, StringRef PrependPath,
bool Verbose, bool InputIsYAML);
llvm::ErrorOr<std::unique_ptr<DebugMap>> parseDebugMap(StringRef InputFile,
StringRef PrependPath,
bool Verbose,
bool InputIsYAML);
/// \brief Link the Dwarf debuginfo as directed by the passed DebugMap
/// \p DM into a DwarfFile named \p OutputFilename.