src/cpu/aarch64/vm/interp_masm_aarch64.hpp

*** 33,43 ****
  
  // This file specializes the assember with interpreter-specific macros
  
  
  class InterpreterMacroAssembler: public MacroAssembler {
- #ifndef CC_INTERP
   protected:
  
   protected:
    using MacroAssembler::call_VM_leaf_base;
  
--- 33,42 ----
*** 57,84 ****
    virtual void check_and_handle_popframe(Register java_thread);
    virtual void check_and_handle_earlyret(Register java_thread);
  
    // base routine for all dispatches
    void dispatch_base(TosState state, address* table, bool verifyoop = true);
- #endif // CC_INTERP
  
   public:
    InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {}
  
    void load_earlyret_value(TosState state);
  
    void jump_to_entry(address entry);
  
- #ifdef CC_INTERP
-   void save_bcp()                                          { /*  not needed in c++ interpreter and harmless */ }
-   void restore_bcp()                                       { /*  not needed in c++ interpreter and harmless */ }
- 
-   // Helpers for runtime call arguments/results
-   void get_method(Register reg);
- 
- #else
- 
    // Interpreter-specific registers
    void save_bcp() {
      str(rbcp, Address(rfp, frame::interpreter_frame_bcp_offset * wordSize));
    }
  
--- 56,73 ----
*** 200,210 ****
    // and installing an exception.
    void remove_activation(TosState state,
                           bool throw_monitor_exception = true,
                           bool install_monitor_exception = true,
                           bool notify_jvmdi = true);
- #endif // CC_INTERP
  
    // FIXME: Give us a valid frame at a null check.
    virtual void null_check(Register reg, int offset = -1) {
  // #ifdef ASSERT
  //     save_bcp();
--- 189,198 ----
*** 218,229 ****
  
    // Object locking
    void lock_object  (Register lock_reg);
    void unlock_object(Register lock_reg);
  
- #ifndef CC_INTERP
- 
    // Interpreter profiling operations
    void set_method_data_pointer_for_bcp();
    void test_method_data_pointer(Register mdp, Label& zero_continue);
    void verify_method_data_pointer();
  
--- 206,215 ----
*** 278,289 ****
    // only if +VerifyOops && state == atos
    void verify_oop(Register reg, TosState state = atos);
    // only if +VerifyFPU  && (state == ftos || state == dtos)
    void verify_FPU(int stack_depth, TosState state = ftos);
  
- #endif // !CC_INTERP
- 
    typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
  
    // support for jvmti/dtrace
    void notify_method_entry();
    void notify_method_exit(TosState state, NotifyMethodExitMode mode);
--- 264,273 ----