diff options
-rw-r--r-- | source/DataFormatters/FormatManager.cpp | 8 | ||||
-rw-r--r-- | source/Expression/ClangExpressionDeclMap.cpp | 2 | ||||
-rw-r--r-- | source/Expression/IRExecutionUnit.cpp | 4 | ||||
-rw-r--r-- | source/Target/ThreadPlan.cpp | 24 |
4 files changed, 19 insertions, 19 deletions
diff --git a/source/DataFormatters/FormatManager.cpp b/source/DataFormatters/FormatManager.cpp index 1f746827b..eeae8bc9a 100644 --- a/source/DataFormatters/FormatManager.cpp +++ b/source/DataFormatters/FormatManager.cpp @@ -351,7 +351,7 @@ FormatManager::GetSummaryFormat (ValueObject& valobj, { log->Printf("[FormatManager::GetSummaryFormat] Cache search success. Returning."); if (log->GetDebug()) - log->Printf("[FormatManager::GetSummaryFormat] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); + log->Printf("[FormatManager::GetSummaryFormat] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); } return retval; } @@ -366,7 +366,7 @@ FormatManager::GetSummaryFormat (ValueObject& valobj, m_format_cache.SetSummary(valobj_type,retval); } if (log && log->GetDebug()) - log->Printf("[FormatManager::GetSummaryFormat] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); + log->Printf("[FormatManager::GetSummaryFormat] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); return retval; } @@ -388,7 +388,7 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj, { log->Printf("[FormatManager::GetSyntheticChildren] Cache search success. Returning."); if (log->GetDebug()) - log->Printf("[FormatManager::GetSyntheticChildren] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); + log->Printf("[FormatManager::GetSyntheticChildren] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); } return retval; } @@ -403,7 +403,7 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj, m_format_cache.SetSynthetic(valobj_type,retval); } if (log && log->GetDebug()) - log->Printf("[FormatManager::GetSyntheticChildren] Cache hits: %llu - Cache Misses: %llu", m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); + log->Printf("[FormatManager::GetSyntheticChildren] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses()); return retval; } #endif diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp index 3d224863e..072e7819c 100644 --- a/source/Expression/ClangExpressionDeclMap.cpp +++ b/source/Expression/ClangExpressionDeclMap.cpp @@ -1482,7 +1482,7 @@ ClangExpressionDeclMap::GetVariableValue (VariableSP &var, var->CalculateSymbolContext(&var_sc); if (!var_sc.module_sp) - return NULL; + return false; Address so_addr(var_location.GetScalar().ULongLong(), var_sc.module_sp->GetSectionList()); diff --git a/source/Expression/IRExecutionUnit.cpp b/source/Expression/IRExecutionUnit.cpp index 4b66b867d..16ef6e5d5 100644 --- a/source/Expression/IRExecutionUnit.cpp +++ b/source/Expression/IRExecutionUnit.cpp @@ -582,8 +582,8 @@ IRExecutionUnit::GetRemoteAddressForLocal (lldb::addr_t local_address) { log->Printf("IRExecutionUnit::GetRemoteAddressForLocal() found 0x%" PRIx64 " in [0x%" PRIx64 "..0x%" PRIx64 "], and returned 0x%" PRIx64 " from [0x%" PRIx64 "..0x%" PRIx64 "].", local_address, - (unsigned long long)record.m_host_address, - (unsigned long long)record.m_host_address + (unsigned long long)record.m_size, + (uint64_t)record.m_host_address, + (uint64_t)record.m_host_address + (uint64_t)record.m_size, ret, record.m_process_address, record.m_process_address + record.m_size); diff --git a/source/Target/ThreadPlan.cpp b/source/Target/ThreadPlan.cpp index 11240dbe2..65d51bd01 100644 --- a/source/Target/ThreadPlan.cpp +++ b/source/Target/ThreadPlan.cpp @@ -239,14 +239,14 @@ bool ThreadPlanNull::ValidatePlan (Stream *error) { #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); @@ -258,14 +258,14 @@ bool ThreadPlanNull::ShouldStop (Event *event_ptr) { #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); @@ -277,14 +277,14 @@ bool ThreadPlanNull::WillStop () { #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); @@ -296,14 +296,14 @@ bool ThreadPlanNull::DoPlanExplainsStop (Event *event_ptr) { #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); @@ -317,14 +317,14 @@ ThreadPlanNull::MischiefManaged () { // The null plan is never done. #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); @@ -337,14 +337,14 @@ ThreadPlanNull::GetPlanRunState () { // Not sure what to return here. This is a dead thread. #ifdef LLDB_CONFIGURATION_DEBUG - fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + fprintf(stderr, "error: %s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); #else Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD)); if (log) - log->Error("%s called on thread that has been destroyed (tid = 0x%llx, ptid = 0x%llx)", + log->Error("%s called on thread that has been destroyed (tid = 0x%" PRIx64 ", ptid = 0x%" PRIx64 ")", __PRETTY_FUNCTION__, m_thread.GetID(), m_thread.GetProtocolID()); |