Cleanup

Author: zhengyu123

ddprof-lib/src/main/cpp/safeAccess.cpp

@@ -19,18 +19,20 @@
 #include <signal.h>
 #include <ucontext.h>
 
+extern "C" int safefetch32_cont(int* adr, int errValue);
+
 #ifdef __APPLE__
     #if defined(__x86_64__)
-      #define context_pc context_rip
+      #define current_pc context_rip
     #elif defined(__aarch64__)
       #define DU3_PREFIX(s, m) __ ## s.__ ## m
-      #define context_pc uc_mcontext->DU3_PREFIX(ss,pc)
+      #define current_pc uc_mcontext->DU3_PREFIX(ss,pc)
     #endif
 #else
     #if defined(__x86_64__)
-      #define context_pc uc_mcontext.gregs[REG_RIP]
+      #define current_pc uc_mcontext.gregs[REG_RIP]
     #elif defined(__aarch64__)
-      #define context_pc uc_mcontext.pc
+      #define current_pc uc_mcontext.pc
     #endif
 #endif
 
@@ -42,24 +44,25 @@
         _safefetch32_impl:
             movl (%rdi), %eax
             ret
-        .globl _safefetch32_continuation
-        .private_extern _safefetch32_continuation
-        _safefetch32_continuation:
+        .globl _safefetch32_cont
+        .private_extern _safefetch32_cont
+        _safefetch32_cont:
             movl %esi, %eax
             ret
     )");
   #else
     asm(R"(
+        .text
         .globl safefetch32_impl
         .hidden safefetch32_impl
         .type safefetch32_imp, %function
         safefetch32_impl:
             movl (%rdi), %eax
             ret
-        .globl safefetch32_continuation
-        .hidden safefetch32_continuation
-        .type safefetch32_continuation, %function
-        safefetch32_continuation:
+        .globl safefetch32_cont
+        .hidden safefetch32_cont
+        .type safefetch32_cont, %function
+        safefetch32_cont:
             movl %esi, %eax
             ret
     )");
@@ -72,24 +75,25 @@
         _safefetch32_impl:
             ldr      w0, [x0]
             ret
-        .globl _safefetch32_continuation
-        .private_extern _safefetch32_continuation
-        _safefetch32_continuation:
+        .globl _safefetch32_cont
+        .private_extern _safefetch32_cont
+        _safefetch32_cont:
             mov      x0, x1
             ret
     )");
   #else
     asm(R"(
+        .text
         .globl safefetch32_impl
         .hidden safefetch32_impl
         .type safefetch32_impl, %function
         safefetch32_impl:
             ldr      w0, [x0]
             ret
-        .globl safefetch32_continuation
-        .hidden safefetch32_continuation
-        .type safefetch32_continuation, %function
-        safefetch32_continuation:
+        .globl safefetch32_cont
+        .hidden safefetch32_cont
+        .type safefetch32_cont, %function
+        safefetch32_cont:
             mov      x0, x1
             ret
     )");
@@ -98,10 +102,10 @@
 
 bool SafeAccess::handle_safefetch(int sig, void* context) {
   ucontext_t* uc = (ucontext_t*)context;
-  uintptr_t pc = uc->context_pc;
+  uintptr_t pc = uc->current_pc;
   if ((sig == SIGSEGV || sig == SIGBUS) && uc != nullptr) {
     if (pc == (uintptr_t)safefetch32_impl) {
-      uc->context_pc = (uintptr_t)safefetch32_continuation;
+      uc->current_pc = (uintptr_t)safefetch32_cont;
       return true;
     }
   }