*** old/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp	Thu Dec 17 17:52:10 2015
--- new/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp	Thu Dec 17 17:52:09 2015

*** 22,44 ****
--- 22,43 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
+ #include "interpreter/interp_masm.hpp"
  #include "interpreter/interpreter.hpp"
! #include "interpreter/interpreterGenerator.hpp"
! #include "interpreter/templateInterpreterGenerator.hpp"
  #include "runtime/arguments.hpp"
  
  #define __ _masm->
  
  #ifndef CC_INTERP
  
  /**
   * 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 entry = __ pc();
  
      // rbx,: Method*
      // r13: senderSP must preserved for slow path, set SP to it on fast path

*** 86,96 ****
--- 85,95 ----
  /**
   * 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 entry = __ pc();
  
      // rbx,: Method*
      // r13: senderSP must preserved for slow path, set SP to it on fast path

*** 147,157 ****
--- 146,156 ----
  /**
  * Method entry for static native methods:
  *   int java.util.zip.CRC32C.updateBytes(int crc, byte[] b, int off, int end)
  *   int java.util.zip.CRC32C.updateByteBuffer(int crc, long address, int off, int end)
  */
! address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
    if (UseCRC32CIntrinsics) {
      address entry = __ pc();
      // Load parameters
      const Register crc = c_rarg0;  // crc
      const Register buf = c_rarg1;  // source java byte array address

*** 192,197 ****
--- 191,195 ----
      return entry;
    }
  
    return NULL;
  }
  #endif // ! CC_INTERP