src/cpu/x86/vm/interp_masm_x86.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 46,68 ****
                              Register last_java_sp,
                              address  entry_point,
                              int number_of_arguments,
                              bool check_exceptions);
  
-   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);
  
   public:
    InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code),
      _locals_register(LP64_ONLY(r14) NOT_LP64(rdi)),
      _bcp_register(LP64_ONLY(r13) NOT_LP64(rsi)) {}
  
    void jump_to_entry(address entry);
  
    void load_earlyret_value(TosState state);
  
    // Interpreter-specific registers
    void save_bcp() {
      movptr(Address(rbp, frame::interpreter_frame_bcp_offset * wordSize), _bcp_register);
--- 46,68 ----
                              Register last_java_sp,
                              address  entry_point,
                              int number_of_arguments,
                              bool check_exceptions);
  
    // base routine for all dispatches
    void dispatch_base(TosState state, address* table, bool verifyoop = true);
  
   public:
    InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code),
      _locals_register(LP64_ONLY(r14) NOT_LP64(rdi)),
      _bcp_register(LP64_ONLY(r13) NOT_LP64(rsi)) {}
  
    void jump_to_entry(address entry);
  
+  virtual void check_and_handle_popframe(Register java_thread);
+  virtual void check_and_handle_earlyret(Register java_thread);
+ 
    void load_earlyret_value(TosState state);
  
    // Interpreter-specific registers
    void save_bcp() {
      movptr(Address(rbp, frame::interpreter_frame_bcp_offset * wordSize), _bcp_register);