src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

*** 149,159 ****
    int off = 0;
    int num_xmm_regs = XMMRegisterImpl::number_of_registers;
    if (UseAVX < 3) {
      num_xmm_regs = num_xmm_regs/2;
    }
! #if defined(COMPILER2) || INCLUDE_JVMCI
    if (save_vectors) {
      assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
      assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
    }
  #else
--- 149,159 ----
    int off = 0;
    int num_xmm_regs = XMMRegisterImpl::number_of_registers;
    if (UseAVX < 3) {
      num_xmm_regs = num_xmm_regs/2;
    }
! #if COMPILER2_OR_JVMCI
    if (save_vectors) {
      assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
      assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
    }
  #else
*** 258,278 ****
        map->set_callee_saved(STACK_OFFSET(off), zmm_name->as_VMReg());
        off += delta;
      }
    }
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
    if (save_vectors) {
      off = ymm0_off;
      int delta = ymm1_off - off;
      for (int n = 0; n < 16; n++) {
        XMMRegister ymm_name = as_XMMRegister(n);
        map->set_callee_saved(STACK_OFFSET(off), ymm_name->as_VMReg()->next(4));
        off += delta;
      }
    }
! #endif // COMPILER2 || INCLUDE_JVMCI
  
    // %%% These should all be a waste but we'll keep things as they were for now
    if (true) {
      map->set_callee_saved(STACK_OFFSET( raxH_off ), rax->as_VMReg()->next());
      map->set_callee_saved(STACK_OFFSET( rcxH_off ), rcx->as_VMReg()->next());
--- 258,278 ----
        map->set_callee_saved(STACK_OFFSET(off), zmm_name->as_VMReg());
        off += delta;
      }
    }
  
! #if COMPILER2_OR_JVMCI
    if (save_vectors) {
      off = ymm0_off;
      int delta = ymm1_off - off;
      for (int n = 0; n < 16; n++) {
        XMMRegister ymm_name = as_XMMRegister(n);
        map->set_callee_saved(STACK_OFFSET(off), ymm_name->as_VMReg()->next(4));
        off += delta;
      }
    }
! #endif // COMPILER2_OR_JVMCI
  
    // %%% These should all be a waste but we'll keep things as they were for now
    if (true) {
      map->set_callee_saved(STACK_OFFSET( raxH_off ), rax->as_VMReg()->next());
      map->set_callee_saved(STACK_OFFSET( rcxH_off ), rcx->as_VMReg()->next());
*** 321,331 ****
    if (frame::arg_reg_save_area_bytes != 0) {
      // Pop arg register save area
      __ addptr(rsp, frame::arg_reg_save_area_bytes);
    }
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
    if (restore_vectors) {
      assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
      assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
    }
  #else
--- 321,331 ----
    if (frame::arg_reg_save_area_bytes != 0) {
      // Pop arg register save area
      __ addptr(rsp, frame::arg_reg_save_area_bytes);
    }
  
! #if COMPILER2_OR_JVMCI
    if (restore_vectors) {
      assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
      assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
    }
  #else