src/hotspot/cpu/arm/frame_arm.inline.hpp

*** 81,91 ****
    } else {
      _deopt_state = not_deoptimized;
    }
  }
  
- #ifndef AARCH64
  
  inline frame::frame(intptr_t* sp, intptr_t* fp) {
    _sp = sp;
    _unextended_sp = sp;
    _fp = fp;
--- 81,90 ----
*** 102,112 ****
    } else {
      _deopt_state = not_deoptimized;
    }
  }
  
- #endif // !AARCH64
  
  // Accessors
  
  inline bool frame::equal(frame other) const {
    bool ret =  sp() == other.sp()
--- 101,110 ----
*** 146,160 ****
  
  inline intptr_t** frame::interpreter_frame_locals_addr() const {
    return (intptr_t**)addr_at(interpreter_frame_locals_offset);
  }
  
- #ifndef AARCH64
  inline intptr_t* frame::interpreter_frame_last_sp() const {
    return *(intptr_t**)addr_at(interpreter_frame_last_sp_offset);
  }
- #endif // !AARCH64
  
  inline intptr_t* frame::interpreter_frame_bcp_addr() const {
    return (intptr_t*)addr_at(interpreter_frame_bcp_offset);
  }
  
--- 144,156 ----
*** 179,205 ****
    return (oop*)addr_at(interpreter_frame_mirror_offset);
  }
  
  // top of expression stack
  inline intptr_t* frame::interpreter_frame_tos_address() const {
- #ifdef AARCH64
-   intptr_t* stack_top = (intptr_t*)*addr_at(interpreter_frame_stack_top_offset);
-   assert(stack_top != NULL, "should be stored before call");
-   assert(stack_top <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos");
-   return stack_top;
- #else
    intptr_t* last_sp = interpreter_frame_last_sp();
    if (last_sp == NULL ) {
      return sp();
    } else {
      // sp() may have been extended or shrunk by an adapter.  At least
      // check that we don't fall behind the legal region.
      // For top deoptimized frame last_sp == interpreter_frame_monitor_end.
      assert(last_sp <= (intptr_t*) interpreter_frame_monitor_end(), "bad tos");
      return last_sp;
    }
- #endif // AARCH64
  }
  
  inline oop* frame::interpreter_frame_temp_oop_addr() const {
    return (oop *)(fp() + interpreter_frame_oop_temp_offset);
  }
--- 175,194 ----