s390 port: build fixed

Author: offamitkumar

src/hotspot/cpu/s390/frame_s390.hpp

@@ -475,6 +475,7 @@
  public:
   // To be used, if sp was not extended to match callee's calling convention.
   inline frame(intptr_t* sp, address pc, intptr_t* unextended_sp = nullptr, intptr_t* fp = nullptr, CodeBlob* cb = nullptr);
+  inline frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map = nullptr);
 
   // Access frame via stack pointer.
   inline intptr_t* sp_addr_at(int index) const  { return &sp()[index]; }

src/hotspot/cpu/s390/frame_s390.inline.hpp

@@ -87,6 +87,11 @@ inline frame::frame(intptr_t* sp, address pc, intptr_t* unextended_sp, intptr_t*
 
 inline frame::frame(intptr_t* sp) : frame(sp, nullptr) {}
 
+inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map)
+  :_sp(sp), _pc(pc), _cb(cb), _oop_map(oop_map), _on_heap(false), DEBUG_ONLY(_frame_index(-1) COMMA) _unextended_sp(unextended_sp), _fp(fp) {
+  setup();
+}
+
 // Generic constructor. Used by pns() in debug.cpp only
 #ifndef PRODUCT
 inline frame::frame(void* sp, void* pc, void* unextended_sp)
@@ -371,4 +376,42 @@ void frame::update_map_with_saved_link(RegisterMapT* map, intptr_t** link_addr)
   Unimplemented();
 }
 
+#if INCLUDE_JFR
+
+// Static helper routines
+inline intptr_t* frame::sender_sp(intptr_t* fp) { return fp; }
+
+// Extract common_abi parts.
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(((z_common_abi*)sp)->callers_sp);
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) { return frame::fp(fp); }
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(((z_common_abi*)sp)->return_pc);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) { return frame::return_address(fp); }
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(*(fp + _z_ijava_idx(bcp)));
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(*(fp + _z_ijava_idx(sender_sp)));
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp - ((frame::z_ijava_state_size + frame::z_top_ijava_frame_abi_size) >> LogBytesPerWord);
+}
+
+#endif // INCLUDE_JFR
+
 #endif // CPU_S390_FRAME_S390_INLINE_HPP

src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp

@@ -26,6 +26,8 @@
 #ifndef CPU_S390_JAVAFRAMEANCHOR_S390_HPP
 #define CPU_S390_JAVAFRAMEANCHOR_S390_HPP
 
+  JFR_ONLY(intptr_t* volatile _last_sender_Java_fp;) // specialized field for when JFR samples an interpreter frame
+
  public:
 
   // Each arch must define reset, save, restore.
@@ -42,6 +44,7 @@
     OrderAccess::fence();
 
     _last_Java_pc = nullptr;
+    JFR_ONLY(_last_sender_Java_fp = nullptr;)
   }
 
   inline void set(intptr_t* sp, address pc) {
@@ -64,6 +67,7 @@
       OrderAccess::fence();
     }
     _last_Java_pc = src->_last_Java_pc;
+    JFR_ONLY(_last_sender_Java_fp = src->_last_sender_Java_fp;)
     // Must be last so profiler will always see valid frame if has_last_frame() is true.
 
     OrderAccess::release();
@@ -84,4 +88,9 @@
 
   address last_Java_pc(void)          { return _last_Java_pc; }
 
+  intptr_t* last_Java_fp() const      { return *(intptr_t**)_last_Java_sp; }
+
+  JFR_ONLY(intptr_t* last_sender_Java_fp() const { return _last_sender_Java_fp;})
+  JFR_ONLY(static ByteSize last_sender_Java_fp_offset() { return byte_offset_of(JavaFrameAnchor, _last_sender_Java_fp); })
+
 #endif // CPU_S390_JAVAFRAMEANCHOR_S390_HPP

src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.hpp

@@ -40,4 +40,7 @@
 
   bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
 
+  JFR_ONLY(static ByteSize last_sender_Java_fp_offset() {
+    return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_sender_Java_fp_offset();
+  })
 #endif // OS_CPU_LINUX_S390_JAVATHREAD_LINUX_S390_HPP