Move everything to platform

Author: Jlalond

lldb/include/lldb/Target/Platform.h

@@ -21,6 +21,7 @@
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Host/File.h"
 #include "lldb/Interpreter/Options.h"
+#include "lldb/Target/StopInfo.h"
 #include "lldb/Utility/ArchSpec.h"
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
@@ -960,6 +961,8 @@ class Platform : public PluginInterface {
 
   virtual CompilerType GetSiginfoType(const llvm::Triple &triple);
 
+  virtual lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) { return {}; }
+
   virtual Args GetExtraStartupCommands();
 
   typedef std::function<Status(const ModuleSpec &module_spec,

lldb/include/lldb/Target/UnixSignals.h

@@ -14,7 +14,6 @@
 #include <string>
 #include <vector>
 
-#include "lldb/ValueObject/ValueObject.h"
 #include "lldb/lldb-private.h"
 #include "llvm/Support/JSON.h"
 
@@ -32,11 +31,6 @@ class UnixSignals {
 
   llvm::StringRef GetSignalAsStringRef(int32_t signo) const;
 
-  virtual std::string
-  GetSignalDescriptionFromSiginfo(lldb::ValueObjectSP siginfo_sp) const {
-    return "";
-  };
-
   std::string
   GetSignalDescription(int32_t signo,
                        std::optional<int32_t> code = std::nullopt,

lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp

@@ -14,6 +14,7 @@
 #include <sys/utsname.h>
 #endif
 
+#include "Plugins/Process/Utility/LinuxSignals.h"
 #include "Utility/ARM64_DWARF_Registers.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/PluginManager.h"
@@ -480,3 +481,111 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) {
   ast->CompleteTagDeclarationDefinition(siginfo_type);
   return siginfo_type;
 }
+
+static std::string GetDescriptionFromSiginfo(lldb::ValueObjectSP siginfo_sp) {
+  if (!siginfo_sp)
+    return "";
+
+  lldb_private::LinuxSignals linux_signals;
+  int code = siginfo_sp->GetChildMemberWithName("si_code")->GetValueAsSigned(0);
+  int signo =
+      siginfo_sp->GetChildMemberWithName("si_signo")->GetValueAsSigned(-1);
+  // si_code = 0 is SI_NOINFO, we just want the description with nothing
+  // important
+  if (code == 0)
+    return linux_signals.GetSignalDescription(signo, code);
+
+  auto sifields = siginfo_sp->GetChildMemberWithName("_sifields");
+  if (!sifields)
+    return linux_signals.GetSignalDescription(signo, code);
+
+  // declare everything that we can populate later.
+  std::optional<lldb::addr_t> addr;
+  std::optional<lldb::addr_t> upper;
+  std::optional<lldb::addr_t> lower;
+  std::optional<uint32_t> pid;
+  std::optional<uint32_t> uid;
+
+  // The negative si_codes are special and mean this signal was sent from user
+  // space not the kernel. These take precedence because they break some of the
+  // invariants around kernel sent signals. Such as SIGSEGV won't have an
+  // address.
+  if (code < 0) {
+    auto sikill = sifields->GetChildMemberWithName("_kill");
+    if (sikill) {
+      auto pid_sp = sikill->GetChildMemberWithName("si_pid");
+      if (pid_sp)
+        pid = pid_sp->GetValueAsUnsigned(-1);
+      auto uid_sp = sikill->GetChildMemberWithName("si_uid");
+      if (uid_sp)
+        uid = uid_sp->GetValueAsUnsigned(-1);
+    }
+  } else {
+
+    switch (signo) {
+    case SIGILL:
+    case SIGFPE:
+    case SIGBUS: {
+      auto sigfault = sifields->GetChildMemberWithName("_sigfault");
+      if (!sigfault)
+        break;
+
+      auto addr_sp = sigfault->GetChildMemberWithName("si_addr");
+      if (addr_sp)
+        addr = addr_sp->GetValueAsUnsigned(-1);
+      break;
+    }
+    case SIGSEGV: {
+      auto sigfault = sifields->GetChildMemberWithName("_sigfault");
+      if (!sigfault)
+        break;
+
+      auto addr_sp = sigfault->GetChildMemberWithName("si_addr");
+      if (addr_sp)
+        addr = addr_sp->GetValueAsUnsigned(-1);
+
+      auto bounds_sp = sigfault->GetChildMemberWithName("_bounds");
+      if (!bounds_sp)
+        break;
+
+      auto addr_bnds_sp = bounds_sp->GetChildMemberWithName("_addr_bnd");
+      if (!addr_bnds_sp)
+        break;
+
+      auto lower_sp = addr_bnds_sp->GetChildMemberWithName("_lower");
+      if (lower_sp)
+        lower = lower_sp->GetValueAsUnsigned(-1);
+
+      auto upper_sp = addr_bnds_sp->GetChildMemberWithName("_upper");
+      if (upper_sp)
+        upper = upper_sp->GetValueAsUnsigned(-1);
+
+      break;
+    }
+    default:
+      break;
+    }
+  }
+
+  return linux_signals.GetSignalDescription(signo, code, addr, lower, upper,
+                                            uid, pid);
+}
+
+lldb::StopInfoSP PlatformLinux::GetStopInfoFromSiginfo(Thread &thread) {
+  ValueObjectSP siginfo_sp = thread.GetSiginfoValue();
+  if (!siginfo_sp)
+    return {};
+  auto signo_sp = siginfo_sp->GetChildMemberWithName("si_signo");
+  auto sicode_sp = siginfo_sp->GetChildMemberWithName("si_code");
+  if (!signo_sp || !sicode_sp)
+    return {};
+
+  std::string siginfo_description = GetDescriptionFromSiginfo(siginfo_sp);
+  if (siginfo_description.empty())
+    return StopInfo::CreateStopReasonWithSignal(
+        thread, signo_sp->GetValueAsUnsigned(-1));
+  else
+    return StopInfo::CreateStopReasonWithSignal(
+        thread, signo_sp->GetValueAsUnsigned(-1), siginfo_description.c_str(),
+        sicode_sp->GetValueAsUnsigned(0));
+}

lldb/source/Plugins/Platform/Linux/PlatformLinux.h

@@ -62,6 +62,8 @@ class PlatformLinux : public PlatformPOSIX {
 
   CompilerType GetSiginfoType(const llvm::Triple &triple) override;
 
+  lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) override;
+
   std::vector<ArchSpec> m_supported_architectures;
 
 private:

lldb/source/Plugins/Process/Utility/LinuxSignals.cpp

@@ -171,91 +171,3 @@ void LinuxSignals::Reset() {
   ADD_LINUX_SIGNAL(64,     "SIGRTMAX",     false,    false,  false,  "real time signal 30");
   // clang-format on
 }
-
-std::string LinuxSignals::GetSignalDescriptionFromSiginfo(
-    lldb::ValueObjectSP siginfo_sp) const {
-  if (!siginfo_sp)
-    return "";
-
-  int code = siginfo_sp->GetChildMemberWithName("si_code")->GetValueAsSigned(0);
-  int signo =
-      siginfo_sp->GetChildMemberWithName("si_signo")->GetValueAsSigned(-1);
-  // si_code = 0 is SI_NOINFO, we just want the description with nothing
-  // important
-  if (code == 0)
-    return GetSignalDescription(signo, code);
-
-  auto sifields = siginfo_sp->GetChildMemberWithName("_sifields");
-  if (!sifields)
-    return GetSignalDescription(signo, code);
-
-  // declare everything that we can populate later.
-  std::optional<lldb::addr_t> addr;
-  std::optional<lldb::addr_t> upper;
-  std::optional<lldb::addr_t> lower;
-  std::optional<uint32_t> pid;
-  std::optional<uint32_t> uid;
-
-  // The negative si_codes are special and mean this signal was sent from user
-  // space not the kernel. These take precedence because they break some of the
-  // invariants around kernel sent signals. Such as SIGSEGV won't have an
-  // address.
-  if (code < 0) {
-    auto sikill = sifields->GetChildMemberWithName("_kill");
-    if (sikill) {
-      auto pid_sp = sikill->GetChildMemberWithName("si_pid");
-      if (pid_sp)
-        pid = pid_sp->GetValueAsUnsigned(-1);
-      auto uid_sp = sikill->GetChildMemberWithName("si_uid");
-      if (uid_sp)
-        uid = uid_sp->GetValueAsUnsigned(-1);
-    }
-  } else {
-
-    switch (signo) {
-    case SIGILL:
-    case SIGFPE:
-    case SIGBUS: {
-      auto sigfault = sifields->GetChildMemberWithName("_sigfault");
-      if (!sigfault)
-        break;
-
-      auto addr_sp = sigfault->GetChildMemberWithName("si_addr");
-      if (addr_sp)
-        addr = addr_sp->GetValueAsUnsigned(-1);
-      break;
-    }
-    case SIGSEGV: {
-      auto sigfault = sifields->GetChildMemberWithName("_sigfault");
-      if (!sigfault)
-        break;
-
-      auto addr_sp = sigfault->GetChildMemberWithName("si_addr");
-      if (addr_sp)
-        addr = addr_sp->GetValueAsUnsigned(-1);
-
-      auto bounds_sp = sigfault->GetChildMemberWithName("_bounds");
-      if (!bounds_sp)
-        break;
-
-      auto addr_bnds_sp = bounds_sp->GetChildMemberWithName("_addr_bnd");
-      if (!addr_bnds_sp)
-        break;
-
-      auto lower_sp = addr_bnds_sp->GetChildMemberWithName("_lower");
-      if (lower_sp)
-        lower = lower_sp->GetValueAsUnsigned(-1);
-
-      auto upper_sp = addr_bnds_sp->GetChildMemberWithName("_upper");
-      if (upper_sp)
-        upper = upper_sp->GetValueAsUnsigned(-1);
-
-      break;
-    }
-    default:
-      break;
-    }
-  }
-
-  return GetSignalDescription(signo, code, addr, lower, upper, uid, pid);
-}

lldb/source/Plugins/Process/Utility/LinuxSignals.h

@@ -18,9 +18,6 @@ class LinuxSignals : public UnixSignals {
 public:
   LinuxSignals();
 
-  std::string GetSignalDescriptionFromSiginfo(
-      lldb::ValueObjectSP siginfo_sp) const override;
-
 private:
   void Reset() override;
 };

lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp

@@ -264,24 +264,19 @@ bool ThreadElfCore::CalculateStopInfo() {
   if (!process_sp)
     return false;
 
-  lldb::UnixSignalsSP unix_signals_sp(process_sp->GetUnixSignals());
-  if (!unix_signals_sp)
-    return false;
-
-  lldb::ValueObjectSP siginfo = GetSiginfoValue();
-  if (!siginfo || !siginfo->GetValueIsValid()) {
-    SetStopInfo(StopInfo::CreateStopReasonWithSignal(*this, m_signo));
-  } else {
-    std::string description =
-        unix_signals_sp->GetSignalDescriptionFromSiginfo(siginfo);
-    uint32_t signo =
-        siginfo->GetChildMemberWithName("si_signo")->GetValueAsUnsigned(-1);
-    uint32_t code =
-        siginfo->GetChildMemberWithName("si_code")->GetValueAsUnsigned(0);
-    SetStopInfo(StopInfo::CreateStopReasonWithSignal(
-        *this, signo, description.c_str(), code));
+  PlatformSP platform_sp = process_sp->GetTarget().GetPlatform();
+  if (platform_sp) {
+    lldb::StopInfoSP stopinfo_sp = platform_sp->GetStopInfoFromSiginfo(*this);
+    // The platform SP can optionally handle creating the stop info from the
+    // siginfo value however it's not guaraunteed to be implemented on every
+    // platform, so if we fall through this case, we create from just the signo.
+    if (stopinfo_sp) {
+      SetStopInfo(std::move(stopinfo_sp));
+      return true;
+    }
   }
 
+  SetStopInfo(StopInfo::CreateStopReasonWithSignal(*this, m_signo));
   return true;
 }