llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Minsoo Choo (mchoo7) <details> <summary>Changes</summary> This reorders member functions of `ProcessFreeBSDKernel` and `ThreadFreeBSDKernel` to facilitate referencing their parent classes when adding, modifying, or removing member functions. There are two member scope changes to follow parent class definitions: `ProcessFreeBSDKernel::DoReadMemory()` becomes protected and `ThreadFreeBSDKernel::CalculateStopInfo()` becomes public. --- Full diff: https://github.com/llvm/llvm-project/pull/182717.diff 3 Files Affected: - (modified) lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp (+24-24) - (modified) lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h (+6-6) - (modified) lldb/source/Plugins/Process/FreeBSDKernel/ThreadFreeBSDKernel.h (+5-6) ``````````diff diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp b/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp index 31b5c05805ed0..26a6089c10a9a 100644 --- a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp +++ b/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp @@ -64,13 +64,25 @@ void ProcessFreeBSDKernel::Terminate() { PluginManager::UnregisterPlugin(ProcessFreeBSDKernel::CreateInstance); } -Status ProcessFreeBSDKernel::DoDestroy() { return Status(); } - bool ProcessFreeBSDKernel::CanDebug(lldb::TargetSP target_sp, bool plugin_specified_by_name) { return true; } +Status ProcessFreeBSDKernel::DoLoadCore() { + // The core is already loaded by CreateInstance(). + return Status(); +} + +DynamicLoader *ProcessFreeBSDKernel::GetDynamicLoader() { + if (m_dyld_up.get() == nullptr) + m_dyld_up.reset(DynamicLoader::FindPlugin( + this, DynamicLoaderFreeBSDKernel::GetPluginNameStatic())); + return m_dyld_up.get(); +} + +Status ProcessFreeBSDKernel::DoDestroy() { return Status(); } + void ProcessFreeBSDKernel::RefreshStateAfterStop() { if (!m_printed_unread_message) { PrintUnreadMessage(); @@ -227,16 +239,16 @@ bool ProcessFreeBSDKernel::DoUpdateThreadList(ThreadList &old_thread_list, return new_thread_list.GetSize(false) > 0; } -Status ProcessFreeBSDKernel::DoLoadCore() { - // The core is already loaded by CreateInstance(). - return Status(); -} - -DynamicLoader *ProcessFreeBSDKernel::GetDynamicLoader() { - if (m_dyld_up.get() == nullptr) - m_dyld_up.reset(DynamicLoader::FindPlugin( - this, DynamicLoaderFreeBSDKernel::GetPluginNameStatic())); - return m_dyld_up.get(); +size_t ProcessFreeBSDKernel::DoReadMemory(lldb::addr_t addr, void *buf, + size_t size, Status &error) { + ssize_t rd = 0; + rd = kvm_read2(m_kvm, addr, buf, size); + if (rd < 0 || static_cast<size_t>(rd) != size) { + error = Status::FromErrorStringWithFormat("Reading memory failed: %s", + GetError()); + return rd > 0 ? rd : 0; + } + return rd; } lldb::addr_t ProcessFreeBSDKernel::FindSymbol(const char *name) { @@ -392,16 +404,4 @@ void ProcessFreeBSDKernel::PrintUnreadMessage() { stream_sp->Flush(); } -size_t ProcessFreeBSDKernel::DoReadMemory(lldb::addr_t addr, void *buf, - size_t size, Status &error) { - ssize_t rd = 0; - rd = kvm_read2(m_kvm, addr, buf, size); - if (rd < 0 || static_cast<size_t>(rd) != size) { - error = Status::FromErrorStringWithFormat("Reading memory failed: %s", - GetError()); - return rd > 0 ? rd : 0; - } - return rd; -} - const char *ProcessFreeBSDKernel::GetError() { return kvm_geterr(m_kvm); } diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h b/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h index f6b5260e37991..40cd6cd66fd9d 100644 --- a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h +++ b/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h @@ -37,24 +37,24 @@ class ProcessFreeBSDKernel : public lldb_private::PostMortemProcess { llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); } - lldb_private::Status DoDestroy() override; - bool CanDebug(lldb::TargetSP target_sp, bool plugin_specified_by_name) override; - void RefreshStateAfterStop() override; - lldb_private::Status DoLoadCore() override; lldb_private::DynamicLoader *GetDynamicLoader() override; - size_t DoReadMemory(lldb::addr_t addr, void *buf, size_t size, - lldb_private::Status &error) override; + lldb_private::Status DoDestroy() override; + + void RefreshStateAfterStop() override; protected: bool DoUpdateThreadList(lldb_private::ThreadList &old_thread_list, lldb_private::ThreadList &new_thread_list) override; + size_t DoReadMemory(lldb::addr_t addr, void *buf, size_t size, + lldb_private::Status &error) override; + lldb::addr_t FindSymbol(const char *name); private: diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/ThreadFreeBSDKernel.h b/lldb/source/Plugins/Process/FreeBSDKernel/ThreadFreeBSDKernel.h index 6a8d44eaf5699..42f5b93bb74c5 100644 --- a/lldb/source/Plugins/Process/FreeBSDKernel/ThreadFreeBSDKernel.h +++ b/lldb/source/Plugins/Process/FreeBSDKernel/ThreadFreeBSDKernel.h @@ -20,11 +20,6 @@ class ThreadFreeBSDKernel : public lldb_private::Thread { void RefreshStateAfterStop() override; - lldb::RegisterContextSP GetRegisterContext() override; - - lldb::RegisterContextSP - CreateRegisterContextForFrame(lldb_private::StackFrame *frame) override; - const char *GetName() override { if (m_thread_name.empty()) return nullptr; @@ -38,9 +33,13 @@ class ThreadFreeBSDKernel : public lldb_private::Thread { m_thread_name.clear(); } + lldb::RegisterContextSP GetRegisterContext() override; + + lldb::RegisterContextSP + CreateRegisterContextForFrame(lldb_private::StackFrame *frame) override; + void SetIsCrashedThread(bool is_crashed) { m_is_crashed = is_crashed; } -protected: bool CalculateStopInfo() override; private: `````````` </details> https://github.com/llvm/llvm-project/pull/182717 _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
