diff options
| author | Daniel Malea <daniel.malea@intel.com> | 2012-11-29 21:49:15 +0000 |
|---|---|---|
| committer | Daniel Malea <daniel.malea@intel.com> | 2012-11-29 21:49:15 +0000 |
| commit | d01b2953fac73977de3bc97e72ea04ad1ec6600f (patch) | |
| tree | 1883eeb5c13d5a2aa557d50eb40a0e08f43a8ec1 /lldb/source/Plugins/Disassembler/llvm | |
| parent | 05d3bf77a1af49e8f6513729e4ccce780ffae4bb (diff) | |
| download | bcm5719-llvm-d01b2953fac73977de3bc97e72ea04ad1ec6600f.tar.gz bcm5719-llvm-d01b2953fac73977de3bc97e72ea04ad1ec6600f.zip | |
Resolve printf formatting warnings on Linux:
- use macros from inttypes.h for format strings instead of OS-specific types
Patch from Matt Kopec!
llvm-svn: 168945
Diffstat (limited to 'lldb/source/Plugins/Disassembler/llvm')
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp index 378d9c5638a..0c313571ced 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp @@ -232,7 +232,7 @@ InstructionLLVM::CalculateMnemonicOperandsAndComment (const ExecutionContext* ex if (!EDEvaluateOperand(&operand_value, operand, IPRegisterReader, &rra)) { - comment.Printf("0x%*.*llx ", addr_nibble_size, addr_nibble_size, operand_value); + comment.Printf("0x%*.*" PRIx64 " ", addr_nibble_size, addr_nibble_size, operand_value); AddSymbolicInfo (exe_ctx, comment, operand_value, GetAddress()); } } @@ -257,7 +257,7 @@ InstructionLLVM::CalculateMnemonicOperandsAndComment (const ExecutionContext* ex { uint64_t operand_value = PC + atoi(++pos); // Put the address value into the operands. - comment.Printf("0x%*.*llx ", addr_nibble_size, addr_nibble_size, operand_value); + comment.Printf("0x%*.*" PRIx64 " ", addr_nibble_size, addr_nibble_size, operand_value); AddSymbolicInfo (exe_ctx, comment, operand_value, GetAddress()); } } @@ -278,7 +278,7 @@ InstructionLLVM::CalculateMnemonicOperandsAndComment (const ExecutionContext* ex } uint64_t operand_value = PC + atoi(++pos); // Put the address value into the comment. - comment.Printf("0x%*.*llx ", addr_nibble_size, addr_nibble_size, operand_value); + comment.Printf("0x%*.*" PRIx64 " ", addr_nibble_size, addr_nibble_size, operand_value); // And the original token string into the operands. // llvm::StringRef Str(pos - 1); // RStrip(Str, '\n'); diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index f44465c7ccb..7522a1ced16 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -271,7 +271,7 @@ public: const uint64_t uval64 = data.GetU64(&offset); m_opcode.SetOpcode64(uval64); m_opcode_name.assign (".quad"); - mnemonic_strm.Printf("0x%16.16llx", uval64); + mnemonic_strm.Printf("0x%16.16" PRIx64, uval64); } break; default: @@ -644,7 +644,7 @@ const char *DisassemblerLLVMC::SymbolLookup (uint64_t value, m_inst->AppendComment(ss.GetString()); } } - //printf ("DisassemblerLLVMC::SymbolLookup (value=0x%16.16llx, type=%llu, pc=0x%16.16llx, name=\"%s\") m_exe_ctx=%p, m_inst=%p\n", value, *type_ptr, pc, remove_this_prior_to_checkin.c_str(), m_exe_ctx, m_inst); + //printf ("DisassemblerLLVMC::SymbolLookup (value=0x%16.16" PRIx64 ", type=%" PRIu64 ", pc=0x%16.16" PRIx64 ", name=\"%s\") m_exe_ctx=%p, m_inst=%p\n", value, *type_ptr, pc, remove_this_prior_to_checkin.c_str(), m_exe_ctx, m_inst); } } |
