llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Minsoo Choo (mchoo7)

<details>
<summary>Changes</summary>

There are two different ways to debug FreeBSD's kernel: core and remote 
debugging. Remote debugging is done through `gdb-remote` plugin while kernel 
dump and live core debugging is done through `FreeBSDKernel`. The name 
`FreeBSDKernel` is vague for this reason, and following `elf-core` and 
`mach-core`'s example, it would be clearer if this plugin is renamed to 
`FreeBSD-Kernel-Core`. On LLDB, this shows up as `freebsd-kernel-core`.

---

Patch is 40.18 KiB, truncated to 20.00 KiB below, full version: 
https://github.com/llvm/llvm-project/pull/182878.diff


28 Files Affected:

- (modified) lldb/source/Plugins/Process/CMakeLists.txt (+1-1) 
- (added) lldb/source/Plugins/Process/FreeBSD-Kernel-Core/CMakeLists.txt (+14) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.cpp 
(+33-32) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.h 
(+10-10) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
 (+10-10) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.h
 (+7-6) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
 (+9-9) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.h
 (+6-6) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.cpp
 (+13-10) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_x86_64.h
 (+7-6) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ThreadFreeBSDKernelCore.cpp 
(+24-21) 
- (renamed) 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ThreadFreeBSDKernelCore.h 
(+8-8) 
- (removed) lldb/source/Plugins/Process/FreeBSDKernel/CMakeLists.txt (-14) 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/TestFreeBSDKernelLiveCore.py
 (+1-1) 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/TestFreeBSDKernelVMCore.py
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/kernel-amd64.yaml 
() 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/kernel-arm64.yaml 
() 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/kernel-i386.yaml 
() 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/tools/README.rst 
() 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/tools/copy-sparse.py
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/tools/libfbsdvmcore-hacks.patch
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/tools/lldb-minimize-processes.patch
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/tools/test.script 
() 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/vmcore-amd64-full.bz2
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/vmcore-amd64-minidump.bz2
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/vmcore-arm64-minidump.bz2
 () 
- (renamed) 
lldb/test/API/functionalities/postmortem/FreeBSD-Kernel-Core/vmcore-i386-minidump.bz2
 () 
- (modified) llvm/docs/ReleaseNotes.md (+2) 


``````````diff
diff --git a/lldb/source/Plugins/Process/CMakeLists.txt 
b/lldb/source/Plugins/Process/CMakeLists.txt
index 9a5f1cd433717..8f4f11fd440c7 100644
--- a/lldb/source/Plugins/Process/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/CMakeLists.txt
@@ -8,7 +8,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
   add_subdirectory(POSIX)
 elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   add_subdirectory(FreeBSD)
-  add_subdirectory(FreeBSDKernel)
+  add_subdirectory(FreeBSD-Kernel-Core)
   add_subdirectory(POSIX)
 elseif (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
   add_subdirectory(NetBSD)
diff --git a/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/CMakeLists.txt 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/CMakeLists.txt
new file mode 100644
index 0000000000000..8aafee3e43314
--- /dev/null
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_lldb_library(lldbPluginProcessFreeBSDKernelCore PLUGIN
+  ProcessFreeBSDKernelCore.cpp
+  RegisterContextFreeBSDKernelCore_arm64.cpp
+  RegisterContextFreeBSDKernelCore_i386.cpp
+  RegisterContextFreeBSDKernelCore_x86_64.cpp
+  ThreadFreeBSDKernelCore.cpp
+
+  LINK_COMPONENTS
+    Support
+  LINK_LIBS
+    lldbCore
+    lldbTarget
+    kvm
+  )
diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.cpp
similarity index 86%
rename from lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.cpp
index 26a6089c10a9a..73902c500dad8 100644
--- a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp
+++ 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.cpp
@@ -1,4 +1,4 @@
-//===-- ProcessFreeBSDKernel.cpp 
------------------------------------------===//
+//===-- ProcessFreeBSDKernelCore.cpp 
--------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,41 +17,41 @@
 #include "lldb/Utility/StreamString.h"
 
 #include "Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.h"
-#include "ProcessFreeBSDKernel.h"
-#include "ThreadFreeBSDKernel.h"
+#include "ProcessFreeBSDKernelCore.h"
+#include "ThreadFreeBSDKernelCore.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
-LLDB_PLUGIN_DEFINE(ProcessFreeBSDKernel)
+LLDB_PLUGIN_DEFINE(ProcessFreeBSDKernelCore)
 
-ProcessFreeBSDKernel::ProcessFreeBSDKernel(lldb::TargetSP target_sp,
-                                           ListenerSP listener_sp, kvm_t *kvm,
-                                           const FileSpec &core_file)
+ProcessFreeBSDKernelCore::ProcessFreeBSDKernelCore(lldb::TargetSP target_sp,
+                                                   ListenerSP listener_sp,
+                                                   kvm_t *kvm,
+                                                   const FileSpec &core_file)
     : PostMortemProcess(target_sp, listener_sp, core_file), m_kvm(kvm) {}
 
-ProcessFreeBSDKernel::~ProcessFreeBSDKernel() {
+ProcessFreeBSDKernelCore::~ProcessFreeBSDKernelCore() {
   if (m_kvm)
     kvm_close(m_kvm);
 }
 
-lldb::ProcessSP ProcessFreeBSDKernel::CreateInstance(lldb::TargetSP target_sp,
-                                                     ListenerSP listener_sp,
-                                                     const FileSpec 
*crash_file,
-                                                     bool can_connect) {
+lldb::ProcessSP ProcessFreeBSDKernelCore::CreateInstance(
+    lldb::TargetSP target_sp, ListenerSP listener_sp,
+    const FileSpec *crash_file, bool can_connect) {
   ModuleSP executable = target_sp->GetExecutableModule();
   if (crash_file && !can_connect && executable) {
     kvm_t *kvm =
         kvm_open2(executable->GetFileSpec().GetPath().c_str(),
                   crash_file->GetPath().c_str(), O_RDONLY, nullptr, nullptr);
     if (kvm)
-      return std::make_shared<ProcessFreeBSDKernel>(target_sp, listener_sp, 
kvm,
+      return std::make_shared<ProcessFreeBSDKernelCore>(target_sp, 
listener_sp, kvm,
                                                     *crash_file);
   }
   return nullptr;
 }
 
-void ProcessFreeBSDKernel::Initialize() {
+void ProcessFreeBSDKernelCore::Initialize() {
   static llvm::once_flag g_once_flag;
 
   llvm::call_once(g_once_flag, []() {
@@ -60,38 +60,38 @@ void ProcessFreeBSDKernel::Initialize() {
   });
 }
 
-void ProcessFreeBSDKernel::Terminate() {
-  PluginManager::UnregisterPlugin(ProcessFreeBSDKernel::CreateInstance);
+void ProcessFreeBSDKernelCore::Terminate() {
+  PluginManager::UnregisterPlugin(ProcessFreeBSDKernelCore::CreateInstance);
 }
 
-bool ProcessFreeBSDKernel::CanDebug(lldb::TargetSP target_sp,
-                                    bool plugin_specified_by_name) {
+bool ProcessFreeBSDKernelCore::CanDebug(lldb::TargetSP target_sp,
+                                        bool plugin_specified_by_name) {
   return true;
 }
 
-Status ProcessFreeBSDKernel::DoLoadCore() {
+Status ProcessFreeBSDKernelCore::DoLoadCore() {
   // The core is already loaded by CreateInstance().
   return Status();
 }
 
-DynamicLoader *ProcessFreeBSDKernel::GetDynamicLoader() {
+DynamicLoader *ProcessFreeBSDKernelCore::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(); }
+Status ProcessFreeBSDKernelCore::DoDestroy() { return Status(); }
 
-void ProcessFreeBSDKernel::RefreshStateAfterStop() {
+void ProcessFreeBSDKernelCore::RefreshStateAfterStop() {
   if (!m_printed_unread_message) {
     PrintUnreadMessage();
     m_printed_unread_message = true;
   }
 }
 
-bool ProcessFreeBSDKernel::DoUpdateThreadList(ThreadList &old_thread_list,
-                                              ThreadList &new_thread_list) {
+bool ProcessFreeBSDKernelCore::DoUpdateThreadList(ThreadList &old_thread_list,
+                                                  ThreadList &new_thread_list) 
{
   if (old_thread_list.GetSize(false) == 0) {
     // Make up the thread the first time this is called so we can set our one
     // and only core thread state up.
@@ -223,7 +223,7 @@ bool ProcessFreeBSDKernel::DoUpdateThreadList(ThreadList 
&old_thread_list,
         }
 
         auto thread =
-            new ThreadFreeBSDKernel(*this, tid, pcb_addr, thread_desc);
+            new ThreadFreeBSDKernelCore(*this, tid, pcb_addr, thread_desc);
 
         if (tid == dumptid)
           thread->SetIsCrashedThread(true);
@@ -239,8 +239,8 @@ bool ProcessFreeBSDKernel::DoUpdateThreadList(ThreadList 
&old_thread_list,
   return new_thread_list.GetSize(false) > 0;
 }
 
-size_t ProcessFreeBSDKernel::DoReadMemory(lldb::addr_t addr, void *buf,
-                                          size_t size, Status &error) {
+size_t ProcessFreeBSDKernelCore::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) {
@@ -251,13 +251,13 @@ size_t ProcessFreeBSDKernel::DoReadMemory(lldb::addr_t 
addr, void *buf,
   return rd;
 }
 
-lldb::addr_t ProcessFreeBSDKernel::FindSymbol(const char *name) {
+lldb::addr_t ProcessFreeBSDKernelCore::FindSymbol(const char *name) {
   ModuleSP mod_sp = GetTarget().GetExecutableModule();
   const Symbol *sym = 
mod_sp->FindFirstSymbolWithNameAndType(ConstString(name));
   return sym ? sym->GetLoadAddress(&GetTarget()) : LLDB_INVALID_ADDRESS;
 }
 
-void ProcessFreeBSDKernel::PrintUnreadMessage() {
+void ProcessFreeBSDKernelCore::PrintUnreadMessage() {
   Target &target = GetTarget();
   Debugger &debugger = target.GetDebugger();
 
@@ -316,8 +316,9 @@ void ProcessFreeBSDKernel::PrintUnreadMessage() {
     }
 
     if (field_found != 4) {
-      LLDB_LOGF(GetLog(LLDBLog::Object),
-                "FreeBSDKernel: Could not find all required fields for 
msgbuf");
+      LLDB_LOGF(
+          GetLog(LLDBLog::Object),
+          "FreeBSD-Kernel-Core: Could not find all required fields for 
msgbuf");
       return;
     }
   } else {
@@ -404,4 +405,4 @@ void ProcessFreeBSDKernel::PrintUnreadMessage() {
   stream_sp->Flush();
 }
 
-const char *ProcessFreeBSDKernel::GetError() { return kvm_geterr(m_kvm); }
+const char *ProcessFreeBSDKernelCore::GetError() { return kvm_geterr(m_kvm); }
diff --git a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.h
similarity index 80%
rename from lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.h
index 40cd6cd66fd9d..284c7f01e01eb 100644
--- a/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.h
+++ b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/ProcessFreeBSDKernelCore.h
@@ -1,4 +1,4 @@
-//===-- ProcessFreeBSDKernel.h ----------------------------------*- C++ 
-*-===//
+//===-- ProcessFreeBSDKernelCore.h ------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,19 +6,19 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNEL_H
-#define LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNEL_H
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNELCORE_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNELCORE_H
 
 #include "lldb/Target/PostMortemProcess.h"
 
 #include <kvm.h>
 
-class ProcessFreeBSDKernel : public lldb_private::PostMortemProcess {
+class ProcessFreeBSDKernelCore : public lldb_private::PostMortemProcess {
 public:
-  ProcessFreeBSDKernel(lldb::TargetSP target_sp, lldb::ListenerSP listener,
-                       kvm_t *kvm, const lldb_private::FileSpec &core_file);
+  ProcessFreeBSDKernelCore(lldb::TargetSP target_sp, lldb::ListenerSP listener,
+                           kvm_t *kvm, const lldb_private::FileSpec 
&core_file);
 
-  ~ProcessFreeBSDKernel();
+  ~ProcessFreeBSDKernelCore();
 
   static lldb::ProcessSP
   CreateInstance(lldb::TargetSP target_sp, lldb::ListenerSP listener,
@@ -29,10 +29,10 @@ class ProcessFreeBSDKernel : public 
lldb_private::PostMortemProcess {
 
   static void Terminate();
 
-  static llvm::StringRef GetPluginNameStatic() { return "freebsd-kernel"; }
+  static llvm::StringRef GetPluginNameStatic() { return "freebsd-kernel-core"; 
}
 
   static llvm::StringRef GetPluginDescriptionStatic() {
-    return "FreeBSD kernel vmcore debugging plug-in.";
+    return "FreeBSD kernel core debugging plug-in.";
   }
 
   llvm::StringRef GetPluginName() override { return GetPluginNameStatic(); }
@@ -67,4 +67,4 @@ class ProcessFreeBSDKernel : public 
lldb_private::PostMortemProcess {
   kvm_t *m_kvm;
 };
 
-#endif // LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNEL_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_PROCESSFREEBSDKERNELCORE_H
diff --git 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.cpp
 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
similarity index 88%
rename from 
lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.cpp
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
index 752cf6c5c035a..ab647e6308435 100644
--- 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.cpp
+++ 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.cpp
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSDKernel_arm64.cpp 
----------------------------===//
+//===-- RegisterContextFreeBSDKernelCore_arm64.cpp 
------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,7 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#include "RegisterContextFreeBSDKernel_arm64.h"
+#include "RegisterContextFreeBSDKernelCore_arm64.h"
 #include "Plugins/Process/Utility/lldb-arm64-register-enums.h"
 
 #include "lldb/Symbol/Symbol.h"
@@ -21,27 +21,27 @@
 using namespace lldb;
 using namespace lldb_private;
 
-RegisterContextFreeBSDKernel_arm64::RegisterContextFreeBSDKernel_arm64(
+RegisterContextFreeBSDKernelCore_arm64::RegisterContextFreeBSDKernelCore_arm64(
     Thread &thread, std::unique_ptr<RegisterInfoPOSIX_arm64> register_info_up,
     lldb::addr_t pcb_addr)
     : RegisterContextPOSIX_arm64(thread, std::move(register_info_up)),
       m_pcb_addr(pcb_addr) {}
 
-bool RegisterContextFreeBSDKernel_arm64::ReadGPR() { return true; }
+bool RegisterContextFreeBSDKernelCore_arm64::ReadGPR() { return true; }
 
-bool RegisterContextFreeBSDKernel_arm64::ReadFPR() { return true; }
+bool RegisterContextFreeBSDKernelCore_arm64::ReadFPR() { return true; }
 
-bool RegisterContextFreeBSDKernel_arm64::WriteGPR() {
+bool RegisterContextFreeBSDKernelCore_arm64::WriteGPR() {
   assert(0);
   return false;
 }
 
-bool RegisterContextFreeBSDKernel_arm64::WriteFPR() {
+bool RegisterContextFreeBSDKernelCore_arm64::WriteFPR() {
   assert(0);
   return false;
 }
 
-bool RegisterContextFreeBSDKernel_arm64::ReadRegister(
+bool RegisterContextFreeBSDKernelCore_arm64::ReadRegister(
     const RegisterInfo *reg_info, RegisterValue &value) {
   if (m_pcb_addr == LLDB_INVALID_ADDRESS)
     return false;
@@ -165,12 +165,12 @@ bool RegisterContextFreeBSDKernel_arm64::ReadRegister(
   return true;
 }
 
-bool RegisterContextFreeBSDKernel_arm64::WriteRegister(
+bool RegisterContextFreeBSDKernelCore_arm64::WriteRegister(
     const RegisterInfo *reg_info, const RegisterValue &value) {
   return false;
 }
 
-std::optional<int> RegisterContextFreeBSDKernel_arm64::GetOsreldate() {
+std::optional<int> RegisterContextFreeBSDKernelCore_arm64::GetOsreldate() {
   ProcessSP process_sp = m_thread.GetProcess();
   if (!process_sp)
     return std::nullopt;
diff --git 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.h
 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.h
similarity index 81%
rename from 
lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.h
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.h
index 8d2a9c33639e3..ad82fb041df03 100644
--- 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_arm64.h
+++ 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_arm64.h
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSDKernel_arm64.h --------------------*- C++ 
-*-===//
+//===-- RegisterContextFreeBSDKernelCore_arm64.h ----------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,17 +6,18 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNEL_ARM64_H
-#define 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNEL_ARM64_H
+#ifndef 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNELCORE_ARM64_H
+#define 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNELCORE_ARM64_H
 
 #include "Plugins/Process/Utility/RegisterContextPOSIX_arm64.h"
 #include "Plugins/Process/elf-core/RegisterUtilities.h"
 
 #include <optional>
 
-class RegisterContextFreeBSDKernel_arm64 : public RegisterContextPOSIX_arm64 {
+class RegisterContextFreeBSDKernelCore_arm64
+    : public RegisterContextPOSIX_arm64 {
 public:
-  RegisterContextFreeBSDKernel_arm64(
+  RegisterContextFreeBSDKernelCore_arm64(
       lldb_private::Thread &thread,
       std::unique_ptr<RegisterInfoPOSIX_arm64> register_info_up,
       lldb::addr_t pcb_addr);
@@ -42,4 +43,4 @@ class RegisterContextFreeBSDKernel_arm64 : public 
RegisterContextPOSIX_arm64 {
   std::optional<int> GetOsreldate();
 };
 
-#endif // 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNEL_ARM64_H
+#endif // 
LLDB_SOURCE_PLUGINS_PROCESS_FREEBSDKERNEL_REGISTERCONTEXTFREEBSDKERNELCORE_ARM64_H
diff --git 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_i386.cpp
 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
similarity index 76%
rename from 
lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_i386.cpp
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
index 6727a75bd0af0..8334f8a34763c 100644
--- 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_i386.cpp
+++ 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.cpp
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSDKernel_i386.cpp 
-----------------------------===//
+//===-- RegisterContextFreeBSDKernelCore_i386.cpp 
-------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,7 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#include "RegisterContextFreeBSDKernel_i386.h"
+#include "RegisterContextFreeBSDKernelCore_i386.h"
 
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Thread.h"
@@ -16,26 +16,26 @@
 using namespace lldb;
 using namespace lldb_private;
 
-RegisterContextFreeBSDKernel_i386::RegisterContextFreeBSDKernel_i386(
+RegisterContextFreeBSDKernelCore_i386::RegisterContextFreeBSDKernelCore_i386(
     Thread &thread, RegisterInfoInterface *register_info, lldb::addr_t 
pcb_addr)
     : RegisterContextPOSIX_x86(thread, 0, register_info), m_pcb_addr(pcb_addr) 
{
 }
 
-bool RegisterContextFreeBSDKernel_i386::ReadGPR() { return true; }
+bool RegisterContextFreeBSDKernelCore_i386::ReadGPR() { return true; }
 
-bool RegisterContextFreeBSDKernel_i386::ReadFPR() { return true; }
+bool RegisterContextFreeBSDKernelCore_i386::ReadFPR() { return true; }
 
-bool RegisterContextFreeBSDKernel_i386::WriteGPR() {
+bool RegisterContextFreeBSDKernelCore_i386::WriteGPR() {
   assert(0);
   return false;
 }
 
-bool RegisterContextFreeBSDKernel_i386::WriteFPR() {
+bool RegisterContextFreeBSDKernelCore_i386::WriteFPR() {
   assert(0);
   return false;
 }
 
-bool RegisterContextFreeBSDKernel_i386::ReadRegister(
+bool RegisterContextFreeBSDKernelCore_i386::ReadRegister(
     const RegisterInfo *reg_info, RegisterValue &value) {
   if (m_pcb_addr == LLDB_INVALID_ADDRESS)
     return false;
@@ -78,7 +78,7 @@ bool RegisterContextFreeBSDKernel_i386::ReadRegister(
   return true;
 }
 
-bool RegisterContextFreeBSDKernel_i386::WriteRegister(
+bool RegisterContextFreeBSDKernelCore_i386::WriteRegister(
     const RegisterInfo *reg_info, const RegisterValue &value) {
   return false;
 }
diff --git 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_x86_64.h
 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.h
similarity index 81%
rename from 
lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_x86_64.h
rename to 
lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.h
index 9a2ac638dfea8..a4b0385e9a6db 100644
--- 
a/lldb/source/Plugins/Process/FreeBSDKernel/RegisterContextFreeBSDKernel_x86_64.h
+++ 
b/lldb/source/Plugins/Process/FreeBSD-Kernel-Core/RegisterContextFreeBSDKernelCore_i386.h
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSDKernel_x86_64.h -------------------*- C++ 
-*-===//
+//===-- RegisterContextFreeBSDKernelCore_i386.h -----------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,15 +6,15 @@
 //
 //===-----------------...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/182878
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to