6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-01 15:11:24 +00:00
Code Issues Projects Releases Wiki Activity

Add more PRI.64 macros for MSVC and use them throughout the codebase.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143799 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2011-11-05 08:57:40 +00:00
parent 965d2feedd
commit 41a964931a
12 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/Support/DataTypes.h.cmake
View File

@ -167,9 +167,24 @@ typedef signed int ssize_t;
# define UINT64_C(C) C##ui64
#endif
#ifndef PRId64
# define PRId64 "I64d"
#endif
#ifndef PRIi64
# define PRIu64 "I64i"
#endif
#ifndef PRIo64
# define PRIx64 "I64o"
#endif
#ifndef PRIu64
# define PRIu64 "I64u"
#endif
#ifndef PRIx64
# define PRIx64 "I64x"
#endif
#ifndef PRIX64
# define PRIX64 "I64X"
#endif
#endif /* _MSC_VER */

15
include/llvm/Support/DataTypes.h.in
View File

@ -167,9 +167,24 @@ typedef signed int ssize_t;
# define UINT64_C(C) C##ui64
#endif
#ifndef PRId64
# define PRId64 "I64d"
#endif
#ifndef PRIi64
# define PRIu64 "I64i"
#endif
#ifndef PRIo64
# define PRIx64 "I64o"
#endif
#ifndef PRIu64
# define PRIu64 "I64u"
#endif
#ifndef PRIx64
# define PRIx64 "I64x"
#endif
#ifndef PRIX64
# define PRIX64 "I64X"
#endif
#endif /* _MSC_VER */

3
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -1759,7 +1759,8 @@ static void EmitGlobalConstantImpl(const Constant *CV, unsigned AddrSpace,
case 4:
case 8:
if (AP.isVerbose())
AP.OutStreamer.GetCommentOS() << format("0x%llx\n", CI->getZExtValue());
AP.OutStreamer.GetCommentOS() << format("0x%" PRIx64 "\n",
CI->getZExtValue());
AP.OutStreamer.EmitIntValue(CI->getZExtValue(), Size, AddrSpace);
return;
default:

4
lib/CodeGen/AsmPrinter/DIE.cpp
View File

@ -230,8 +230,8 @@ unsigned DIEInteger::SizeOf(AsmPrinter *AP, unsigned Form) const {
#ifndef NDEBUG
void DIEInteger::print(raw_ostream &O) {
O << "Int: " << (int64_t)Integer
<< format(" 0x%llx", (unsigned long long)Integer);
O << "Int: " << (int64_t)Integer << " 0x";
O.write_hex(Integer);
}
#endif

5
lib/DebugInfo/DWARFDebugArangeSet.cpp
View File

@ -122,8 +122,9 @@ void DWARFDebugArangeSet::dump(raw_ostream &OS) const {
const uint32_t hex_width = Header.AddrSize * 2;
for (DescriptorConstIter pos = ArangeDescriptors.begin(),
end = ArangeDescriptors.end(); pos != end; ++pos)
OS << format("[0x%*.*llx -", hex_width, hex_width, pos->Address)
<< format(" 0x%*.*llx)\n", hex_width, hex_width, pos->getEndAddress());
OS << format("[0x%*.*" PRIx64 " -", hex_width, hex_width, pos->Address)
<< format(" 0x%*.*" PRIx64 ")\n",
hex_width, hex_width, pos->getEndAddress());
}

7
lib/DebugInfo/DWARFDebugAranges.cpp
View File

@ -100,13 +100,14 @@ void DWARFDebugAranges::dump(raw_ostream &OS) const {
const uint32_t num_ranges = getNumRanges();
for (uint32_t i = 0; i < num_ranges; ++i) {
const Range &range = Aranges[i];
OS << format("0x%8.8x: [0x%8.8llx - 0x%8.8llx)\n", range.Offset,
(uint64_t)range.LoPC, (uint64_t)range.HiPC());
OS << format("0x%8.8x: [0x%8.8" PRIx64 " - 0x%8.8" PRIx64 ")\n",
range.Offset, (uint64_t)range.LoPC, (uint64_t)range.HiPC());
}
}
void DWARFDebugAranges::Range::dump(raw_ostream &OS) const {
OS << format("{0x%8.8x}: [0x%8.8llx - 0x%8.8llx)\n", Offset, LoPC, HiPC());
OS << format("{0x%8.8x}: [0x%8.8" PRIx64 " - 0x%8.8" PRIx64 ")\n",
Offset, LoPC, HiPC());
}
void DWARFDebugAranges::appendRange(uint32_t offset, uint64_t low_pc,

2
lib/DebugInfo/DWARFDebugLine.cpp
View File

@ -68,7 +68,7 @@ void DWARFDebugLine::Row::reset(bool default_is_stmt) {
}
void DWARFDebugLine::Row::dump(raw_ostream &OS) const {
OS << format("0x%16.16llx %6u %6u", Address, Line, Column)
OS << format("0x%16.16" PRIx64 " %6u %6u", Address, Line, Column)
<< format(" %6u %3u ", File, Isa)
<< (IsStmt ? " is_stmt" : "")
<< (BasicBlock ? " basic_block" : "")

6
lib/DebugInfo/DWARFFormValue.cpp
View File

@ -280,7 +280,7 @@ DWARFFormValue::dump(raw_ostream &OS, const DWARFCompileUnit *cu) const {
case DW_FORM_block4:
if (uvalue > 0) {
switch (Form) {
case DW_FORM_block: OS << format("<0x%llx> ", uvalue); break;
case DW_FORM_block: OS << format("<0x%" PRIx64 "> ", uvalue); break;
case DW_FORM_block1: OS << format("<0x%2.2x> ", (uint8_t)uvalue); break;
case DW_FORM_block2: OS << format("<0x%4.4x> ", (uint16_t)uvalue); break;
case DW_FORM_block4: OS << format("<0x%8.8x> ", (uint32_t)uvalue); break;
@ -330,11 +330,11 @@ DWARFFormValue::dump(raw_ostream &OS, const DWARFCompileUnit *cu) const {
break;
case DW_FORM_ref8:
cu_relative_offset = true;
OS << format("cu + 0x%8.8llx", uvalue);
OS << format("cu + 0x%8.8" PRIx64, uvalue);
break;
case DW_FORM_ref_udata:
cu_relative_offset = true;
OS << format("cu + 0x%llx", uvalue);
OS << format("cu + 0x%" PRIx64, uvalue);
break;
// All DW_FORM_indirect attributes should be resolved prior to calling

2
lib/Support/Timer.cpp
View File

@ -184,7 +184,7 @@ void TimeRecord::print(const TimeRecord &Total, raw_ostream &OS) const {
OS << " ";
if (Total.getMemUsed())
OS << format("%9lld ", (long long)getMemUsed());
OS << format("%9" PRId64 " ", (int64_t)getMemUsed());
}

2
lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
View File

@ -97,7 +97,7 @@ void X86ATTInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
O << '$' << (int64_t)Op.getImm();
if (CommentStream && (Op.getImm() > 255 || Op.getImm() < -256))
*CommentStream << format("imm = 0x%llX\n", (long long)Op.getImm());
*CommentStream << format("imm = 0x%" PRIX64 "\n", (uint64_t)Op.getImm());
} else {
assert(Op.isExpr() && "unknown operand kind in printOperand");

4
tools/llvm-objdump/MachODump.cpp
View File

@ -459,7 +459,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
DebugOut, nulls())) {
uint64_t SectAddress = 0;
Sections[SectIdx].getAddress(SectAddress);
outs() << format("%8llx:\t", SectAddress + Index);
outs() << format("%8" PRIx64 ":\t", SectAddress + Index);
DumpBytes(StringRef(Bytes.data() + Index, Size));
IP->printInst(&Inst, outs(), "");
@ -579,7 +579,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
outs() << FunctionMap[SectAddress + Inst.Address]-> getName()
<< ":\n";
outs() << format("%8llx:\t", SectAddress + Inst.Address);
outs() << format("%8" PRIx64 ":\t", SectAddress + Inst.Address);
DumpBytes(StringRef(Bytes.data() + Inst.Address, Inst.Size));
if (fi->second.contains(fi->first)) // Indent simple loops.

10
tools/llvm-size/llvm-size.cpp
View File

@ -96,13 +96,13 @@ static void PrintObjectSectionSizes(ObjectFile *o) {
const char *radix_fmt = 0;
switch (Radix) {
case octal:
radix_fmt = "llo";
radix_fmt = PRIo64;
break;
case decimal:
radix_fmt = "llu";
radix_fmt = PRIu64;
break;
case hexadecimal:
radix_fmt = "llx";
radix_fmt = PRIx64;
break;
}
if (OutputFormat == sysv) {
@ -223,8 +223,8 @@ static void PrintObjectSectionSizes(ObjectFile *o) {
total_data,
total_bss);
fmtbuf.clear();
fmt << "%7" << (Radix == octal ? "llo" : "llu") << " "
<< "%7llx ";
fmt << "%7" << (Radix == octal ? PRIo64 : PRIu64) << " "
<< "%7" PRIx64 " ";
outs() << format(fmt.str().c_str(),
total,
total);