RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 20:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143814 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2011-11-05 16:01:13 +00:00
parent 80cc2598f8
commit 5eccd36f1a
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DebugInfo/DWARFDebugAbbrev.cpp
View File

@ -83,7 +83,7 @@ void DWARFDebugAbbrev::dump(raw_ostream &OS) const {
DWARFAbbreviationDeclarationCollMapConstIter pos; DWARFAbbreviationDeclarationCollMapConstIter pos;
for (pos = AbbrevCollMap.begin(); pos != AbbrevCollMap.end(); ++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); pos->second.dump(OS);
} }
} }

6
lib/DebugInfo/DWARFDebugAbbrev.h
View File

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

5
lib/DebugInfo/DWARFDebugLine.cpp
View File

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

14
lib/DebugInfo/DWARFFormValue.cpp
View File

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