maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Audited all the format strings in libDebugInfo and fixed those that didn't match the types. 

llvm-svn: 143814
This commit is contained in:
Benjamin Kramer 2011-11-05 16:01:13 +00:00
parent cda5732e52
commit 79730ad07d
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/DebugInfo/DWARFDebugAbbrev.cpp
View File

@ -83,7 +83,7 @@ void DWARFDebugAbbrev::dump(raw_ostream &OS) const {
DWARFAbbreviationDeclarationCollMapConstIter pos;
for (pos = AbbrevCollMap.begin(); pos != AbbrevCollMap.end(); ++pos) {
OS << format("Abbrev table for offset: 0x%8.8x\n", pos->first);
OS << format("Abbrev table for offset: 0x%8.8" PRIx64 "\n", pos->first);
pos->second.dump(OS);
}
}

6
llvm/lib/DebugInfo/DWARFDebugAbbrev.h
View File

@ -25,21 +25,21 @@ typedef DWARFAbbreviationDeclarationColl::const_iterator
DWARFAbbreviationDeclarationCollConstIter;
class DWARFAbbreviationDeclarationSet {
uint64_t Offset;
uint32_t Offset;
uint32_t IdxOffset;
std::vector<DWARFAbbreviationDeclaration> Decls;
public:
DWARFAbbreviationDeclarationSet()
: Offset(0), IdxOffset(0) {}
DWARFAbbreviationDeclarationSet(uint64_t offset, uint32_t idxOffset)
DWARFAbbreviationDeclarationSet(uint32_t offset, uint32_t idxOffset)
: Offset(offset), IdxOffset(idxOffset) {}
void clear() {
IdxOffset = 0;
Decls.clear();
}
uint64_t getOffset() const { return Offset; }
uint32_t getOffset() const { return Offset; }
void dump(raw_ostream &OS) const;
bool extract(DataExtractor data, uint32_t* offset_ptr);

5
llvm/lib/DebugInfo/DWARFDebugLine.cpp
View File

@ -41,8 +41,9 @@ void DWARFDebugLine::Prologue::dump(raw_ostream &OS) const {
"----------------\n";
for (uint32_t i = 0; i < FileNames.size(); ++i) {
const FileNameEntry& fileEntry = FileNames[i];
OS << format("file_names[%3u] %4u ", i+1, fileEntry.DirIdx)
<< format("0x%8.8x 0x%8.8x ", fileEntry.ModTime, fileEntry.Length)
OS << format("file_names[%3u] %4" PRIu64 " ", i+1, fileEntry.DirIdx)
<< format("0x%8.8" PRIx64 " 0x%8.8" PRIx64 " ",
fileEntry.ModTime, fileEntry.Length)
<< fileEntry.Name << '\n';
}
}

14
llvm/lib/DebugInfo/DWARFFormValue.cpp
View File

@ -263,12 +263,12 @@ DWARFFormValue::dump(raw_ostream &OS, const DWARFCompileUnit *cu) const {
bool cu_relative_offset = false;
switch (Form) {
case DW_FORM_addr: OS << format("0x%016x", uvalue); break;
case DW_FORM_addr: OS << format("0x%016" PRIx64, uvalue); break;
case DW_FORM_flag:
case DW_FORM_data1: OS << format("0x%02x", uvalue); break;
case DW_FORM_data2: OS << format("0x%04x", uvalue); break;
case DW_FORM_data4: OS << format("0x%08x", uvalue); break;
case DW_FORM_data8: OS << format("0x%016x", uvalue); break;
case DW_FORM_data1: OS << format("0x%02x", (uint8_t)uvalue); break;
case DW_FORM_data2: OS << format("0x%04x", (uint16_t)uvalue); break;
case DW_FORM_data4: OS << format("0x%08x", (uint32_t)uvalue); break;
case DW_FORM_data8: OS << format("0x%016" PRIx64, uvalue); break;
case DW_FORM_string:
OS << '"';
OS.write_escaped(getAsCString(NULL));
@ -314,7 +314,7 @@ DWARFFormValue::dump(raw_ostream &OS, const DWARFCompileUnit *cu) const {
break;
}
case DW_FORM_ref_addr:
OS << format("0x%016x", uvalue);
OS << format("0x%016" PRIx64, uvalue);
break;
case DW_FORM_ref1:
cu_relative_offset = true;
@ -348,7 +348,7 @@ DWARFFormValue::dump(raw_ostream &OS, const DWARFCompileUnit *cu) const {
}
if (cu_relative_offset)
OS << format(" => {0x%8.8x}", (uvalue + (cu ? cu->getOffset() : 0)));
OS << format(" => {0x%8.8"PRIx64"}", (uvalue + (cu ? cu->getOffset() : 0)));
}
const char*