src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp

*** 25,37 ****
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/interpreter.hpp"
- #include "interpreter/interpreterGenerator.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "interpreter/templateTable.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
--- 25,37 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
+ #include "interpreter/templateInterpreterGenerator.hpp"
  #include "interpreter/templateTable.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
*** 1243,1253 ****
  //
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.update(int crc, int b)
   */
! address InterpreterGenerator::generate_CRC32_update_entry() {
    if (UseCRC32Intrinsics) {
      address start = __ pc();  // Remember stub start address (is rtn value).
      Label slow_path;
  
      // Safepoint check
--- 1243,1253 ----
  //
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.update(int crc, int b)
   */
! address TemplateInterpreterGenerator::generate_CRC32_update_entry() {
    if (UseCRC32Intrinsics) {
      address start = __ pc();  // Remember stub start address (is rtn value).
      Label slow_path;
  
      // Safepoint check
*** 1303,1313 ****
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.updateBytes(     int crc, byte[] b,  int off, int len)
   *   int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
   */
! address InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
    if (UseCRC32Intrinsics) {
      address start = __ pc();  // Remember stub start address (is rtn value).
      Label slow_path;
  
      // Safepoint check
--- 1303,1313 ----
  /**
   * Method entry for static native methods:
   *   int java.util.zip.CRC32.updateBytes(     int crc, byte[] b,  int off, int len)
   *   int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
   */
! address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
    if (UseCRC32Intrinsics) {
      address start = __ pc();  // Remember stub start address (is rtn value).
      Label slow_path;
  
      // Safepoint check
*** 1389,1398 ****
--- 1389,1403 ----
    }
  
    return NULL;
  }
  
+ // Not supported
+ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
+   return NULL;
+ }
+ 
  // =============================================================================
  // Exceptions
  
  void TemplateInterpreterGenerator::generate_throw_exception() {
    Register Rexception    = R17_tos,
*** 1641,1660 ****
    __ bind(L);
    generate_and_dispatch(t);
  }
  
  //-----------------------------------------------------------------------------
- // Generation of individual instructions
- 
- // helpers for generate_and_dispatch
- 
- InterpreterGenerator::InterpreterGenerator(StubQueue* code)
-   : TemplateInterpreterGenerator(code) {
-   generate_all(); // Down here so it can be "virtual".
- }
- 
- //-----------------------------------------------------------------------------
  
  // Non-product code
  #ifndef PRODUCT
  address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
    //__ flush_bundle();
--- 1646,1655 ----