This revision was automatically updated to reflect the committed changes.
Closed by commit rLLDB357399: [lldb] [Process/elf-core] Support aarch64 NetBSD
core dumps (authored by mgorny, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D60034?vs=193020&id=193092#toc
Repository:
rLLDB LLDB
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D60034/new/
https://reviews.llvm.org/D60034
Files:
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/1lwp_SIGSEGV.aarch64.core
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_process_SIGSEGV.aarch64.core
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/2lwp_t2_SIGSEGV.aarch64.core
packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
source/Plugins/Process/elf-core/ProcessElfCore.cpp
source/Plugins/Process/elf-core/RegisterUtilities.h
source/Plugins/Process/elf-core/ThreadElfCore.cpp
Index: packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
+++ packages/Python/lldbsuite/test/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
@@ -168,6 +168,11 @@
backtrace = ["bar", "foo", "main"]
self.check_backtrace(thread, filename, backtrace)
+ @skipIfLLVMTargetMissing("AArch64")
+ def test_aarch64(self):
+ """Test single-threaded aarch64 core dump."""
+ self.do_test("1lwp_SIGSEGV.aarch64", pid=8339, region_count=32)
+
@skipIfLLVMTargetMissing("X86")
def test_amd64(self):
"""Test single-threaded amd64 core dump."""
@@ -193,6 +198,11 @@
self.assertEqual(thread.GetStopReasonDataCount(), 1)
self.assertEqual(thread.GetStopReasonDataAtIndex(0), 0)
+ @skipIfLLVMTargetMissing("AArch64")
+ def test_aarch64(self):
+ """Test double-threaded aarch64 core dump where thread 2 is signalled."""
+ self.do_test("2lwp_t2_SIGSEGV.aarch64", pid=14142, region_count=31)
+
@skipIfLLVMTargetMissing("X86")
def test_amd64(self):
"""Test double-threaded amd64 core dump where thread 2 is signalled."""
@@ -218,6 +228,11 @@
self.assertEqual(thread.GetStopReasonDataCount(), 1)
self.assertEqual(thread.GetStopReasonDataAtIndex(0), signal.SIGSEGV)
+ @skipIfLLVMTargetMissing("AArch64")
+ def test_aarch64(self):
+ """Test double-threaded aarch64 core dump where process is signalled."""
+ self.do_test("2lwp_process_SIGSEGV.aarch64", pid=1403, region_count=30)
+
@skipIfLLVMTargetMissing("X86")
def test_amd64(self):
"""Test double-threaded amd64 core dump where process is signalled."""
Index: source/Plugins/Process/elf-core/RegisterUtilities.h
===================================================================
--- source/Plugins/Process/elf-core/RegisterUtilities.h
+++ source/Plugins/Process/elf-core/RegisterUtilities.h
@@ -57,6 +57,10 @@
NT_PROCINFO_CPI_SIGLWP_SIZE = 4,
};
+namespace AARCH64 {
+enum { NT_REGS = 32, NT_FPREGS = 34 };
+}
+
namespace AMD64 {
enum { NT_REGS = 33, NT_FPREGS = 35 };
}
@@ -124,6 +128,7 @@
// The result from FXSAVE is in NT_PRXFPREG for i386 core files
{llvm::Triple::Linux, llvm::Triple::x86, LINUX::NT_PRXFPREG},
{llvm::Triple::Linux, llvm::Triple::UnknownArch, LINUX::NT_FPREGSET},
+ {llvm::Triple::NetBSD, llvm::Triple::aarch64, NETBSD::AARCH64::NT_FPREGS},
{llvm::Triple::NetBSD, llvm::Triple::x86_64, NETBSD::AMD64::NT_FPREGS},
{llvm::Triple::OpenBSD, llvm::Triple::UnknownArch, OPENBSD::NT_FPREGS},
};
Index: source/Plugins/Process/elf-core/ProcessElfCore.cpp
===================================================================
--- source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -628,6 +628,32 @@
llvm::inconvertibleErrorCode());
switch (GetArchitecture().GetMachine()) {
+ case llvm::Triple::aarch64: {
+ // Assume order PT_GETREGS, PT_GETFPREGS
+ if (note.info.n_type == NETBSD::AARCH64::NT_REGS) {
+ // If this is the next thread, push the previous one first.
+ if (had_nt_regs) {
+ m_thread_data.push_back(thread_data);
+ thread_data = ThreadData();
+ had_nt_regs = false;
+ }
+
+ thread_data.gpregset = note.data;
+ thread_data.tid = tid;
+ if (thread_data.gpregset.GetByteSize() == 0)
+ return llvm::make_error<llvm::StringError>(
+ "Could not find general purpose registers note in core file.",
+ llvm::inconvertibleErrorCode());
+ had_nt_regs = true;
+ } else if (note.info.n_type == NETBSD::AARCH64::NT_FPREGS) {
+ if (!had_nt_regs || tid != thread_data.tid)
+ return llvm::make_error<llvm::StringError>(
+ "Error parsing NetBSD core(5) notes: Unexpected order "
+ "of NOTEs PT_GETFPREG before PT_GETREG",
+ llvm::inconvertibleErrorCode());
+ thread_data.notes.push_back(note);
+ }
+ } break;
case llvm::Triple::x86_64: {
// Assume order PT_GETREGS, PT_GETFPREGS
if (note.info.n_type == NETBSD::AMD64::NT_REGS) {
Index: source/Plugins/Process/elf-core/ThreadElfCore.cpp
===================================================================
--- source/Plugins/Process/elf-core/ThreadElfCore.cpp
+++ source/Plugins/Process/elf-core/ThreadElfCore.cpp
@@ -112,6 +112,9 @@
case llvm::Triple::NetBSD: {
switch (arch.GetMachine()) {
+ case llvm::Triple::aarch64:
+ reg_interface = new RegisterInfoPOSIX_arm64(arch);
+ break;
case llvm::Triple::x86_64:
reg_interface = new RegisterContextNetBSD_x86_64(arch);
break;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
