#819: Extend AArch64 stack walking fix to cstack=dwarf

Author: apangin

ddprof-lib/src/main/cpp/stackFrame.h

@@ -75,7 +75,7 @@ class StackFrame {
                   uintptr_t &sp, uintptr_t &fp);
   bool unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp, uintptr_t &fp);
 
-  void adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp);
+  void adjustSP(const void *entry, const void *pc, uintptr_t &sp);
 
   bool skipFaultInstruction();
 

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

@@ -136,9 +136,8 @@ bool StackFrame::unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp,
   return true;
 }
 
-void StackFrame::adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp) {
+void StackFrame::adjustSP(const void *entry, const void *pc, uintptr_t &sp) {
   instruction_t *ip = (instruction_t *)pc;
-  instruction_t *entry = (instruction_t *)nm->entry();
   if (ip > entry && (ip[-1] == 0xa9bf27ff ||
                      (ip[-1] == 0xd63f0100 && ip[-2] == 0xa9bf27ff))) {
     // When calling a leaf native from Java, JVM puts a dummy frame link onto

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

@@ -108,7 +108,7 @@ bool StackFrame::unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp,
   return true;
 }
 
-void StackFrame::adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp) {
+void StackFrame::adjustSP(const void *entry, const void *pc, uintptr_t &sp) {
   // Not needed
 }
 

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

@@ -115,7 +115,7 @@ bool StackFrame::unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp,
   return false;
 }
 
-void StackFrame::adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp) {
+void StackFrame::adjustSP(const void *entry, const void *pc, uintptr_t &sp) {
   // Not needed
 }
 

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

@@ -143,7 +143,7 @@ bool StackFrame::unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp,
   return true;
 }
 
-void StackFrame::adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp) {
+void StackFrame::adjustSP(const void *entry, const void *pc, uintptr_t &sp) {
   // Not needed
 }
 

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

@@ -141,7 +141,7 @@ bool StackFrame::unwindCompiled(NMethod *nm, uintptr_t &pc, uintptr_t &sp,
   return false;
 }
 
-void StackFrame::adjustCompiled(NMethod *nm, const void *pc, uintptr_t &sp) {
+void StackFrame::adjustSP(const void *entry, const void *pc, uintptr_t &sp) {
   // Not needed
 }
 

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

@@ -155,6 +155,8 @@ int StackWalker::walkDwarf(void *ucontext, const void **callchain,
       break;
     }
     if (CodeHeap::contains(pc)) {
+      const void* page_start = (const void*)((uintptr_t)pc & ~0xfffUL);
+      frame.adjustSP(page_start, pc, sp);
       java_ctx->set(pc, sp, fp);
       break;
     }
@@ -302,7 +304,7 @@ int StackWalker::walkVM(void *ucontext, ASGCT_CallFrame *frames, int max_depth,
 
           // Handle situations when sp is temporarily changed in the compiled
           // code
-          frame.adjustCompiled(nm, pc, sp);
+          frame.adjustSP(nm->entry(), pc, sp);
 
           sp += nm->frameSize() * sizeof(void *);
           fp = ((uintptr_t *)sp)[-FRAME_PC_SLOT - 1];