mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-24 20:29:53 +00:00
Audited all the format strings in libDebugInfo and fixed those that didn't match the types.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143814 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
80cc2598f8
commit
5eccd36f1a
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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';
|
||||
}
|
||||
}
|
||||
|
@ -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*
|
||||
|
Loading…
Reference in New Issue
Block a user