diff options
Diffstat (limited to 'lldb/source/Target')
21 files changed, 119 insertions, 119 deletions
diff --git a/lldb/source/Target/Memory.cpp b/lldb/source/Target/Memory.cpp index a011bd25d66..1e3bfc1450d 100644 --- a/lldb/source/Target/Memory.cpp +++ b/lldb/source/Target/Memory.cpp @@ -326,7 +326,7 @@ AllocatedBlock::ReserveBlock (uint32_t size) } LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); if (log) - log->Printf ("AllocatedBlock::ReserveBlock (size = %u (0x%x)) => 0x%16.16llx", size, size, (uint64_t)addr); + log->Printf ("AllocatedBlock::ReserveBlock (size = %u (0x%x)) => 0x%16.16" PRIx64, size, size, (uint64_t)addr); return addr; } @@ -343,7 +343,7 @@ AllocatedBlock::FreeBlock (addr_t addr) } LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS | LIBLLDB_LOG_VERBOSE)); if (log) - log->Printf ("AllocatedBlock::FreeBlock (addr = 0x%16.16llx) => %i", (uint64_t)addr, success); + log->Printf ("AllocatedBlock::FreeBlock (addr = 0x%16.16" PRIx64 ") => %i", (uint64_t)addr, success); return success; } @@ -390,7 +390,7 @@ AllocatedMemoryCache::AllocatePage (uint32_t byte_size, LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) { - log->Printf ("Process::DoAllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16llx", + log->Printf ("Process::DoAllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16" PRIx64, page_byte_size, GetPermissionsAsCString(permissions), (uint64_t)addr); @@ -428,7 +428,7 @@ AllocatedMemoryCache::AllocateMemory (size_t byte_size, } LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("AllocatedMemoryCache::AllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16llx", byte_size, GetPermissionsAsCString(permissions), (uint64_t)addr); + log->Printf ("AllocatedMemoryCache::AllocateMemory (byte_size = 0x%8.8zx, permissions = %s) => 0x%16.16" PRIx64, byte_size, GetPermissionsAsCString(permissions), (uint64_t)addr); return addr; } @@ -449,7 +449,7 @@ AllocatedMemoryCache::DeallocateMemory (lldb::addr_t addr) } LogSP log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf("AllocatedMemoryCache::DeallocateMemory (addr = 0x%16.16llx) => %i", (uint64_t)addr, success); + log->Printf("AllocatedMemoryCache::DeallocateMemory (addr = 0x%16.16" PRIx64 ") => %i", (uint64_t)addr, success); return success; } diff --git a/lldb/source/Target/ObjCLanguageRuntime.cpp b/lldb/source/Target/ObjCLanguageRuntime.cpp index f61e5c0c799..2b37cb06c22 100644 --- a/lldb/source/Target/ObjCLanguageRuntime.cpp +++ b/lldb/source/Target/ObjCLanguageRuntime.cpp @@ -43,7 +43,7 @@ ObjCLanguageRuntime::AddToMethodCache (lldb::addr_t class_addr, lldb::addr_t sel LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { - log->Printf ("Caching: class 0x%llx selector 0x%llx implementation 0x%llx.", class_addr, selector, impl_addr); + log->Printf ("Caching: class 0x%" PRIx64 " selector 0x%" PRIx64 " implementation 0x%" PRIx64 ".", class_addr, selector, impl_addr); } m_impl_cache.insert (std::pair<ClassAndSel,lldb::addr_t> (ClassAndSel(class_addr, selector), impl_addr)); } diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index b6aa066e492..ee44a8c5029 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -167,10 +167,10 @@ ProcessInstanceInfo::Dump (Stream &s, Platform *platform) const { const char *cstr; if (m_pid != LLDB_INVALID_PROCESS_ID) - s.Printf (" pid = %llu\n", m_pid); + s.Printf (" pid = %" PRIu64 "\n", m_pid); if (m_parent_pid != LLDB_INVALID_PROCESS_ID) - s.Printf (" parent = %llu\n", m_parent_pid); + s.Printf (" parent = %" PRIu64 "\n", m_parent_pid); if (m_executable) { @@ -257,7 +257,7 @@ ProcessInstanceInfo::DumpAsTableRow (Stream &s, Platform *platform, bool show_ar if (m_pid != LLDB_INVALID_PROCESS_ID) { const char *cstr; - s.Printf ("%-6llu %-6llu ", m_pid, m_parent_pid); + s.Printf ("%-6" PRIu64 " %-6" PRIu64 " ", m_pid, m_parent_pid); if (verbose) @@ -1406,7 +1406,7 @@ Process::SetProcessExitStatus (void *callback_baton, { LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::SetProcessExitStatus (baton=%p, pid=%llu, exited=%i, signal=%i, exit_status=%i)\n", + log->Printf ("Process::SetProcessExitStatus (baton=%p, pid=%" PRIu64 ", exited=%i, signal=%i, exit_status=%i)\n", callback_baton, pid, exited, @@ -1707,7 +1707,7 @@ Process::UnloadImage (uint32_t image_token) frame_sp->CalculateExecutionContext (exe_ctx); bool unwind_on_error = true; StreamString expr; - expr.Printf("dlclose ((void *)0x%llx)", image_addr); + expr.Printf("dlclose ((void *)0x%" PRIx64 ")", image_addr); const char *prefix = "extern \"C\" int dlclose(void* handle);\n"; lldb::ValueObjectSP result_valobj_sp; ClangUserExpression::Evaluate (exe_ctx, @@ -1861,7 +1861,7 @@ Process::DisableBreakpointSiteByID (lldb::user_id_t break_id) } else { - error.SetErrorStringWithFormat("invalid breakpoint site ID: %llu", break_id); + error.SetErrorStringWithFormat("invalid breakpoint site ID: %" PRIu64, break_id); } return error; @@ -1879,7 +1879,7 @@ Process::EnableBreakpointSiteByID (lldb::user_id_t break_id) } else { - error.SetErrorStringWithFormat("invalid breakpoint site ID: %llu", break_id); + error.SetErrorStringWithFormat("invalid breakpoint site ID: %" PRIu64, break_id); } return error; } @@ -1983,11 +1983,11 @@ Process::EnableSoftwareBreakpoint (BreakpointSite *bp_site) LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); const addr_t bp_addr = bp_site->GetLoadAddress(); if (log) - log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%llx", bp_site->GetID(), (uint64_t)bp_addr); + log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64, bp_site->GetID(), (uint64_t)bp_addr); if (bp_site->IsEnabled()) { if (log) - log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- already enabled", bp_site->GetID(), (uint64_t)bp_addr); + log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- already enabled", bp_site->GetID(), (uint64_t)bp_addr); return error; } @@ -2002,7 +2002,7 @@ Process::EnableSoftwareBreakpoint (BreakpointSite *bp_site) if (bp_opcode_size == 0) { - error.SetErrorStringWithFormat ("Process::GetSoftwareBreakpointTrapOpcode() returned zero, unable to get breakpoint trap for address 0x%llx", bp_addr); + error.SetErrorStringWithFormat ("Process::GetSoftwareBreakpointTrapOpcode() returned zero, unable to get breakpoint trap for address 0x%" PRIx64, bp_addr); } else { @@ -2028,7 +2028,7 @@ Process::EnableSoftwareBreakpoint (BreakpointSite *bp_site) bp_site->SetEnabled(true); bp_site->SetType (BreakpointSite::eSoftware); if (log) - log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- SUCCESS", + log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- SUCCESS", bp_site->GetID(), (uint64_t)bp_addr); } @@ -2045,7 +2045,7 @@ Process::EnableSoftwareBreakpoint (BreakpointSite *bp_site) error.SetErrorString("Unable to read memory at breakpoint address."); } if (log && error.Fail()) - log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- FAILED: %s", + log->Printf ("Process::EnableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- FAILED: %s", bp_site->GetID(), (uint64_t)bp_addr, error.AsCString()); @@ -2061,7 +2061,7 @@ Process::DisableSoftwareBreakpoint (BreakpointSite *bp_site) addr_t bp_addr = bp_site->GetLoadAddress(); lldb::user_id_t breakID = bp_site->GetID(); if (log) - log->Printf ("Process::DisableBreakpoint (breakID = %llu) addr = 0x%llx", breakID, (uint64_t)bp_addr); + log->Printf ("Process::DisableBreakpoint (breakID = %" PRIu64 ") addr = 0x%" PRIx64, breakID, (uint64_t)bp_addr); if (bp_site->IsHardware()) { @@ -2115,7 +2115,7 @@ Process::DisableSoftwareBreakpoint (BreakpointSite *bp_site) // SUCCESS bp_site->SetEnabled(false); if (log) - log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- SUCCESS", bp_site->GetID(), (uint64_t)bp_addr); + log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- SUCCESS", bp_site->GetID(), (uint64_t)bp_addr); return error; } else @@ -2135,12 +2135,12 @@ Process::DisableSoftwareBreakpoint (BreakpointSite *bp_site) else { if (log) - log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- already disabled", bp_site->GetID(), (uint64_t)bp_addr); + log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- already disabled", bp_site->GetID(), (uint64_t)bp_addr); return error; } if (log) - log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%llx -- FAILED: %s", + log->Printf ("Process::DisableSoftwareBreakpoint (site_id = %d) addr = 0x%" PRIx64 " -- FAILED: %s", bp_site->GetID(), (uint64_t)bp_addr, error.AsCString()); @@ -2490,7 +2490,7 @@ Process::AllocateMemory(size_t size, uint32_t permissions, Error &error) addr_t allocated_addr = DoAllocateMemory (size, permissions, error); LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf("Process::AllocateMemory(size=%4zu, permissions=%s) => 0x%16.16llx (m_stop_id = %u m_memory_id = %u)", + log->Printf("Process::AllocateMemory(size=%4zu, permissions=%s) => 0x%16.16" PRIx64 " (m_stop_id = %u m_memory_id = %u)", size, GetPermissionsAsCString (permissions), (uint64_t)allocated_addr, @@ -2535,14 +2535,14 @@ Process::DeallocateMemory (addr_t ptr) #if defined (USE_ALLOCATE_MEMORY_CACHE) if (!m_allocated_memory_cache.DeallocateMemory(ptr)) { - error.SetErrorStringWithFormat ("deallocation of memory at 0x%llx failed.", (uint64_t)ptr); + error.SetErrorStringWithFormat ("deallocation of memory at 0x%" PRIx64 " failed.", (uint64_t)ptr); } #else error = DoDeallocateMemory (ptr); LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf("Process::DeallocateMemory(addr=0x%16.16llx) => err = %s (m_stop_id = %u, m_memory_id = %u)", + log->Printf("Process::DeallocateMemory(addr=0x%16.16" PRIx64 ") => err = %s (m_stop_id = %u, m_memory_id = %u)", ptr, error.AsCString("SUCCESS"), m_mod_id.GetStopID(), @@ -3450,9 +3450,9 @@ Process::StartPrivateStateThread (bool force) // events make it to clients (into the DCProcess event queue). char thread_name[1024]; if (already_running) - snprintf(thread_name, sizeof(thread_name), "<lldb.process.internal-state-override(pid=%llu)>", GetID()); + snprintf(thread_name, sizeof(thread_name), "<lldb.process.internal-state-override(pid=%" PRIu64 ")>", GetID()); else - snprintf(thread_name, sizeof(thread_name), "<lldb.process.internal-state(pid=%llu)>", GetID()); + snprintf(thread_name, sizeof(thread_name), "<lldb.process.internal-state(pid=%" PRIu64 ")>", GetID()); // Create the private state thread, and start it running. m_private_state_thread = Host::ThreadCreate (thread_name, Process::PrivateStateThread, this, NULL); @@ -3601,7 +3601,7 @@ Process::HandlePrivateEvent (EventSP &event_sp) { if (log) { - log->Printf ("Process::%s (pid = %llu) broadcasting new state %s (old state %s) to %s", + log->Printf ("Process::%s (pid = %" PRIu64 ") broadcasting new state %s (old state %s) to %s", __FUNCTION__, GetID(), StateAsCString(new_state), @@ -3620,7 +3620,7 @@ Process::HandlePrivateEvent (EventSP &event_sp) { if (log) { - log->Printf ("Process::%s (pid = %llu) suppressing state %s (old state %s): should_broadcast == false", + log->Printf ("Process::%s (pid = %" PRIu64 ") suppressing state %s (old state %s): should_broadcast == false", __FUNCTION__, GetID(), StateAsCString(new_state), @@ -3646,7 +3646,7 @@ Process::RunPrivateStateThread () LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) thread starting...", __FUNCTION__, this, GetID()); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") thread starting...", __FUNCTION__, this, GetID()); bool exit_now = false; while (!exit_now) @@ -3656,7 +3656,7 @@ Process::RunPrivateStateThread () if (event_sp->BroadcasterIs(&m_private_state_control_broadcaster)) { if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) got a control event: %d", __FUNCTION__, this, GetID(), event_sp->GetType()); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") got a control event: %d", __FUNCTION__, this, GetID(), event_sp->GetType()); switch (event_sp->GetType()) { @@ -3681,13 +3681,13 @@ Process::RunPrivateStateThread () if (m_public_state.GetValue() == eStateAttaching) { if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) woke up with an interrupt while attaching - forwarding interrupt.", __FUNCTION__, this, GetID()); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") woke up with an interrupt while attaching - forwarding interrupt.", __FUNCTION__, this, GetID()); BroadcastEvent (eBroadcastBitInterrupt, NULL); } else { if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) woke up with an interrupt - Halting.", __FUNCTION__, this, GetID()); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") woke up with an interrupt - Halting.", __FUNCTION__, this, GetID()); Halt(); } continue; @@ -3705,7 +3705,7 @@ Process::RunPrivateStateThread () internal_state == eStateDetached ) { if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) about to exit with internal state %s...", __FUNCTION__, this, GetID(), StateAsCString(internal_state)); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") about to exit with internal state %s...", __FUNCTION__, this, GetID(), StateAsCString(internal_state)); break; } @@ -3713,7 +3713,7 @@ Process::RunPrivateStateThread () // Verify log is still enabled before attempting to write to it... if (log) - log->Printf ("Process::%s (arg = %p, pid = %llu) thread exiting...", __FUNCTION__, this, GetID()); + log->Printf ("Process::%s (arg = %p, pid = %" PRIu64 ") thread exiting...", __FUNCTION__, this, GetID()); m_private_state_control_wait.SetValue (true, eBroadcastAlways); m_private_state_thread = LLDB_INVALID_HOST_THREAD; @@ -3871,7 +3871,7 @@ void Process::ProcessEventData::Dump (Stream *s) const { if (m_process_sp) - s->Printf(" process = %p (pid = %llu), ", m_process_sp.get(), m_process_sp->GetID()); + s->Printf(" process = %p (pid = %" PRIu64 "), ", m_process_sp.get(), m_process_sp->GetID()); s->Printf("state = %s", StateAsCString(GetState())); } @@ -4022,7 +4022,7 @@ Process::GetAsyncProfileData (char *buf, size_t buf_size, Error &error) { LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::GetProfileData (buf = %p, size = %llu)", buf, (uint64_t)buf_size); + log->Printf ("Process::GetProfileData (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) { memcpy(buf, m_profile_data.c_str(), buf_size); @@ -4052,7 +4052,7 @@ Process::GetSTDOUT (char *buf, size_t buf_size, Error &error) { LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::GetSTDOUT (buf = %p, size = %llu)", buf, (uint64_t)buf_size); + log->Printf ("Process::GetSTDOUT (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) { memcpy(buf, m_stdout_data.c_str(), buf_size); @@ -4078,7 +4078,7 @@ Process::GetSTDERR (char *buf, size_t buf_size, Error &error) { LogSP log (lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::GetSTDERR (buf = %p, size = %llu)", buf, (uint64_t)buf_size); + log->Printf ("Process::GetSTDERR (buf = %p, size = %" PRIu64 ")", buf, (uint64_t)buf_size); if (bytes_available > buf_size) { memcpy(buf, m_stderr_data.c_str(), buf_size); @@ -4360,7 +4360,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, { StreamString s; thread_plan_sp->GetDescription(&s, lldb::eDescriptionLevelVerbose); - log->Printf ("Process::RunThreadPlan(): Resuming thread %u - 0x%4.4llx to run thread plan \"%s\".", + log->Printf ("Process::RunThreadPlan(): Resuming thread %u - 0x%4.4" PRIx64 " to run thread plan \"%s\".", thread->GetIndexID(), thread->GetID(), s.GetData()); @@ -4614,7 +4614,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, if (run_others) { if (first_timeout) - log->Printf ("Process::RunThreadPlan(): Running function with timeout: %lld timed out, " + log->Printf ("Process::RunThreadPlan(): Running function with timeout: %" PRId64 " timed out, " "trying for %d usec with all threads enabled.", computed_timeout, timeout_usec); else @@ -4861,11 +4861,11 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx, continue; } - ts.Printf("<0x%4.4llx ", thread->GetID()); + ts.Printf("<0x%4.4" PRIx64 " ", thread->GetID()); RegisterContext *register_context = thread->GetRegisterContext().get(); if (register_context) - ts.Printf("[ip 0x%llx] ", register_context->GetPC()); + ts.Printf("[ip 0x%" PRIx64 "] ", register_context->GetPC()); else ts.Printf("[ip unknown] "); @@ -5013,7 +5013,7 @@ Process::GetStatus (Stream &strm) { int exit_status = GetExitStatus(); const char *exit_description = GetExitDescription(); - strm.Printf ("Process %llu exited with status = %i (0x%8.8x) %s\n", + strm.Printf ("Process %" PRIu64 " exited with status = %i (0x%8.8x) %s\n", GetID(), exit_status, exit_status, @@ -5024,12 +5024,12 @@ Process::GetStatus (Stream &strm) if (state == eStateConnected) strm.Printf ("Connected to remote target.\n"); else - strm.Printf ("Process %llu %s\n", GetID(), StateAsCString (state)); + strm.Printf ("Process %" PRIu64 " %s\n", GetID(), StateAsCString (state)); } } else { - strm.Printf ("Process %llu is running.\n", GetID()); + strm.Printf ("Process %" PRIu64 " is running.\n", GetID()); } } diff --git a/lldb/source/Target/SectionLoadList.cpp b/lldb/source/Target/SectionLoadList.cpp index 27ed75e2d25..68aa7f0c1bc 100644 --- a/lldb/source/Target/SectionLoadList.cpp +++ b/lldb/source/Target/SectionLoadList.cpp @@ -64,7 +64,7 @@ SectionLoadList::SetSectionLoadAddress (const lldb::SectionSP §ion, addr_t l if (log) { const FileSpec &module_file_spec (section->GetModule()->GetFileSpec()); - log->Printf ("SectionLoadList::%s (section = %p (%s%s%s.%s), load_addr = 0x%16.16llx)", + log->Printf ("SectionLoadList::%s (section = %p (%s%s%s.%s), load_addr = 0x%16.16" PRIx64 ")", __FUNCTION__, section.get(), module_file_spec.GetDirectory().AsCString(), @@ -112,7 +112,7 @@ SectionLoadList::SetSectionLoadAddress (const lldb::SectionSP §ion, addr_t l ModuleSP curr_module_sp (ats_pos->second->GetModule()); if (curr_module_sp) { - module_sp->ReportWarning ("address 0x%16.16llx maps to more than one section: %s.%s and %s.%s", + module_sp->ReportWarning ("address 0x%16.16" PRIx64 " maps to more than one section: %s.%s and %s.%s", load_addr, module_sp->GetFileSpec().GetFilename().GetCString(), section->GetName().GetCString(), @@ -174,7 +174,7 @@ SectionLoadList::SetSectionUnloaded (const lldb::SectionSP §ion_sp, addr_t l if (log) { const FileSpec &module_file_spec (section_sp->GetModule()->GetFileSpec()); - log->Printf ("SectionLoadList::%s (section = %p (%s%s%s.%s), load_addr = 0x%16.16llx)", + log->Printf ("SectionLoadList::%s (section = %p (%s%s%s.%s), load_addr = 0x%16.16" PRIx64 ")", __FUNCTION__, section_sp.get(), module_file_spec.GetDirectory().AsCString(), @@ -254,7 +254,7 @@ SectionLoadList::Dump (Stream &s, Target *target) addr_to_sect_collection::const_iterator pos, end; for (pos = m_addr_to_sect.begin(), end = m_addr_to_sect.end(); pos != end; ++pos) { - s.Printf("addr = 0x%16.16llx, section = %p: ", pos->first, pos->second.get()); + s.Printf("addr = 0x%16.16" PRIx64 ", section = %p: ", pos->first, pos->second.get()); pos->second->Dump (&s, target, 0); } } diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 4fb4ea9c7fd..1a9434fc9d3 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -1298,7 +1298,7 @@ StackFrame::Dump (Stream *strm, bool show_frame_index, bool show_fullpaths) strm->Printf("frame #%u: ", m_frame_index); ExecutionContext exe_ctx (shared_from_this()); Target *target = exe_ctx.GetTargetPtr(); - strm->Printf("0x%0*llx ", + strm->Printf("0x%0*" PRIx64 " ", target ? (target->GetArchitecture().GetAddressByteSize() * 2) : 16, GetFrameCodeAddress().GetLoadAddress(target)); GetSymbolContext(eSymbolContextEverything); diff --git a/lldb/source/Target/StackFrameList.cpp b/lldb/source/Target/StackFrameList.cpp index 575063eeadb..082fddd09ed 100644 --- a/lldb/source/Target/StackFrameList.cpp +++ b/lldb/source/Target/StackFrameList.cpp @@ -205,7 +205,7 @@ StackFrameList::ResetCurrentInlinedDepth () m_current_inlined_depth = num_inlined_functions + 1; LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log && log->GetVerbose()) - log->Printf ("ResetCurrentInlinedDepth: setting inlined depth: %d 0x%llx.\n", m_current_inlined_depth, curr_pc); + log->Printf ("ResetCurrentInlinedDepth: setting inlined depth: %d 0x%" PRIx64 ".\n", m_current_inlined_depth, curr_pc); } break; @@ -370,7 +370,7 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx) //curr_frames->m_current_inlined_depth = prev_frames->m_current_inlined_depth; //curr_frames->m_current_inlined_pc = prev_frames->m_current_inlined_pc; - //printf ("GetFramesUpTo: Copying current inlined depth: %d 0x%llx.\n", curr_frames->m_current_inlined_depth, curr_frames->m_current_inlined_pc); + //printf ("GetFramesUpTo: Copying current inlined depth: %d 0x%" PRIx64 ".\n", curr_frames->m_current_inlined_depth, curr_frames->m_current_inlined_pc); #if defined (DEBUG_STACK_FRAMES) s.PutCString("\nprev_frames:\n"); diff --git a/lldb/source/Target/StackID.cpp b/lldb/source/Target/StackID.cpp index 1b55b722d3c..9e8c315d070 100644 --- a/lldb/source/Target/StackID.cpp +++ b/lldb/source/Target/StackID.cpp @@ -24,14 +24,14 @@ using namespace lldb_private; void StackID::Dump (Stream *s) { - s->Printf("StackID (pc = 0x%16.16llx, cfa = 0x%16.16llx, symbol_scope = %p", (uint64_t)m_pc, (uint64_t)m_cfa, m_symbol_scope); + s->Printf("StackID (pc = 0x%16.16" PRIx64 ", cfa = 0x%16.16" PRIx64 ", symbol_scope = %p", (uint64_t)m_pc, (uint64_t)m_cfa, m_symbol_scope); if (m_symbol_scope) { SymbolContext sc; m_symbol_scope->CalculateSymbolContext (&sc); if (sc.block) - s->Printf(" (Block {0x%8.8llx})", sc.block->GetID()); + s->Printf(" (Block {0x%8.8" PRIx64 "})", sc.block->GetID()); else if (sc.symbol) s->Printf(" (Symbol{0x%8.8x})", sc.symbol->GetID()); } diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp index 9d9bfd21b89..bae1e4af990 100644 --- a/lldb/source/Target/StopInfo.cpp +++ b/lldb/source/Target/StopInfo.cpp @@ -165,7 +165,7 @@ public: LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::%s could not find breakpoint site id: %lld...", __FUNCTION__, m_value); + log->Printf ("Process::%s could not find breakpoint site id: %" PRId64 "...", __FUNCTION__, m_value); m_should_stop = true; } @@ -219,9 +219,9 @@ public: strm.Printf ("breakpoint %d which has been deleted.", m_break_id); } else if (m_address == LLDB_INVALID_ADDRESS) - strm.Printf("breakpoint site %lli which has been deleted - unknown address", m_value); + strm.Printf("breakpoint site %" PRIi64 " which has been deleted - unknown address", m_value); else - strm.Printf("breakpoint site %lli which has been deleted - was at 0x%llx", m_value, m_address); + strm.Printf("breakpoint site %" PRIi64 " which has been deleted - was at 0x%" PRIx64, m_value, m_address); m_description.swap (strm.GetString()); } @@ -397,7 +397,7 @@ protected: LogSP log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log_process) - log_process->Printf ("Process::%s could not find breakpoint site id: %lld...", __FUNCTION__, m_value); + log_process->Printf ("Process::%s could not find breakpoint site id: %" PRId64 "...", __FUNCTION__, m_value); } if (log) log->Printf ("Process::%s returning from action with m_should_stop: %d.", __FUNCTION__, m_should_stop); @@ -475,7 +475,7 @@ public: if (m_description.empty()) { StreamString strm; - strm.Printf("watchpoint %lli", m_value); + strm.Printf("watchpoint %" PRIi64, m_value); m_description.swap (strm.GetString()); } return m_description.c_str(); @@ -509,7 +509,7 @@ protected: LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log) - log->Printf ("Process::%s could not find watchpoint location id: %lld...", + log->Printf ("Process::%s could not find watchpoint location id: %" PRId64 "...", __FUNCTION__, GetValue()); m_should_stop = true; @@ -666,7 +666,7 @@ protected: LogSP log_process(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS)); if (log_process) - log_process->Printf ("Process::%s could not find watchpoint id: %lld...", __FUNCTION__, m_value); + log_process->Printf ("Process::%s could not find watchpoint id: %" PRId64 "...", __FUNCTION__, m_value); } if (log) log->Printf ("Process::%s returning from action with m_should_stop: %d.", __FUNCTION__, m_should_stop); @@ -737,7 +737,7 @@ public: if (signal_name) strm.Printf("signal %s", signal_name); else - strm.Printf("signal %lli", m_value); + strm.Printf("signal %" PRIi64, m_value); m_description.swap (strm.GetString()); } return m_description.c_str(); diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index ec88710a843..47a587d102a 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -527,7 +527,7 @@ Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *typ { LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_WATCHPOINTS)); if (log) - log->Printf("Target::%s (addr = 0x%8.8llx size = %llu type = %u)\n", + log->Printf("Target::%s (addr = 0x%8.8" PRIx64 " size = %" PRIu64 " type = %u)\n", __FUNCTION__, addr, (uint64_t)size, kind); WatchpointSP wp_sp; @@ -541,7 +541,7 @@ Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *typ if (size == 0) error.SetErrorString("cannot set a watchpoint with watch_size of 0"); else - error.SetErrorStringWithFormat("invalid watch address: %llu", addr); + error.SetErrorStringWithFormat("invalid watch address: %" PRIu64, addr); return wp_sp; } @@ -1244,12 +1244,12 @@ Target::ReadMemory (const Address& addr, { ModuleSP addr_module_sp (resolved_addr.GetModule()); if (addr_module_sp && addr_module_sp->GetFileSpec()) - error.SetErrorStringWithFormat("%s[0x%llx] can't be resolved, %s in not currently loaded", + error.SetErrorStringWithFormat("%s[0x%" PRIx64 "] can't be resolved, %s in not currently loaded", addr_module_sp->GetFileSpec().GetFilename().AsCString(), resolved_addr.GetFileAddress(), addr_module_sp->GetFileSpec().GetFilename().AsCString()); else - error.SetErrorStringWithFormat("0x%llx can't be resolved", resolved_addr.GetFileAddress()); + error.SetErrorStringWithFormat("0x%" PRIx64 " can't be resolved", resolved_addr.GetFileAddress()); } else { @@ -1259,9 +1259,9 @@ Target::ReadMemory (const Address& addr, if (error.Success()) { if (bytes_read == 0) - error.SetErrorStringWithFormat("read memory from 0x%llx failed", load_addr); + error.SetErrorStringWithFormat("read memory from 0x%" PRIx64 " failed", load_addr); else - error.SetErrorStringWithFormat("only %llu of %llu bytes were read from memory at 0x%llx", (uint64_t)bytes_read, (uint64_t)dst_len, load_addr); + error.SetErrorStringWithFormat("only %" PRIu64 " of %" PRIu64 " bytes were read from memory at 0x%" PRIx64, (uint64_t)bytes_read, (uint64_t)dst_len, load_addr); } } if (bytes_read) @@ -2015,9 +2015,9 @@ Target::RunStopHooks () cur_hook_sp->GetCommands().GetStringAtIndex(0) : NULL); if (cmd) - result.AppendMessageWithFormat("\n- Hook %llu (%s)\n", cur_hook_sp->GetID(), cmd); + result.AppendMessageWithFormat("\n- Hook %" PRIu64 " (%s)\n", cur_hook_sp->GetID(), cmd); else - result.AppendMessageWithFormat("\n- Hook %llu\n", cur_hook_sp->GetID()); + result.AppendMessageWithFormat("\n- Hook %" PRIu64 "\n", cur_hook_sp->GetID()); any_thread_matched = true; } @@ -2042,7 +2042,7 @@ Target::RunStopHooks () if ((result.GetStatus() == eReturnStatusSuccessContinuingNoResult) || (result.GetStatus() == eReturnStatusSuccessContinuingResult)) { - result.AppendMessageWithFormat ("Aborting stop hooks, hook %llu set the program running.", cur_hook_sp->GetID()); + result.AppendMessageWithFormat ("Aborting stop hooks, hook %" PRIu64 " set the program running.", cur_hook_sp->GetID()); keep_going = false; } } @@ -2100,7 +2100,7 @@ Target::StopHook::GetDescription (Stream *s, lldb::DescriptionLevel level) const s->SetIndentLevel(indent_level + 2); - s->Printf ("Hook: %llu\n", GetID()); + s->Printf ("Hook: %" PRIu64 "\n", GetID()); if (m_active) s->Indent ("State: enabled\n"); else diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index b595dc627a9..4c6995cf073 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -260,7 +260,7 @@ Thread::Thread (Process &process, lldb::tid_t tid) : { LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) - log->Printf ("%p Thread::Thread(tid = 0x%4.4llx)", this, GetID()); + log->Printf ("%p Thread::Thread(tid = 0x%4.4" PRIx64 ")", this, GetID()); CheckInWithManager(); QueueFundamentalPlan(true); @@ -271,7 +271,7 @@ Thread::~Thread() { LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT)); if (log) - log->Printf ("%p Thread::~Thread(tid = 0x%4.4llx)", this, GetID()); + log->Printf ("%p Thread::~Thread(tid = 0x%4.4" PRIx64 ")", this, GetID()); /// If you hit this assert, it means your derived class forgot to call DoDestroy in its destructor. assert (m_destroy_called); } @@ -544,10 +544,10 @@ Thread::ShouldStop (Event* event_ptr) if (GetResumeState () == eStateSuspended) { if (log) - log->Printf ("Thread::%s for tid = 0x%4.4llx, should_stop = 0 (ignore since thread was suspended)", + log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", should_stop = 0 (ignore since thread was suspended)", __FUNCTION__, GetID ()); -// log->Printf ("Thread::%s for tid = 0x%4.4llx, pc = 0x%16.16llx, should_stop = 0 (ignore since thread was suspended)", +// log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", pc = 0x%16.16" PRIx64 ", should_stop = 0 (ignore since thread was suspended)", // __FUNCTION__, // GetID (), // GetRegisterContext()->GetPC()); @@ -557,10 +557,10 @@ Thread::ShouldStop (Event* event_ptr) if (GetTemporaryResumeState () == eStateSuspended) { if (log) - log->Printf ("Thread::%s for tid = 0x%4.4llx, should_stop = 0 (ignore since thread was suspended)", + log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", should_stop = 0 (ignore since thread was suspended)", __FUNCTION__, GetID ()); -// log->Printf ("Thread::%s for tid = 0x%4.4llx, pc = 0x%16.16llx, should_stop = 0 (ignore since thread was suspended)", +// log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", pc = 0x%16.16" PRIx64 ", should_stop = 0 (ignore since thread was suspended)", // __FUNCTION__, // GetID (), // GetRegisterContext()->GetPC()); @@ -570,7 +570,7 @@ Thread::ShouldStop (Event* event_ptr) if (ThreadStoppedForAReason() == false) { if (log) - log->Printf ("Thread::%s for tid = 0x%4.4llx, pc = 0x%16.16llx, should_stop = 0 (ignore since no stop reason)", + log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", pc = 0x%16.16" PRIx64 ", should_stop = 0 (ignore since no stop reason)", __FUNCTION__, GetID (), GetRegisterContext()->GetPC()); @@ -579,7 +579,7 @@ Thread::ShouldStop (Event* event_ptr) if (log) { - log->Printf ("Thread::%s for tid = 0x%4.4llx, pc = 0x%16.16llx", + log->Printf ("Thread::%s for tid = 0x%4.4" PRIx64 ", pc = 0x%16.16" PRIx64, __FUNCTION__, GetID (), GetRegisterContext()->GetPC()); @@ -776,21 +776,21 @@ Thread::ShouldReportStop (Event* event_ptr) if (thread_state == eStateSuspended || thread_state == eStateInvalid) { if (log) - log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4llx: returning vote %i (state was suspended or invalid)\n", GetID(), eVoteNoOpinion); + log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4" PRIx64 ": returning vote %i (state was suspended or invalid)\n", GetID(), eVoteNoOpinion); return eVoteNoOpinion; } if (temp_thread_state == eStateSuspended || temp_thread_state == eStateInvalid) { if (log) - log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4llx: returning vote %i (temporary state was suspended or invalid)\n", GetID(), eVoteNoOpinion); + log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4" PRIx64 ": returning vote %i (temporary state was suspended or invalid)\n", GetID(), eVoteNoOpinion); return eVoteNoOpinion; } if (!ThreadStoppedForAReason()) { if (log) - log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4llx: returning vote %i (thread didn't stop for a reason.)\n", GetID(), eVoteNoOpinion); + log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4" PRIx64 ": returning vote %i (thread didn't stop for a reason.)\n", GetID(), eVoteNoOpinion); return eVoteNoOpinion; } @@ -798,13 +798,13 @@ Thread::ShouldReportStop (Event* event_ptr) { // Don't use GetCompletedPlan here, since that suppresses private plans. if (log) - log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4llx: returning vote for complete stack's back plan\n", GetID()); + log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4" PRIx64 ": returning vote for complete stack's back plan\n", GetID()); return m_completed_plan_stack.back()->ShouldReportStop (event_ptr); } else { if (log) - log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4llx: returning vote for current plan\n", GetID()); + log->Printf ("Thread::ShouldReportStop() tid = 0x%4.4" PRIx64 ": returning vote for current plan\n", GetID()); return GetCurrentPlan()->ShouldReportStop (event_ptr); } } @@ -825,7 +825,7 @@ Thread::ShouldReportRun (Event* event_ptr) { // Don't use GetCompletedPlan here, since that suppresses private plans. if (log) - log->Printf ("Current Plan for thread %d (0x%4.4llx): %s being asked whether we should report run.", + log->Printf ("Current Plan for thread %d (0x%4.4" PRIx64 "): %s being asked whether we should report run.", GetIndexID(), GetID(), m_completed_plan_stack.back()->GetName()); @@ -835,7 +835,7 @@ Thread::ShouldReportRun (Event* event_ptr) else { if (log) - log->Printf ("Current Plan for thread %d (0x%4.4llx): %s being asked whether we should report run.", + log->Printf ("Current Plan for thread %d (0x%4.4" PRIx64 "): %s being asked whether we should report run.", GetIndexID(), GetID(), GetCurrentPlan()->GetName()); @@ -870,7 +870,7 @@ Thread::PushPlan (ThreadPlanSP &thread_plan_sp) { StreamString s; thread_plan_sp->GetDescription (&s, lldb::eDescriptionLevelFull); - log->Printf("Pushing plan: \"%s\", tid = 0x%4.4llx.", + log->Printf("Pushing plan: \"%s\", tid = 0x%4.4" PRIx64 ".", s.GetData(), thread_plan_sp->GetThread().GetID()); } @@ -889,7 +889,7 @@ Thread::PopPlan () ThreadPlanSP &plan = m_plan_stack.back(); if (log) { - log->Printf("Popping plan: \"%s\", tid = 0x%4.4llx.", plan->GetName(), plan->GetThread().GetID()); + log->Printf("Popping plan: \"%s\", tid = 0x%4.4" PRIx64 ".", plan->GetName(), plan->GetThread().GetID()); } m_completed_plan_stack.push_back (plan); plan->WillPop(); @@ -1054,7 +1054,7 @@ Thread::DiscardThreadPlansUpToPlan (ThreadPlan *up_to_plan_ptr) LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { - log->Printf("Discarding thread plans for thread tid = 0x%4.4llx, up to %p", GetID(), up_to_plan_ptr); + log->Printf("Discarding thread plans for thread tid = 0x%4.4" PRIx64 ", up to %p", GetID(), up_to_plan_ptr); } int stack_size = m_plan_stack.size(); @@ -1095,7 +1095,7 @@ Thread::DiscardThreadPlans(bool force) LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { - log->Printf("Discarding thread plans for thread (tid = 0x%4.4llx, force %d)", GetID(), force); + log->Printf("Discarding thread plans for thread (tid = 0x%4.4" PRIx64 ", force %d)", GetID(), force); } if (force) @@ -1311,7 +1311,7 @@ Thread::DumpThreadPlans (lldb_private::Stream *s) const uint32_t stack_size = m_plan_stack.size(); int i; s->Indent(); - s->Printf ("Plan Stack for thread #%u: tid = 0x%4.4llx, stack_size = %d\n", GetIndexID(), GetID(), stack_size); + s->Printf ("Plan Stack for thread #%u: tid = 0x%4.4" PRIx64 ", stack_size = %d\n", GetIndexID(), GetID(), stack_size); for (i = stack_size - 1; i >= 0; i--) { s->IndentMore(); @@ -1437,7 +1437,7 @@ Thread::ReturnFromFrameWithIndex (uint32_t frame_idx, lldb::ValueObjectSP return if (!frame_sp) { - return_error.SetErrorStringWithFormat("Could not find frame with index %d in thread 0x%llx.", frame_idx, GetID()); + return_error.SetErrorStringWithFormat("Could not find frame with index %d in thread 0x%" PRIx64 ".", frame_idx, GetID()); } return ReturnFromFrame(frame_sp, return_value_sp, broadcast); diff --git a/lldb/source/Target/ThreadList.cpp b/lldb/source/Target/ThreadList.cpp index 8d3f4a84273..fe38b5769f9 100644 --- a/lldb/source/Target/ThreadList.cpp +++ b/lldb/source/Target/ThreadList.cpp @@ -202,7 +202,7 @@ ThreadList::ShouldStop (Event *event_ptr) if (log) { log->PutCString(""); - log->Printf ("ThreadList::%s: %llu threads", __FUNCTION__, (uint64_t)m_threads.size()); + log->Printf ("ThreadList::%s: %" PRIu64 " threads", __FUNCTION__, (uint64_t)m_threads.size()); } for (pos = threads_copy.begin(); pos != end; ++pos) @@ -241,7 +241,7 @@ ThreadList::ShouldReportStop (Event *event_ptr) LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) - log->Printf ("ThreadList::%s %llu threads", __FUNCTION__, (uint64_t)m_threads.size()); + log->Printf ("ThreadList::%s %" PRIu64 " threads", __FUNCTION__, (uint64_t)m_threads.size()); // Run through the threads and ask whether we should report this event. // For stopping, a YES vote wins over everything. A NO vote wins over NO opinion. @@ -266,7 +266,7 @@ ThreadList::ShouldReportStop (Event *event_ptr) else { if (log) - log->Printf ("ThreadList::%s thread 0x%4.4llx: voted %s, but lost out because result was %s", + log->Printf ("ThreadList::%s thread 0x%4.4" PRIx64 ": voted %s, but lost out because result was %s", __FUNCTION__, thread_sp->GetID (), GetVoteAsCString (vote), @@ -309,7 +309,7 @@ ThreadList::ShouldReportRun (Event *event_ptr) break; case eVoteNo: if (log) - log->Printf ("ThreadList::ShouldReportRun() thread %d (0x%4.4llx) says don't report.", + log->Printf ("ThreadList::ShouldReportRun() thread %d (0x%4.4" PRIx64 ") says don't report.", (*pos)->GetIndexID(), (*pos)->GetID()); result = eVoteNo; diff --git a/lldb/source/Target/ThreadPlan.cpp b/lldb/source/Target/ThreadPlan.cpp index 8dcbe85c3a2..1bf7d59ba89 100644 --- a/lldb/source/Target/ThreadPlan.cpp +++ b/lldb/source/Target/ThreadPlan.cpp @@ -139,7 +139,7 @@ ThreadPlan::WillResume (StateType resume_state, bool current_plan) addr_t pc = reg_ctx->GetPC(); addr_t sp = reg_ctx->GetSP(); addr_t fp = reg_ctx->GetFP(); - log->Printf("%s Thread #%u: tid = 0x%4.4llx, pc = 0x%8.8llx, sp = 0x%8.8llx, fp = 0x%8.8llx, " + log->Printf("%s Thread #%u: tid = 0x%4.4" PRIx64 ", pc = 0x%8.8" PRIx64 ", sp = 0x%8.8" PRIx64 ", fp = 0x%8.8" PRIx64 ", " "plan = '%s', state = %s, stop others = %d", __FUNCTION__, m_thread.GetIndexID(), diff --git a/lldb/source/Target/ThreadPlanBase.cpp b/lldb/source/Target/ThreadPlanBase.cpp index fcb868302da..f8e4b6a156a 100644 --- a/lldb/source/Target/ThreadPlanBase.cpp +++ b/lldb/source/Target/ThreadPlanBase.cpp @@ -107,7 +107,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr) // at this point. Don't force the discard, however, so Master plans can stay // in place if they want to. if (log) - log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (breakpoint hit.)", m_thread.GetID()); + log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4" PRIx64 " (breakpoint hit.)", m_thread.GetID()); m_thread.DiscardThreadPlans(false); return true; } @@ -135,7 +135,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr) // If we crashed, discard thread plans and stop. Don't force the discard, however, // since on rerun the target may clean up this exception and continue normally from there. if (log) - log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (exception.)", m_thread.GetID()); + log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4" PRIx64 " (exception.)", m_thread.GetID()); m_thread.DiscardThreadPlans(false); return true; @@ -143,7 +143,7 @@ ThreadPlanBase::ShouldStop (Event *event_ptr) if (stop_info_sp->ShouldStop(event_ptr)) { if (log) - log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4llx (signal.)", m_thread.GetID()); + log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4" PRIx64 " (signal.)", m_thread.GetID()); m_thread.DiscardThreadPlans(false); return true; } diff --git a/lldb/source/Target/ThreadPlanCallFunction.cpp b/lldb/source/Target/ThreadPlanCallFunction.cpp index 8a85bf05396..a17b3b6ce72 100644 --- a/lldb/source/Target/ThreadPlanCallFunction.cpp +++ b/lldb/source/Target/ThreadPlanCallFunction.cpp @@ -68,7 +68,7 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread, if (!error.Success()) { if (log) - log->Printf ("ThreadPlanCallFunction(%p): Trying to put the stack in unreadable memory at: 0x%llx.", this, m_function_sp); + log->Printf ("ThreadPlanCallFunction(%p): Trying to put the stack in unreadable memory at: 0x%" PRIx64 ".", this, m_function_sp); return false; } @@ -283,7 +283,7 @@ ThreadPlanCallFunction::DoTakedown (bool success) } } if (log) - log->Printf ("ThreadPlanCallFunction(%p): DoTakedown called for thread 0x%4.4llx, m_valid: %d complete: %d.\n", this, m_thread.GetID(), m_valid, IsPlanComplete()); + log->Printf ("ThreadPlanCallFunction(%p): DoTakedown called for thread 0x%4.4" PRIx64 ", m_valid: %d complete: %d.\n", this, m_thread.GetID(), m_valid, IsPlanComplete()); m_takedown_done = true; m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC(); m_real_stop_info_sp = GetPrivateStopReason(); @@ -297,7 +297,7 @@ ThreadPlanCallFunction::DoTakedown (bool success) else { if (log) - log->Printf ("ThreadPlanCallFunction(%p): DoTakedown called as no-op for thread 0x%4.4llx, m_valid: %d complete: %d.\n", this, m_thread.GetID(), m_valid, IsPlanComplete()); + log->Printf ("ThreadPlanCallFunction(%p): DoTakedown called as no-op for thread 0x%4.4" PRIx64 ", m_valid: %d complete: %d.\n", this, m_thread.GetID(), m_valid, IsPlanComplete()); } } @@ -317,7 +317,7 @@ ThreadPlanCallFunction::GetDescription (Stream *s, DescriptionLevel level) else { TargetSP target_sp (m_thread.CalculateTarget()); - s->Printf("Thread plan to call 0x%llx", m_function_addr.GetLoadAddress(target_sp.get())); + s->Printf("Thread plan to call 0x%" PRIx64, m_function_addr.GetLoadAddress(target_sp.get())); } } diff --git a/lldb/source/Target/ThreadPlanShouldStopHere.cpp b/lldb/source/Target/ThreadPlanShouldStopHere.cpp index 9528e629b34..7ae20f517c3 100644 --- a/lldb/source/Target/ThreadPlanShouldStopHere.cpp +++ b/lldb/source/Target/ThreadPlanShouldStopHere.cpp @@ -60,11 +60,11 @@ ThreadPlanShouldStopHere::InvokeShouldStopHereCallback () { StreamString s; return_plan->GetDescription (&s, lldb::eDescriptionLevelFull); - log->Printf ("ShouldStopHere callback found a step out plan from 0x%llx: %s.", current_addr, s.GetData()); + log->Printf ("ShouldStopHere callback found a step out plan from 0x%" PRIx64 ": %s.", current_addr, s.GetData()); } else { - log->Printf ("ShouldStopHere callback didn't find a step out plan from: 0x%llx.", current_addr); + log->Printf ("ShouldStopHere callback didn't find a step out plan from: 0x%" PRIx64 ".", current_addr); } } return return_plan; diff --git a/lldb/source/Target/ThreadPlanStepOut.cpp b/lldb/source/Target/ThreadPlanStepOut.cpp index 4e628e7d0b0..540539e524b 100644 --- a/lldb/source/Target/ThreadPlanStepOut.cpp +++ b/lldb/source/Target/ThreadPlanStepOut.cpp @@ -148,7 +148,7 @@ ThreadPlanStepOut::GetDescription (Stream *s, lldb::DescriptionLevel level) else if (m_step_through_inline_plan_sp) s->Printf ("Stepping out by stepping through inlined function."); else - s->Printf ("Stepping out from address 0x%llx to return address 0x%llx using breakpoint site %d", + s->Printf ("Stepping out from address 0x%" PRIx64 " to return address 0x%" PRIx64 " using breakpoint site %d", (uint64_t)m_step_from_insn, (uint64_t)m_return_addr, m_return_bp_id); diff --git a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp index 3d4aa7c4af7..59244e5cc5d 100644 --- a/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp +++ b/lldb/source/Target/ThreadPlanStepOverBreakpoint.cpp @@ -48,7 +48,7 @@ ThreadPlanStepOverBreakpoint::~ThreadPlanStepOverBreakpoint () void ThreadPlanStepOverBreakpoint::GetDescription (Stream *s, lldb::DescriptionLevel level) { - s->Printf("Single stepping past breakpoint site %llu at 0x%llx", m_breakpoint_site_id, (uint64_t)m_breakpoint_addr); + s->Printf("Single stepping past breakpoint site %" PRIu64 " at 0x%" PRIx64, m_breakpoint_site_id, (uint64_t)m_breakpoint_addr); } bool diff --git a/lldb/source/Target/ThreadPlanStepRange.cpp b/lldb/source/Target/ThreadPlanStepRange.cpp index 73db0440087..25de2b35bed 100644 --- a/lldb/source/Target/ThreadPlanStepRange.cpp +++ b/lldb/source/Target/ThreadPlanStepRange.cpp @@ -190,7 +190,7 @@ ThreadPlanStepRange::InRange () } if (!ret_value && log) - log->Printf ("Step range plan out of range to 0x%llx", pc_load_addr); + log->Printf ("Step range plan out of range to 0x%" PRIx64, pc_load_addr); return ret_value; } diff --git a/lldb/source/Target/ThreadPlanStepThrough.cpp b/lldb/source/Target/ThreadPlanStepThrough.cpp index 003d199e379..21e1eeb8d3c 100644 --- a/lldb/source/Target/ThreadPlanStepThrough.cpp +++ b/lldb/source/Target/ThreadPlanStepThrough.cpp @@ -65,7 +65,7 @@ ThreadPlanStepThrough::ThreadPlanStepThrough (Thread &thread, StackID &m_stack_i LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); if (log) { - log->Printf ("Setting backstop breakpoint %d at address: 0x%llx", m_backstop_bkpt_id, m_backstop_addr); + log->Printf ("Setting backstop breakpoint %d at address: 0x%" PRIx64, m_backstop_bkpt_id, m_backstop_addr); } } } @@ -103,11 +103,11 @@ ThreadPlanStepThrough::LookForPlanToStepThroughFromCurrentPC() { StreamString s; m_sub_plan_sp->GetDescription(&s, lldb::eDescriptionLevelFull); - log->Printf ("Found step through plan from 0x%llx: %s", current_address, s.GetData()); + log->Printf ("Found step through plan from 0x%" PRIx64 ": %s", current_address, s.GetData()); } else { - log->Printf ("Couldn't find step through plan from address 0x%llx.", current_address); + log->Printf ("Couldn't find step through plan from address 0x%" PRIx64 ".", current_address); } } } diff --git a/lldb/source/Target/ThreadPlanStepUntil.cpp b/lldb/source/Target/ThreadPlanStepUntil.cpp index b48c5f16999..1e454e73b04 100644 --- a/lldb/source/Target/ThreadPlanStepUntil.cpp +++ b/lldb/source/Target/ThreadPlanStepUntil.cpp @@ -133,21 +133,21 @@ ThreadPlanStepUntil::GetDescription (Stream *s, lldb::DescriptionLevel level) else { if (m_until_points.size() == 1) - s->Printf ("Stepping from address 0x%llx until we reach 0x%llx using breakpoint %d", + s->Printf ("Stepping from address 0x%" PRIx64 " until we reach 0x%" PRIx64 " using breakpoint %d", (uint64_t)m_step_from_insn, (uint64_t) (*m_until_points.begin()).first, (*m_until_points.begin()).second); else { until_collection::iterator pos, end = m_until_points.end(); - s->Printf ("Stepping from address 0x%llx until we reach one of:", + s->Printf ("Stepping from address 0x%" PRIx64 " until we reach one of:", (uint64_t)m_step_from_insn); for (pos = m_until_points.begin(); pos != end; pos++) { - s->Printf ("\n\t0x%llx (bp: %d)", (uint64_t) (*pos).first, (*pos).second); + s->Printf ("\n\t0x%" PRIx64 " (bp: %d)", (uint64_t) (*pos).first, (*pos).second); } } - s->Printf(" stepped out address is 0x%llx.", (uint64_t) m_return_addr); + s->Printf(" stepped out address is 0x%" PRIx64 ".", (uint64_t) m_return_addr); } } diff --git a/lldb/source/Target/ThreadSpec.cpp b/lldb/source/Target/ThreadSpec.cpp index fda54546186..cb54469ba90 100644 --- a/lldb/source/Target/ThreadSpec.cpp +++ b/lldb/source/Target/ThreadSpec.cpp @@ -140,7 +140,7 @@ ThreadSpec::GetDescription (Stream *s, lldb::DescriptionLevel level) const else { if (GetTID() != LLDB_INVALID_THREAD_ID) - s->Printf("tid: 0x%llx ", GetTID()); + s->Printf("tid: 0x%" PRIx64 " ", GetTID()); if (GetIndex() != UINT32_MAX) s->Printf("index: %d ", GetIndex()); |
