[compiler-rt] 2d6f4d2 - [compiler-rt] DumpAllRegisters implementation for netbsd i386/x86_64. (#99743)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 29 23:40:40 PDT 2024
Author: David CARLIER
Date: 2024-07-30T07:40:37+01:00
New Revision: 2d6f4d22ef8be48db151019bb763de725104857a
URL: https://github.com/llvm/llvm-project/commit/2d6f4d22ef8be48db151019bb763de725104857a
DIFF: https://github.com/llvm/llvm-project/commit/2d6f4d22ef8be48db151019bb763de725104857a.diff
LOG: [compiler-rt] DumpAllRegisters implementation for netbsd i386/x86_64. (#99743)
Added:
compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_i386.cpp
compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_x86_64.cpp
Modified:
compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index 22aaf07a9d90a..0aa8525493bcd 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2121,8 +2121,26 @@ bool SignalContext::IsTrueFaultingAddress() const {
UNUSED
static const char *RegNumToRegName(int reg) {
switch (reg) {
-# if SANITIZER_LINUX && SANITIZER_GLIBC
+# if SANITIZER_LINUX && SANITIZER_GLIBC || SANITIZER_NETBSD
# if defined(__x86_64__)
+# if SANITIZER_NETBSD
+# define REG_RAX _REG_RAX
+# define REG_RBX _REG_RBX
+# define REG_RCX _REG_RCX
+# define REG_RDX _REG_RDX
+# define REG_RDI _REG_RDI
+# define REG_RSI _REG_RSI
+# define REG_RBP _REG_RBP
+# define REG_RSP _REG_RSP
+# define REG_R8 _REG_R8
+# define REG_R9 _REG_R9
+# define REG_R10 _REG_R10
+# define REG_R11 _REG_R11
+# define REG_R12 _REG_R12
+# define REG_R13 _REG_R13
+# define REG_R14 _REG_R14
+# define REG_R15 _REG_R15
+# endif
case REG_RAX:
return "rax";
case REG_RBX:
@@ -2156,6 +2174,16 @@ static const char *RegNumToRegName(int reg) {
case REG_R15:
return "r15";
# elif defined(__i386__)
+# if SANITIZER_NETBSD
+# define REG_EAX _REG_EAX
+# define REG_EBX _REG_EBX
+# define REG_ECX _REG_ECX
+# define REG_EDX _REG_EDX
+# define REG_EDI _REG_EDI
+# define REG_ESI _REG_ESI
+# define REG_EBP _REG_EBP
+# define REG_ESP _REG_ESP
+# endif
case REG_EAX:
return "eax";
case REG_EBX:
@@ -2296,11 +2324,23 @@ static uptr GetArmRegister(ucontext_t *ctx, int RegNum) {
UNUSED
static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
const char *RegName = RegNumToRegName(RegNum);
-# if defined(__x86_64__)
+# if defined(__x86_64__)
Printf("%s%s = 0x%016llx ", internal_strlen(RegName) == 2 ? " " : "",
- RegName, ctx->uc_mcontext.gregs[RegNum]);
-# elif defined(__i386__)
- Printf("%s = 0x%08x ", RegName, ctx->uc_mcontext.gregs[RegNum]);
+ RegName,
+# if SANITIZER_LINUX
+ ctx->uc_mcontext.gregs[RegNum]
+# elif SANITIZER_NETBSD
+ ctx->uc_mcontext.__gregs[RegNum]
+# endif
+ );
+# elif defined(__i386__)
+ Printf("%s = 0x%08x ", RegName,
+# if SANITIZER_LINUX
+ ctx->uc_mcontext.gregs[RegNum]
+# elif SANITIZER_NETBSD
+ ctx->uc_mcontext.__gregs[RegNum]
+# endif
+ );
# elif defined(__arm__)
Printf("%s%s = 0x%08zx ", internal_strlen(RegName) == 2 ? " " : "", RegName,
GetArmRegister(ctx, RegNum));
@@ -2314,7 +2354,7 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
void SignalContext::DumpAllRegisters(void *context) {
ucontext_t *ucontext = (ucontext_t *)context;
-# if SANITIZER_LINUX && SANITIZER_GLIBC
+# if SANITIZER_LINUX && SANITIZER_GLIBC || SANITIZER_NETBSD
# if defined(__x86_64__)
Report("Register values:\n");
DumpSingleReg(ucontext, REG_RAX);
@@ -2353,7 +2393,7 @@ void SignalContext::DumpAllRegisters(void *context) {
DumpSingleReg(ucontext, REG_EBP);
DumpSingleReg(ucontext, REG_ESP);
Printf("\n");
-# elif defined(__arm__)
+# elif defined(__arm__) && !SANITIZER_NETBSD
Report("Register values:\n");
DumpSingleReg(ucontext, REG_R0);
DumpSingleReg(ucontext, REG_R1);
@@ -2375,7 +2415,7 @@ void SignalContext::DumpAllRegisters(void *context) {
DumpSingleReg(ucontext, REG_R14);
DumpSingleReg(ucontext, REG_R15);
Printf("\n");
-# elif defined(__aarch64__)
+# elif defined(__aarch64__) && !SANITIZER_NETBSD
Report("Register values:\n");
for (int i = 0; i <= 31; ++i) {
DumpSingleReg(ucontext, i);
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_i386.cpp b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_i386.cpp
new file mode 100644
index 0000000000000..74aea4d8b360a
--- /dev/null
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_i386.cpp
@@ -0,0 +1,17 @@
+// Check that sanitizer prints registers dump_registers on dump_registers=1
+// RUN: %clangxx %s -o %t
+// RUN: %env_tool_opts=dump_registers=0 not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK-NODUMP --strict-whitespace
+// RUN: not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK-DUMP --strict-whitespace
+//
+// REQUIRES: i386-target-arch
+
+#include <signal.h>
+
+int main() {
+ raise(SIGSEGV);
+ // CHECK-DUMP: Register values
+ // CHECK-DUMP-NEXT: eax = {{0x[0-9a-f]+}} ebx = {{0x[0-9a-f]+}} ecx = {{0x[0-9a-f]+}} edx = {{0x[0-9a-f]+}}
+ // CHECK-DUMP-NEXT: edi = {{0x[0-9a-f]+}} esi = {{0x[0-9a-f]+}} ebp = {{0x[0-9a-f]+}} esp = {{0x[0-9a-f]+}}
+ // CHECK-NODUMP-NOT: Register values
+ return 0;
+}
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_x86_64.cpp b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_x86_64.cpp
new file mode 100644
index 0000000000000..3d11ef0e098f1
--- /dev/null
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/dump_registers_x86_64.cpp
@@ -0,0 +1,19 @@
+// Check that sanitizer prints registers dump_registers on dump_registers=1
+// RUN: %clangxx %s -o %t
+// RUN: %env_tool_opts=dump_registers=0 not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK-NODUMP --strict-whitespace
+// RUN: not %run %t 2>&1 | FileCheck %s --check-prefixes=CHECK-DUMP --strict-whitespace
+//
+// REQUIRES: x86_64-target-arch
+
+#include <signal.h>
+
+int main() {
+ raise(SIGSEGV);
+ // CHECK-DUMP: Register values
+ // CHECK-DUMP-NEXT: rax = {{0x[0-9a-f]+}} rbx = {{0x[0-9a-f]+}} rcx = {{0x[0-9a-f]+}} rdx = {{0x[0-9a-f]+}}
+ // CHECK-DUMP-NEXT: rdi = {{0x[0-9a-f]+}} rsi = {{0x[0-9a-f]+}} rbp = {{0x[0-9a-f]+}} rsp = {{0x[0-9a-f]+}}
+ // CHECK-DUMP-NEXT: r8 = {{0x[0-9a-f]+}} r9 = {{0x[0-9a-f]+}} r10 = {{0x[0-9a-f]+}} r11 = {{0x[0-9a-f]+}}
+ // CHECK-DUMP-NEXT: r12 = {{0x[0-9a-f]+}} r13 = {{0x[0-9a-f]+}} r14 = {{0x[0-9a-f]+}} r15 = {{0x[0-9a-f]+}}
+ // CHECK-NODUMP-NOT: Register values
+ return 0;
+}
More information about the llvm-commits
mailing list