[compiler-rt] Dump regs fbsd fix (PR #99676)

[David CARLIER via llvm-commits]

https://github.com/devnexen created https://github.com/llvm/llvm-project/pull/99676

None

>From 8d2f079a5a6f6a2ada047733a118773aa19801e4 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Fri, 19 Jul 2024 19:57:32 +0100
Subject: [PATCH 1/2] implement dump registers for freebsd amd64/fix build

---
 .../lib/sanitizer_common/sanitizer_linux.cpp  | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index 47f9f0c4590fb..4e8452d459885 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2121,7 +2121,8 @@ bool SignalContext::IsTrueFaultingAddress() const {
 UNUSED
 static const char *RegNumToRegName(int reg) {
   switch (reg) {
-#  if defined(__x86_64__)
+#  if SANITIZER_LINUX
+#    if defined(__x86_64__)
     case REG_RAX:
       return "rax";
     case REG_RBX:
@@ -2154,7 +2155,7 @@ static const char *RegNumToRegName(int reg) {
       return "r14";
     case REG_R15:
       return "r15";
-#  elif defined(__i386__)
+#    elif defined(__i386__)
     case REG_EAX:
       return "eax";
     case REG_EBX:
@@ -2171,6 +2172,7 @@ static const char *RegNumToRegName(int reg) {
       return "ebp";
     case REG_ESP:
       return "esp";
+#    endif
 #  endif
     default:
       return NULL;
@@ -2178,6 +2180,7 @@ static const char *RegNumToRegName(int reg) {
   return NULL;
 }
 
+#if SANITIZER_LINUX
 UNUSED
 static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
   const char *RegName = RegNumToRegName(RegNum);
@@ -2190,10 +2193,11 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
   (void)RegName;
 #  endif
 }
+#endif
 
 void SignalContext::DumpAllRegisters(void *context) {
-#  if SANITIZER_LINUX
   ucontext_t *ucontext = (ucontext_t *)context;
+#  if SANITIZER_LINUX
 #    if defined(__x86_64__)
   Report("Register values:\n");
   DumpSingleReg(ucontext, REG_RAX);
@@ -2232,8 +2236,35 @@ void SignalContext::DumpAllRegisters(void *context) {
   DumpSingleReg(ucontext, REG_EBP);
   DumpSingleReg(ucontext, REG_ESP);
   Printf("\n");
+#    else
+  (void)ucontext;
 #    endif
+#  elif SANITIZER_FREEBSD
+#    if defined(__x86_64__)
+  Report("Register values:\n");
+  Printf("RAX = 0x%016llx  ", ucontext->uc_mcontext.mc_rax);
+  Printf("RBX = 0x%016llx  ", ucontext->uc_mcontext.mc_rbx);
+  Printf("RCX = 0x%016llx  ", ucontext->uc_mcontext.mc_rcx);
+  Printf("RDX = 0x%016llx  ", ucontext->uc_mcontext.mc_rdx);
+  Printf("\n");
+  Printf("RDI = 0x%016llx  ", ucontext->uc_mcontext.mc_rdi);
+  Printf("RSI = 0x%016llx  ", ucontext->uc_mcontext.mc_rsi);
+  Printf("RBP = 0x%016llx  ", ucontext->uc_mcontext.mc_rbp);
+  Printf("RSP = 0x%016llx  ", ucontext->uc_mcontext.mc_rsp);
+  Printf("\n");
+  Printf(" R8 = 0x%016llx  ", ucontext->uc_mcontext.mc_r8);
+  Printf(" R9 = 0x%016llx  ", ucontext->uc_mcontext.mc_r9);
+  Printf("R10 = 0x%016llx  ", ucontext->uc_mcontext.mc_r10);
+  Printf("R11 = 0x%016llx  ", ucontext->uc_mcontext.mc_r11);
+  Printf("\n");
+  Printf("R12 = 0x%016llx  ", ucontext->uc_mcontext.mc_r12);
+  Printf("R13 = 0x%016llx  ", ucontext->uc_mcontext.mc_r13);
+  Printf("R14 = 0x%016llx  ", ucontext->uc_mcontext.mc_r14);
+  Printf("R15 = 0x%016llx  ", ucontext->uc_mcontext.mc_r15);
+  Printf("\n");
+#    else
   (void)ucontext;
+#    endif
 #  endif
   // FIXME: Implement this for other OSes and architectures.
 }

>From 77a323873431ef49a058f7944bc3d1dfeda4aab2 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Fri, 19 Jul 2024 20:02:10 +0100
Subject: [PATCH 2/2] safestack build fix for freebsd i386

---
 compiler-rt/lib/safestack/safestack_platform.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler-rt/lib/safestack/safestack_platform.h b/compiler-rt/lib/safestack/safestack_platform.h
index 68d26813bef4a..41c7c25fdaf4d 100644
--- a/compiler-rt/lib/safestack/safestack_platform.h
+++ b/compiler-rt/lib/safestack/safestack_platform.h
@@ -143,6 +143,8 @@ inline void *Mmap(void *addr, size_t length, int prot, int flags, int fd,
   return __mmap(addr, length, prot, flags, fd, 0, offset);
 #elif SANITIZER_FREEBSD && (defined(__aarch64__) || defined(__x86_64__))
   return (void *)__syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
+#elif SANITIZER_FREEBSD && (defined(__i386__))
+  return (void *)syscall(SYS_mmap, addr, length, prot, flags, fd, offset);
 #elif SANITIZER_SOLARIS
   return _REAL64(mmap)(addr, length, prot, flags, fd, offset);
 #elif SANITIZER_LINUX_USES_64BIT_SYSCALLS