src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp

*** 22,45 ****
   *
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "interpreter/interpreter.hpp"
! #include "interpreter/interpreterGenerator.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 InterpreterGenerator::generate_CRC32_update_entry() {
    if (UseCRC32Intrinsics) {
      address entry = __ pc();
  
      // rbx: Method*
      // rsi: senderSP must preserved for slow path, set SP to it on fast path
--- 22,44 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
+ #include "interpreter/interp_masm.hpp"
  #include "interpreter/interpreter.hpp"
! #include "interpreter/templateInterpreterGenerator.hpp"
  #include "runtime/arguments.hpp"
  
  #define __ _masm->
  
  
  /**
   * 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*
      // rsi: senderSP must preserved for slow path, set SP to it on fast path
*** 87,97 ****
  /**
   * 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 entry = __ pc();
  
      // rbx,: Method*
      // rsi: senderSP must preserved for slow path, set SP to it on fast path
--- 86,96 ----
  /**
   * 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*
      // rsi: senderSP must preserved for slow path, set SP to it on fast path
*** 153,163 ****
  /**
  * 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 InterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
    if (UseCRC32CIntrinsics) {
      address entry = __ pc();
      // Load parameters
      const Register crc = rax;  // crc
      const Register buf = rcx;  // source java byte array address
--- 152,162 ----
  /**
  * 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 = rax;  // crc
      const Register buf = rcx;  // source java byte array address
*** 199,209 ****
  
  /**
   * Method entry for static native method:
   *    java.lang.Float.intBitsToFloat(int bits)
   */
! address InterpreterGenerator::generate_Float_intBitsToFloat_entry() {
    if (UseSSE >= 1) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
--- 198,208 ----
  
  /**
   * Method entry for static native method:
   *    java.lang.Float.intBitsToFloat(int bits)
   */
! address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() {
    if (UseSSE >= 1) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
*** 225,235 ****
  
  /**
   * Method entry for static native method:
   *    java.lang.Float.floatToRawIntBits(float value)
   */
! address InterpreterGenerator::generate_Float_floatToRawIntBits_entry() {
    if (UseSSE >= 1) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
--- 224,234 ----
  
  /**
   * Method entry for static native method:
   *    java.lang.Float.floatToRawIntBits(float value)
   */
! address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() {
    if (UseSSE >= 1) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
*** 252,262 ****
  
  /**
   * Method entry for static native method:
   *    java.lang.Double.longBitsToDouble(long bits)
   */
! address InterpreterGenerator::generate_Double_longBitsToDouble_entry() {
     if (UseSSE >= 2) {
       address entry = __ pc();
  
       // rsi: the sender's SP
  
--- 251,261 ----
  
  /**
   * Method entry for static native method:
   *    java.lang.Double.longBitsToDouble(long bits)
   */
! address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() {
     if (UseSSE >= 2) {
       address entry = __ pc();
  
       // rsi: the sender's SP
  
*** 278,288 ****
  
  /**
   * Method entry for static native method:
   *    java.lang.Double.doubleToRawLongBits(double value)
   */
! address InterpreterGenerator::generate_Double_doubleToRawLongBits_entry() {
    if (UseSSE >= 2) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
--- 277,287 ----
  
  /**
   * Method entry for static native method:
   *    java.lang.Double.doubleToRawLongBits(double value)
   */
! address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() {
    if (UseSSE >= 2) {
      address entry = __ pc();
  
      // rsi: the sender's SP
  
*** 300,305 ****
      return entry;
    }
  
    return NULL;
  }
- #endif // CC_INTERP
--- 299,303 ----