From e575e7bce0585bd8d40aa0e196fdadc5e86c45a5 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Tue, 19 Feb 2013 06:11:13 +0000 Subject: [PATCH] Always print the kernel UUID and load address if we are working with a kernel binary - even if we can't find the symbol-rich binary or dSYM on the debugger-system. Print a warning if the symbol-rich binary cannot be located. This more closely emulates the gdb behavior when a kernel debug session failed to locate a kernel binary. llvm-svn: 175491 --- .../Darwin-Kernel/DynamicLoaderDarwinKernel.cpp | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 0ca2792..9cf8f5d 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -734,6 +734,17 @@ DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule (Process *p bool uuid_is_valid = m_uuid.IsValid(); + if (IsKernel() && uuid_is_valid && m_memory_module_sp.get()) + { + Stream *s = &target.GetDebugger().GetOutputStream(); + if (s) + { + char uuidbuf[64]; + s->Printf ("Kernel UUID: %s\n", m_memory_module_sp->GetUUID().GetAsCString(uuidbuf, sizeof (uuidbuf))); + s->Printf ("Load Address: 0x%" PRIx64 "\n", m_load_address); + } + } + if (!m_module_sp) { // See if the kext has already been loaded into the target, probably by the user doing target modules add. @@ -777,6 +788,15 @@ DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule (Process *p { m_module_sp = target.GetSharedModule (module_spec); } + + if (force_symbols_search && !m_module_sp) + { + Stream *s = &target.GetDebugger().GetOutputStream(); + if (s) + { + s->Printf ("WARNING: Unable to locate symbol rich version of kernel binary.\n"); + } + } } // If we managed to find a module, append it to the target's list of images. @@ -876,9 +896,6 @@ DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule (Process *p Stream *s = &target.GetDebugger().GetOutputStream(); if (s) { - char uuidbuf[64]; - s->Printf ("Kernel UUID: %s\n", m_module_sp->GetUUID().GetAsCString(uuidbuf, sizeof (uuidbuf))); - s->Printf ("Load Address: 0x%" PRIx64 "\n", m_load_address); if (m_module_sp->GetFileSpec().GetDirectory().IsEmpty()) { s->Printf ("Loaded kernel file %s\n", m_module_sp->GetFileSpec().GetFilename().AsCString()); -- 2.7.4