src/cpu/zero/vm/cppInterpreter_zero.cpp

*** 25,36 ****
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/cppInterpreter.hpp"
  #include "interpreter/interpreter.hpp"
- #include "interpreter/interpreterGenerator.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
--- 25,36 ----
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/cppInterpreter.hpp"
+ #include "interpreter/cppInterpreterGenerator.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
*** 786,810 ****
    assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
           "out of step with AbstractInterpreter::BasicType_as_index");
    return t;
  }
  
! address InterpreterGenerator::generate_empty_entry() {
    if (!UseFastEmptyMethods)
      return NULL;
  
    return generate_entry((address) CppInterpreter::empty_entry);
  }
  
! address InterpreterGenerator::generate_accessor_entry() {
    if (!UseFastAccessorMethods)
      return NULL;
  
    return generate_entry((address) CppInterpreter::accessor_entry);
  }
  
! address InterpreterGenerator::generate_Reference_get_entry(void) {
  #if INCLUDE_ALL_GCS
    if (UseG1GC) {
      // We need to generate have a routine that generates code to:
      //   * load the value in the referent field
      //   * passes that value to the pre-barrier.
--- 786,810 ----
    assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
           "out of step with AbstractInterpreter::BasicType_as_index");
    return t;
  }
  
! address CppInterpreterGenerator::generate_empty_entry() {
    if (!UseFastEmptyMethods)
      return NULL;
  
    return generate_entry((address) CppInterpreter::empty_entry);
  }
  
! address CppInterpreterGenerator::generate_accessor_entry() {
    if (!UseFastAccessorMethods)
      return NULL;
  
    return generate_entry((address) CppInterpreter::accessor_entry);
  }
  
! address CppInterpreterGenerator::generate_Reference_get_entry(void) {
  #if INCLUDE_ALL_GCS
    if (UseG1GC) {
      // We need to generate have a routine that generates code to:
      //   * load the value in the referent field
      //   * passes that value to the pre-barrier.
*** 820,843 ****
    // If G1 is not enabled then attempt to go through the normal entry point
    // Reference.get could be instrumented by jvmti
    return NULL;
  }
  
! address InterpreterGenerator::generate_native_entry(bool synchronized) {
    return generate_entry((address) CppInterpreter::native_entry);
  }
  
! address InterpreterGenerator::generate_normal_entry(bool synchronized) {
    return generate_entry((address) CppInterpreter::normal_entry);
  }
  
  
- InterpreterGenerator::InterpreterGenerator(StubQueue* code)
-  : CppInterpreterGenerator(code) {
-    generate_all();
- }
- 
  // Deoptimization helpers
  
  InterpreterFrame *InterpreterFrame::build(int size, TRAPS) {
    ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack();
  
--- 820,838 ----
    // If G1 is not enabled then attempt to go through the normal entry point
    // Reference.get could be instrumented by jvmti
    return NULL;
  }
  
! address CppInterpreterGenerator::generate_native_entry(bool synchronized) {
    return generate_entry((address) CppInterpreter::native_entry);
  }
  
! address CppInterpreterGenerator::generate_normal_entry(bool synchronized) {
    return generate_entry((address) CppInterpreter::normal_entry);
  }
  
  
  // Deoptimization helpers
  
  InterpreterFrame *InterpreterFrame::build(int size, TRAPS) {
    ZeroStack *stack = ((JavaThread *) THREAD)->zero_stack();
  
*** 978,1010 ****
  // Helper for figuring out if frames are interpreter frames
  
  bool CppInterpreter::contains(address pc) {
    return false; // make frame::print_value_on work
  }
- 
- // Result handlers and convertors
- 
- address CppInterpreterGenerator::generate_result_handler_for(
-     BasicType type) {
-   assembler()->advance(1);
-   return ShouldNotCallThisStub();
- }
- 
- address CppInterpreterGenerator::generate_tosca_to_stack_converter(
-     BasicType type) {
-   assembler()->advance(1);
-   return ShouldNotCallThisStub();
- }
- 
- address CppInterpreterGenerator::generate_stack_to_stack_converter(
-     BasicType type) {
-   assembler()->advance(1);
-   return ShouldNotCallThisStub();
- }
- 
- address CppInterpreterGenerator::generate_stack_to_native_abi_converter(
-     BasicType type) {
-   assembler()->advance(1);
-   return ShouldNotCallThisStub();
- }
- 
  #endif // CC_INTERP
--- 973,978 ----