diff options
Diffstat (limited to 'lldb/source/Plugins')
8 files changed, 23 insertions, 20 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp index 0b49f1fc279..506dae07c12 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp @@ -145,7 +145,7 @@ CommunicationKDP::SendRequestPacketNoLock (const PacketStreamType &request_packe return true; if (log) - log->Printf ("error: failed to send packet entire packet %zu of %zu bytes sent", bytes_written, packet_size); + log->Printf ("error: failed to send packet entire packet %llu of %llu bytes sent", (uint64_t)bytes_written, (uint64_t)packet_size); } return false; } @@ -189,12 +189,12 @@ CommunicationKDP::WaitForPacketWithTimeoutMicroSecondsNoLock (DataExtractor &pac size_t bytes_read = Read (buffer, sizeof(buffer), timeout_usec, status, &error); if (log) - log->Printf ("%s: Read (buffer, (sizeof(buffer), timeout_usec = 0x%x, status = %s, error = %s) => bytes_read = %zu", + log->Printf ("%s: Read (buffer, (sizeof(buffer), timeout_usec = 0x%x, status = %s, error = %s) => bytes_read = %llu", __PRETTY_FUNCTION__, timeout_usec, Communication::ConnectionStatusAsCString (status), error.AsCString(), - bytes_read); + (uint64_t)bytes_read); if (bytes_read > 0) { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index 0712ed4e1f7..d1102b7e6ac 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -298,12 +298,12 @@ GDBRemoteCommunication::WaitForPacketWithTimeoutMicroSecondsNoLock (StringExtrac size_t bytes_read = Read (buffer, sizeof(buffer), timeout_usec, status, &error); if (log) - log->Printf ("%s: Read (buffer, (sizeof(buffer), timeout_usec = 0x%x, status = %s, error = %s) => bytes_read = %zu", + log->Printf ("%s: Read (buffer, (sizeof(buffer), timeout_usec = 0x%x, status = %s, error = %s) => bytes_read = %llu", __PRETTY_FUNCTION__, timeout_usec, Communication::ConnectionStatusAsCString (status), error.AsCString(), - bytes_read); + (uint64_t)bytes_read); if (bytes_read > 0) { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 8225e69f373..ddb31819b8b 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -1215,7 +1215,8 @@ GDBRemoteCommunicationClient::AllocateMemory (size_t size, uint32_t permissions) { m_supports_alloc_dealloc_memory = eLazyBoolYes; char packet[64]; - const int packet_len = ::snprintf (packet, sizeof(packet), "_M%zx,%s%s%s", size, + const int packet_len = ::snprintf (packet, sizeof(packet), "_M%llx,%s%s%s", + (uint64_t)size, permissions & lldb::ePermissionsReadable ? "r" : "", permissions & lldb::ePermissionsWritable ? "w" : "", permissions & lldb::ePermissionsExecutable ? "x" : ""); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index ce9d71b50ec..ee2da0bcf66 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -1893,7 +1893,7 @@ ProcessGDBRemote::DoReadMemory (addr_t addr, void *buf, size_t size, Error &erro } char packet[64]; - const int packet_len = ::snprintf (packet, sizeof(packet), "m%llx,%zx", (uint64_t)addr, size); + const int packet_len = ::snprintf (packet, sizeof(packet), "m%llx,%llx", (uint64_t)addr, (uint64_t)size); assert (packet_len + 1 < sizeof(packet)); StringExtractorGDBRemote response; if (m_gdb_comm.SendPacketAndWaitForResponse(packet, packet_len, response, true)) @@ -1929,7 +1929,7 @@ ProcessGDBRemote::DoWriteMemory (addr_t addr, const void *buf, size_t size, Erro } StreamString packet; - packet.Printf("M%llx,%zx:", addr, size); + packet.Printf("M%llx,%llx:", addr, (uint64_t)size); packet.PutBytesAsRawHex8(buf, size, lldb::endian::InlHostByteOrder(), lldb::endian::InlHostByteOrder()); StringExtractorGDBRemote response; if (m_gdb_comm.SendPacketAndWaitForResponse(packet.GetData(), packet.GetSize(), response, true)) @@ -1986,7 +1986,7 @@ ProcessGDBRemote::DoAllocateMemory (size_t size, uint32_t permissions, Error &er } if (allocated_addr == LLDB_INVALID_ADDRESS) - error.SetErrorStringWithFormat("unable to allocate %zu bytes of memory with permissions %s", size, GetPermissionsAsCString (permissions)); + error.SetErrorStringWithFormat("unable to allocate %llu bytes of memory with permissions %s", (uint64_t)size, GetPermissionsAsCString (permissions)); else error.Clear(); return allocated_addr; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp index ab2f9c4f16e..41a3d865c82 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp @@ -142,7 +142,7 @@ DWARFDebugAranges::Sort (bool minimize) if (log) { orig_arange_size = m_aranges.GetSize(); - log->Printf ("DWARFDebugAranges::Sort(minimize = %u) with %zu entries", minimize, orig_arange_size); + log->Printf ("DWARFDebugAranges::Sort(minimize = %u) with %llu entries", minimize, (uint64_t)orig_arange_size); } m_aranges.Sort(); @@ -154,8 +154,10 @@ DWARFDebugAranges::Sort (bool minimize) { const size_t new_arange_size = m_aranges.GetSize(); const size_t delta = orig_arange_size - new_arange_size; - log->Printf ("DWARFDebugAranges::Sort() %zu entries after minimizing (%zu entries combined for %zu bytes saved)", - new_arange_size, delta, delta * sizeof(Range)); + log->Printf ("DWARFDebugAranges::Sort() %llu entries after minimizing (%llu entries combined for %llu bytes saved)", + (uint64_t)new_arange_size, + (uint64_t)delta, + (uint64_t)delta * sizeof(Range)); } Dump (log.get()); } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp index 79f36d28ca5..7dfbc64a7ae 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp @@ -32,11 +32,11 @@ bool DWARFDebugPubnames::Extract(const DataExtractor& data) { Timer scoped_timer (__PRETTY_FUNCTION__, - "DWARFDebugPubnames::Extract (byte_size = %zu)", - data.GetByteSize()); + "DWARFDebugPubnames::Extract (byte_size = %llu)", + (uint64_t)data.GetByteSize()); LogSP log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_PUBNAMES)); if (log) - log->Printf("DWARFDebugPubnames::Extract (byte_size = %zu)", data.GetByteSize()); + log->Printf("DWARFDebugPubnames::Extract (byte_size = %llu)", (uint64_t)data.GetByteSize()); if (data.ValidOffset(0)) { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 954f13b87d8..52e262e3c14 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -126,15 +126,15 @@ public: { StreamString log_strm; const size_t n = m_dies.size(); - log_strm.Printf("DIEStack[%zu]:\n", n); + log_strm.Printf("DIEStack[%llu]:\n", (uint64_t)n); for (size_t i=0; i<n; i++) { DWARFCompileUnit *cu = m_dies[i].cu; const DWARFDebugInfoEntry *die = m_dies[i].die; std::string qualified_name; die->GetQualifiedName(dwarf, cu, qualified_name); - log_strm.Printf ("[%zu] 0x%8.8x: %s name='%s'\n", - i, + log_strm.Printf ("[%llu] 0x%8.8x: %s name='%s'\n", + (uint64_t)i, die->GetOffset(), DW_TAG_value_to_name(die->Tag()), qualified_name.c_str()); diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp index 1a176471189..7cadcd1a6b4 100644 --- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp +++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp @@ -344,10 +344,10 @@ UnwindAssemblyInstEmulation::ReadMemory (EmulateInstruction *instruction, if (log && log->GetVerbose ()) { StreamString strm; - strm.Printf ("UnwindAssemblyInstEmulation::ReadMemory (addr = 0x%16.16llx, dst = %p, dst_len = %zu, context = ", + strm.Printf ("UnwindAssemblyInstEmulation::ReadMemory (addr = 0x%16.16llx, dst = %p, dst_len = %llu, context = ", addr, dst, - dst_len); + (uint64_t)dst_len); context.Dump(strm, instruction); log->PutCString (strm.GetData ()); } |
